You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [12/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/desktop/test/deployment/active/Dispatch.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/test/deployment/active/Dispatch.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/test/deployment/active/Dispatch.java (original)
+++ openoffice/branches/ia2/main/desktop/test/deployment/active/Dispatch.java Fri Feb 1 08:46:00 2013
@@ -24,6 +24,7 @@
package com.sun.star.comp.test.deployment.active_java;
import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.XMessageBox;
import com.sun.star.awt.XMessageBoxFactory;
@@ -74,7 +75,7 @@ public final class Dispatch extends Weak
smgr.createInstanceWithContext(
"com.sun.star.frame.Desktop", context)).
getCurrentFrame().getComponentWindow())),
- new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+ MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK,
"active", "java");
box.execute();
UnoRuntime.queryInterface(XComponent.class, box).dispose();
Modified: openoffice/branches/ia2/main/desktop/test/deployment/active/active_native.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/test/deployment/active/active_native.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/test/deployment/active/active_native.cxx (original)
+++ openoffice/branches/ia2/main/desktop/test/deployment/active/active_native.cxx Fri Feb 1 08:46:00 2013
@@ -250,8 +250,7 @@ void Dispatch::dispatch(
css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
css::uno::UNO_SET_THROW)->getComponentWindow(),
css::uno::UNO_QUERY_THROW),
- css::awt::Rectangle(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+ css::awt::MessageBoxType_INFOBOX,
css::awt::MessageBoxButtons::BUTTONS_OK,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("active")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
Modified: openoffice/branches/ia2/main/desktop/test/deployment/active/active_python.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/test/deployment/active/active_python.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/test/deployment/active/active_python.py (original)
+++ openoffice/branches/ia2/main/desktop/test/deployment/active/active_python.py Fri Feb 1 08:46:00 2013
@@ -24,6 +24,7 @@ import unohelper
from com.sun.star.awt import Rectangle
from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.awt.MessageBoxType import INFOBOX
from com.sun.star.frame import XDispatch, XDispatchProvider
from com.sun.star.lang import XServiceInfo
from com.sun.star.registry import InvalidRegistryException
@@ -79,7 +80,7 @@ class Dispatch(unohelper.Base, XServiceI
smgr.createInstanceWithContext( \
"com.sun.star.frame.Desktop", self.context). \
getCurrentFrame().getComponentWindow(), \
- Rectangle(), "infobox", BUTTONS_OK, "active", "python")
+ INFOBOX, BUTTONS_OK, "active", "python")
box.execute();
box.dispose();
Modified: openoffice/branches/ia2/main/desktop/test/deployment/passive/Dispatch.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/test/deployment/passive/Dispatch.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/test/deployment/passive/Dispatch.java (original)
+++ openoffice/branches/ia2/main/desktop/test/deployment/passive/Dispatch.java Fri Feb 1 08:46:00 2013
@@ -24,6 +24,7 @@
package com.sun.star.comp.test.deployment.passive_java;
import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.XMessageBox;
import com.sun.star.awt.XMessageBoxFactory;
@@ -74,7 +75,7 @@ public final class Dispatch extends Weak
smgr.createInstanceWithContext(
"com.sun.star.frame.Desktop", context)).
getCurrentFrame().getComponentWindow())),
- new Rectangle(), "infobox", MessageBoxButtons.BUTTONS_OK,
+ MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK,
"passive", "java");
box.execute();
UnoRuntime.queryInterface(XComponent.class, box).dispose();
Modified: openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_native.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_native.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_native.cxx (original)
+++ openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_native.cxx Fri Feb 1 08:46:00 2013
@@ -248,8 +248,7 @@ void Dispatch::dispatch(
css::uno::UNO_QUERY_THROW)->getCurrentFrame(),
css::uno::UNO_SET_THROW)->getComponentWindow(),
css::uno::UNO_QUERY_THROW),
- css::awt::Rectangle(),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("infobox")),
+ css::awt::MessageBoxType_INFOBOX,
css::awt::MessageBoxButtons::BUTTONS_OK,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("passive")),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("native"))),
Modified: openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_python.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_python.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_python.py (original)
+++ openoffice/branches/ia2/main/desktop/test/deployment/passive/passive_python.py Fri Feb 1 08:46:00 2013
@@ -24,6 +24,7 @@ import unohelper
from com.sun.star.awt import Rectangle
from com.sun.star.awt.MessageBoxButtons import BUTTONS_OK
+from com.sun.star.awt.MessageBoxType import INFOBOX
from com.sun.star.frame import XDispatch, XDispatchProvider
from com.sun.star.lang import XServiceInfo
@@ -78,7 +79,7 @@ class Dispatch(unohelper.Base, XServiceI
smgr.createInstanceWithContext( \
"com.sun.star.frame.Desktop", self.context). \
getCurrentFrame().getComponentWindow(), \
- Rectangle(), "infobox", BUTTONS_OK, "passive", "python")
+ INFOBOX, BUTTONS_OK, "passive", "python")
box.execute();
box.dispose();
Modified: openoffice/branches/ia2/main/desktop/util/ooverinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/util/ooverinfo.rc?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/util/ooverinfo.rc (original)
+++ openoffice/branches/ia2/main/desktop/util/ooverinfo.rc Fri Feb 1 08:46:00 2013
@@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/ia2/main/desktop/util/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/util/verinfo.rc?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/util/verinfo.rc (original)
+++ openoffice/branches/ia2/main/desktop/util/verinfo.rc Fri Feb 1 08:46:00 2013
@@ -64,7 +64,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -76,7 +76,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "Oracle\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/ia2/main/desktop/win32/source/applauncher/ooo/verinfo.rc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/win32/source/applauncher/ooo/verinfo.rc?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/win32/source/applauncher/ooo/verinfo.rc (original)
+++ openoffice/branches/ia2/main/desktop/win32/source/applauncher/ooo/verinfo.rc Fri Feb 1 08:46:00 2013
@@ -59,7 +59,7 @@ VS_VERSION_INFO versioninfo
block "040704E4"
{
// German StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
@@ -71,7 +71,7 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Apache Software Foundation\0"
value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "ProductVersion", PPS(VER_LEVEL) "\0"
Modified: openoffice/branches/ia2/main/drawinglayer/Library_drawinglayer.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/Library_drawinglayer.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/Library_drawinglayer.mk (original)
+++ openoffice/branches/ia2/main/drawinglayer/Library_drawinglayer.mk Fri Feb 1 08:46:00 2013
@@ -156,8 +156,6 @@ $(eval $(call gb_Library_add_exception_o
drawinglayer/source/primitive3d/textureprimitive3d \
drawinglayer/source/primitive3d/transformprimitive3d \
drawinglayer/source/processor2d/baseprocessor2d \
- drawinglayer/source/processor2d/vclhelperbitmaptransform \
- drawinglayer/source/processor2d/vclhelperbitmaprender \
drawinglayer/source/processor2d/vclhelperbufferdevice \
drawinglayer/source/processor2d/vclprocessor2d \
drawinglayer/source/processor2d/helperwrongspellrenderer \
Modified: openoffice/branches/ia2/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx Fri Feb 1 08:46:00 2013
@@ -64,7 +64,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopLeft.Crop(
- Rectangle(Point(0,0),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point(0, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopLeft;
@@ -77,7 +77,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTop = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTop.Crop(
- Rectangle(Point(nQuarter*2+1,0),Size(1,nQuarter+1)));
+ Rectangle(Point((nQuarter * 2) + 1, 0), Size(1, nQuarter)));
}
return maTop;
@@ -90,7 +90,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maTopRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maTopRight.Crop(
- Rectangle(Point(nQuarter*2+2,0),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point((nQuarter * 2) + 2, 0), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maTopRight;
@@ -103,7 +103,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maRight.Crop(
- Rectangle(Point(nQuarter*3+2,nQuarter*2+1),Size(nQuarter+1,1)));
+ Rectangle(Point((nQuarter * 3) + 3, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maRight;
@@ -116,7 +116,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomRight = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomRight.Crop(
- Rectangle(Point(nQuarter*2+2,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point((nQuarter * 2) + 2, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomRight;
@@ -129,7 +129,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottom = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottom.Crop(
- Rectangle(Point(nQuarter*2+1,nQuarter*3+2),Size(1,nQuarter+1)));
+ Rectangle(Point((nQuarter * 2) + 1, (nQuarter * 3) + 3), Size(1, nQuarter)));
}
return maBottom;
@@ -142,7 +142,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maBottomLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maBottomLeft.Crop(
- Rectangle(Point(0,nQuarter*2+2),Size(nQuarter*2+1,nQuarter*2+1)));
+ Rectangle(Point(0, (nQuarter * 2) + 2), Size((nQuarter * 2) + 1, (nQuarter * 2) + 1)));
}
return maBottomLeft;
@@ -155,7 +155,7 @@ namespace drawinglayer
const sal_Int32 nQuarter((getBitmapEx().GetSizePixel().Width() - 3) >> 2);
const_cast< DiscreteShadow* >(this)->maLeft = getBitmapEx();
const_cast< DiscreteShadow* >(this)->maLeft.Crop(
- Rectangle(Point(0,nQuarter*2+1),Size(nQuarter+1,1)));
+ Rectangle(Point(0, (nQuarter * 2) + 1), Size(nQuarter, 1)));
}
return maLeft;
@@ -192,9 +192,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTopLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- -fBorderX,
+ -fBorderX,
-fBorderY)));
// Top
@@ -202,9 +202,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTop(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * fBorderX) - fSingleX,
- fBorderY + fSingleY,
- fBorderX + fSingleX,
+ 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
-fBorderY)));
// TopRight
@@ -212,9 +212,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getTopRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- 1.0 - fBorderX,
+ 1.0 - fBorderX,
-fBorderY)));
// Right
@@ -222,9 +222,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX + fSingleX,
- 1.0 - (2.0 * fBorderY) - fSingleY,
- 1.0,
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
+ 1.0 + fSingleX,
fBorderY + fSingleY)));
// BottomRight
@@ -232,29 +232,29 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getBottomRight(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- 1.0 - fBorderX,
- 1.0 - fBorderY)));
+ 1.0 - (fBorderX + fSingleX) + fSingleX,
+ 1.0 - (fBorderY + fSingleY) + fSingleY)));
// Bottom
xRetval[5] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottom(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- 1.0 - (2.0 * fBorderX) - fSingleX,
- fBorderY + fSingleY,
- fBorderX + fSingleX,
- 1.0)));
+ 1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
+ fBorderY,
+ fBorderX + fSingleX,
+ 1.0 + fSingleY)));
// BottomLeft
xRetval[6] = Primitive2DReference(
new BitmapPrimitive2D(
getDiscreteShadow().getBottomLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBigLenX,
+ fBigLenX,
fBigLenY,
- -fBorderX,
+ -fBorderX,
1.0 - fBorderY)));
// Left
@@ -262,9 +262,9 @@ namespace drawinglayer
new BitmapPrimitive2D(
getDiscreteShadow().getLeft(),
basegfx::tools::createScaleTranslateB2DHomMatrix(
- fBorderX + fSingleX,
- 1.0 - (2.0 * fBorderY) - fSingleY,
- -fBorderX,
+ fBorderX,
+ 1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
+ -fBorderX,
fBorderY + fSingleY)));
// put all in object transformation to get to target positions
Modified: openoffice/branches/ia2/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx Fri Feb 1 08:46:00 2013
@@ -195,7 +195,11 @@ namespace
// create BitmapEx
Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(), aVirtualDevice.GetOutputSizePixel());
- Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap(Point(), aVirtualDeviceMask.GetOutputSizePixel());
+#if defined(MACOSX)
+ AlphaMask aMaskBitmap( aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel()));
+#else
+ Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel());
+#endif
aNextStep.maBitmapEx = BitmapEx(aMainBitmap, aMaskBitmap);
// add to vector
Modified: openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx Fri Feb 1 08:46:00 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -32,6 +30,7 @@
#include <vcl/timer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <vcl/lazydelete.hxx>
+#include <vcl/dibtools.hxx>
//////////////////////////////////////////////////////////////////////////////
// buffered VDev usage
@@ -299,7 +298,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\content.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aContent;
+ WriteDIB(aContent, aNew, false, true);
}
if(mpAlpha)
@@ -310,7 +309,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\transparence.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aAlphaMask.GetBitmap();
+ WriteDIB(aAlphaMask.GetBitmap(), aNew, false, true);
}
mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask));
@@ -323,7 +322,7 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\mask.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aMask;
+ WriteDIB(aMask, aNew, false, true);
}
mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask));
Modified: openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx Fri Feb 1 08:46:00 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_drawinglayer.hxx"
@@ -60,6 +58,7 @@
#include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx>
#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <vcl/dibtools.hxx>
//////////////////////////////////////////////////////////////////////////////
// for PDFExtOutDevData Graphic support
@@ -2041,7 +2040,8 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aBmContent;
+
+ WriteDIB(aBmContent, aNew, false, true);
}
#endif
Modified: openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Fri Feb 1 08:46:00 2013
@@ -31,9 +31,7 @@
#include <vcl/outdev.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <vclhelperbitmaptransform.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <vclhelperbitmaprender.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
@@ -389,14 +387,28 @@ namespace drawinglayer
// direct draw of transformed BitmapEx primitive
void VclProcessor2D::RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate)
{
- // create local transform
- basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
- BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx());
- bool bPainted(false);
+ // check local ViewPort
+ const basegfx::B2DRange& rDiscreteViewPort(getViewInformation2D().getDiscreteViewport());
+ const basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * rBitmapCandidate.getTransform());
+
+ if(!rDiscreteViewPort.isEmpty())
+ {
+ // check if we are visible
+ basegfx::B2DRange aUnitRange(0.0, 0.0, 1.0, 1.0);
+
+ aUnitRange.transform(aLocalTransform);
+
+ if(!aUnitRange.overlaps(rDiscreteViewPort))
+ {
+ return;
+ }
+ }
+
+ BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx());
if(maBColorModifierStack.count())
{
- aBitmapEx = impModifyBitmapEx(maBColorModifierStack, aBitmapEx);
+ aBitmapEx = aBitmapEx.ModifyBitmapEx(maBColorModifierStack);
if(aBitmapEx.IsEmpty())
{
@@ -409,49 +421,33 @@ namespace drawinglayer
mpOutputDevice->SetLineColor();
mpOutputDevice->DrawPolygon(aPolygon);
- bPainted = true;
+ return;
}
}
- if(!bPainted)
- {
- static bool bForceUseOfOwnTransformer(false);
- static bool bUseGraphicManager(true);
+ // decompose matrix to check for shear, rotate and mirroring
+ basegfx::B2DVector aScale, aTranslate;
+ double fRotate, fShearX;
- // decompose matrix to check for shear, rotate and mirroring
- basegfx::B2DVector aScale, aTranslate;
- double fRotate, fShearX;
- aLocalTransform.decompose(aScale, aTranslate, fRotate, fShearX);
-
- // #121387# when mirrored and rotated, avoid the GraphicManager output which has low quality
- const bool bRotated(!basegfx::fTools::equalZero(fRotate));
- const bool bSheared(!basegfx::fTools::equalZero(fShearX));
- const bool bMirrored(aScale.getX() < 0.0 || aScale.getY() < 0.0);
- const bool bMirroredAndRotated(bRotated && bMirrored);
+ aLocalTransform.decompose(aScale, aTranslate, fRotate, fShearX);
- if(!bForceUseOfOwnTransformer && !bSheared && !bMirroredAndRotated)
- {
- if(!bUseGraphicManager && !bRotated)
- {
- RenderBitmapPrimitive2D_BitmapEx(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
- else
- {
- RenderBitmapPrimitive2D_GraphicManager(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
- }
- else
- {
- if(!aBitmapEx.IsTransparent() && (bSheared || bRotated))
- {
- // parts will be uncovered, extend aBitmapEx with a mask bitmap
- const Bitmap aContent(aBitmapEx.GetBitmap());
- aBitmapEx = BitmapEx(aContent, Bitmap(aContent.GetSizePixel(), 1));
- }
+ const bool bRotated(!basegfx::fTools::equalZero(fRotate));
+ const bool bSheared(!basegfx::fTools::equalZero(fShearX));
- RenderBitmapPrimitive2D_self(*mpOutputDevice, aBitmapEx, aLocalTransform);
- }
+ if(!aBitmapEx.IsTransparent() && (bSheared || bRotated))
+ {
+ // parts will be uncovered, extend aBitmapEx with a mask bitmap
+ const Bitmap aContent(aBitmapEx.GetBitmap());
+#if defined(MACOSX)
+ const AlphaMask aMaskBmp( aContent.GetSizePixel());
+#else
+ const Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
+#endif
+ aBitmapEx = BitmapEx(aContent, aMaskBmp);
}
+
+ // draw using OutputDevice'sDrawTransformedBitmapEx
+ mpOutputDevice->DrawTransformedBitmapEx(aLocalTransform, aBitmapEx);
}
void VclProcessor2D::RenderFillGraphicPrimitive2D(const primitive2d::FillGraphicPrimitive2D& rFillBitmapCandidate)
@@ -532,7 +528,7 @@ namespace drawinglayer
if(maBColorModifierStack.count())
{
// when color modifier, apply to bitmap
- aBitmapEx = impModifyBitmapEx(maBColorModifierStack, aBitmapEx);
+ aBitmapEx = aBitmapEx.ModifyBitmapEx(maBColorModifierStack);
// impModifyBitmapEx uses empty bitmap as sign to return that
// the content will be completely replaced to mono color, use shortcut
Modified: openoffice/branches/ia2/main/drawinglayer/source/tools/converters.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/tools/converters.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/tools/converters.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/tools/converters.cxx Fri Feb 1 08:46:00 2013
@@ -32,6 +32,7 @@
#ifdef DBG_UTIL
#include <tools/stream.hxx>
+#include <vcl/pngwrite.hxx>
#endif
//////////////////////////////////////////////////////////////////////////////
@@ -129,7 +130,8 @@ namespace drawinglayer
if(bDoSaveForVisualControl)
{
SvFileStream aNew((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- aNew << aRetval;
+ ::vcl::PNGWriter aPNGWriter(aRetval);
+ aPNGWriter.Write(aNew);
}
#endif
Modified: openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx (original)
+++ openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx Fri Feb 1 08:46:00 2013
@@ -358,10 +358,14 @@ CDOTransferable::ByteSequence_t SAL_CALL
clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream );
// format conversion if necessary
- if ( CF_DIB == aFormatEtc.getClipformat() )
- byteStream = WinDIBToOOBMP( byteStream );
- else if ( CF_METAFILEPICT == aFormatEtc.getClipformat() )
- byteStream = WinMFPictToOOMFPict( byteStream );
+ if(CF_DIBV5 == aFormatEtc.getClipformat() || CF_DIB == aFormatEtc.getClipformat())
+ {
+ byteStream = WinDIBToOOBMP(byteStream);
+ }
+ else if(CF_METAFILEPICT == aFormatEtc.getClipformat())
+ {
+ byteStream = WinMFPictToOOMFPict(byteStream);
+ }
}
ReleaseStgMedium( &stgmedium );
Modified: openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.cxx (original)
+++ openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.cxx Fri Feb 1 08:46:00 2013
@@ -195,30 +195,33 @@ HENHMETAFILE SAL_CALL OOMFPictToWinENHMF
Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB )
{
- OSL_ASSERT( aWinDIB.getLength( ) > sizeof( BITMAPINFOHEADER ) );
-
- Sequence< sal_Int8 > ooBmpStream;
+ OSL_ENSURE(aWinDIB.getLength() > sizeof(BITMAPINFOHEADER), "CF_DIBV5/CF_DIB too small (!)");
+ Sequence< sal_Int8 > ooBmpStream;
- ooBmpStream.realloc( aWinDIB.getLength( ) + sizeof(BITMAPFILEHEADER) );
-
- const BITMAPINFOHEADER *pBmpInfoHdr = (const BITMAPINFOHEADER*)aWinDIB.getConstArray();
- BITMAPFILEHEADER *pBmpFileHdr = reinterpret_cast< BITMAPFILEHEADER* >( ooBmpStream.getArray() );
- DWORD nOffset = sizeof( BITMAPFILEHEADER ) + sizeof( BITMAPINFOHEADER );
-
- rtl_copyMemory( pBmpFileHdr + 1, pBmpInfoHdr, aWinDIB.getLength( ) );
-
- if( pBmpInfoHdr->biBitCount <= 8 )
- nOffset += ( pBmpInfoHdr->biClrUsed ? pBmpInfoHdr->biClrUsed : ( 1 << pBmpInfoHdr->biBitCount ) ) << 2;
- else if( ( BI_BITFIELDS == pBmpInfoHdr->biCompression ) && ( ( 16 == pBmpInfoHdr->biBitCount ) || ( 32 == pBmpInfoHdr->biBitCount ) ) )
- nOffset += 12;
-
- pBmpFileHdr->bfType = 'MB';
- pBmpFileHdr->bfSize = 0; // maybe: nMemSize + sizeof(BITMAPFILEHEADER)
- pBmpFileHdr->bfReserved1 = 0;
- pBmpFileHdr->bfReserved2 = 0;
- pBmpFileHdr->bfOffBits = nOffset;
+ ooBmpStream.realloc(aWinDIB.getLength( ) + sizeof(BITMAPFILEHEADER));
+ const BITMAPINFOHEADER* pBmpInfoHdr = reinterpret_cast< const BITMAPINFOHEADER* >(aWinDIB.getConstArray());
+ BITMAPFILEHEADER* pBmpFileHdr = reinterpret_cast< BITMAPFILEHEADER* >(ooBmpStream.getArray());
+ const DWORD nSizeInfoOrV5(pBmpInfoHdr->biSize > sizeof(BITMAPINFOHEADER) ? sizeof(BITMAPV5HEADER) : sizeof(BITMAPINFOHEADER));
+ DWORD nOffset(sizeof(BITMAPFILEHEADER) + nSizeInfoOrV5);
- return ooBmpStream;
+ rtl_copyMemory(pBmpFileHdr + 1, pBmpInfoHdr, aWinDIB.getLength());
+
+ if(pBmpInfoHdr->biBitCount <= 8)
+ {
+ nOffset += (pBmpInfoHdr->biClrUsed ? pBmpInfoHdr->biClrUsed : (1 << pBmpInfoHdr->biBitCount)) << 2;
+ }
+ else if((BI_BITFIELDS == pBmpInfoHdr->biCompression ) && ((16 == pBmpInfoHdr->biBitCount ) || (32 == pBmpInfoHdr->biBitCount )))
+ {
+ nOffset += 12;
+ }
+
+ pBmpFileHdr->bfType = 'MB';
+ pBmpFileHdr->bfSize = 0; // maybe: nMemSize + sizeof(BITMAPFILEHEADER)
+ pBmpFileHdr->bfReserved1 = 0;
+ pBmpFileHdr->bfReserved2 = 0;
+ pBmpFileHdr->bfOffBits = nOffset;
+
+ return ooBmpStream;
}
//------------------------------------------------------------------------
@@ -227,9 +230,6 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOO
Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
{
- OSL_ASSERT( aOOBmp.getLength( ) >
- ( sizeof( BITMAPFILEHEADER ) + sizeof( BITMAPINFOHEADER ) ) );
-
Sequence< sal_Int8 > winDIBStream( aOOBmp.getLength( ) - sizeof( BITMAPFILEHEADER ) );
rtl_copyMemory( winDIBStream.getArray( ),
Modified: openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.hxx (original)
+++ openoffice/branches/ia2/main/dtrans/source/win32/dtobj/FmtFilter.hxx Fri Feb 1 08:46:00 2013
@@ -70,6 +70,8 @@ com::sun::star::uno::Sequence< sal_Int8
/*------------------------------------------------------------------------
input:
aOOBmp - sequence of bytes containing a openoffice bitmap
+ May contain CF_DIBV5 or CF_DIB, but removing the BITMAPFILEHEADER
+ is always the same size
------------------------------------------------------------------------*/
com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( com::sun::star::uno::Sequence< sal_Int8 >& aOOBmp );
Modified: openoffice/branches/ia2/main/dtrans/source/win32/dtobj/XTDataObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dtrans/source/win32/dtobj/XTDataObject.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dtrans/source/win32/dtobj/XTDataObject.cxx (original)
+++ openoffice/branches/ia2/main/dtrans/source/win32/dtobj/XTDataObject.cxx Fri Feb 1 08:46:00 2013
@@ -307,8 +307,22 @@ void SAL_CALL CXTDataObject::renderAnyDa
nRequiredMemSize = sizeof( sal_Int8 ) * clipDataStream.getLength( ) + 1;
// prepare data for transmision
- if ( CF_DIB == fetc.cfFormat )
- clipDataStream = OOBmpToWinDIB( clipDataStream );
+ if ( CF_DIBV5 == fetc.cfFormat || CF_DIB == fetc.cfFormat )
+ {
+#ifdef DBG_UTIL
+ if(CF_DIBV5 == fetc.cfFormat)
+ {
+ OSL_ENSURE(clipDataStream.getLength( ) > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPV5HEADER)), "Wrong size on CF_DIBV5 data (!)");
+ }
+ else // CF_DIB == fetc.cfFormat
+ {
+ OSL_ENSURE(clipDataStream.getLength( ) > (sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER)), "Wrong size on CF_DIB data (!)");
+ }
+#endif
+
+ // remove BITMAPFILEHEADER
+ clipDataStream = OOBmpToWinDIB( clipDataStream );
+ }
if ( CF_METAFILEPICT == fetc.cfFormat )
{
Modified: openoffice/branches/ia2/main/dtrans/source/win32/ftransl/ftransl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dtrans/source/win32/ftransl/ftransl.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dtrans/source/win32/ftransl/ftransl.cxx (original)
+++ openoffice/branches/ia2/main/dtrans/source/win32/ftransl/ftransl.cxx Fri Feb 1 08:46:00 2013
@@ -276,6 +276,7 @@ void SAL_CALL CDataFormatTranslator::ini
//SOT_FORMATSTR_ID_DIF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT));
// SOT_FORMAT_BITMAP
+ m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIBV5, CPPUTYPE_DEFAULT));
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT));
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_BITMAP, CPPUTYPE_DEFAULT));
// SOT_FORMAT_STRING
@@ -507,6 +508,8 @@ void SAL_CALL CDataFormatTranslator::ini
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.dialog", "Dialog 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
//SOT_FORMATSTR_ID_BMP
m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
+ //SOT_FORMATSTR_ID_PNG
+ m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
//SOT_FORMATSTR_ID_DUMMY3
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
//SOT_FORMATSTR_ID_DUMMY4
Modified: openoffice/branches/ia2/main/editeng/source/items/bulitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/source/items/bulitem.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/editeng/source/items/bulitem.cxx (original)
+++ openoffice/branches/ia2/main/editeng/source/items/bulitem.cxx Fri Feb 1 08:46:00 2013
@@ -19,22 +19,16 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_editeng.hxx"
-// include ---------------------------------------------------------------
#include <tools/stream.hxx>
#include <vcl/outdev.hxx>
-
#define _SVX_BULITEM_CXX
-
#include <editeng/bulitem.hxx>
#include <editeng/editrids.hrc>
-
-// #90477#
#include <tools/tenccvt.hxx>
+#include <vcl/dibtools.hxx>
#define BULITEM_VERSION ((sal_uInt16)2)
@@ -190,8 +184,9 @@ SvxBulletItem::SvxBulletItem( SvStream&
// #69345# Errorcode beim Bitmap lesen ignorieren,
// siehe Kommentar #67581# in SvxBulletItem::Store()
sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False;
- rStrm >> aBmp;
- if ( !bOldError && rStrm.GetError() )
+ ReadDIB(aBmp, rStrm, true);
+
+ if ( !bOldError && rStrm.GetError() )
{
rStrm.ResetError();
// #71493# Keine Warnung: Das BulletItem interessiert seit 5.0 im Dateiformat nicht mehr.
@@ -395,7 +390,9 @@ SvStream& SvxBulletItem::Store( SvStream
const Bitmap aBmp( pGraphicObject->GetGraphic().GetBitmap() );
sal_uLong nBytes = aBmp.GetSizeBytes();
if ( nBytes < sal_uLong(0xFF00*nFac) )
- rStrm << aBmp;
+ {
+ WriteDIB(aBmp, rStrm, false, true);
+ }
sal_uLong nEnd = rStrm.Tell();
// #67581# Item darf mit Overhead nicht mehr als 64K schreiben,
Modified: openoffice/branches/ia2/main/embeddedobj/source/msole/oleembed.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/embeddedobj/source/msole/oleembed.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/embeddedobj/source/msole/oleembed.cxx (original)
+++ openoffice/branches/ia2/main/embeddedobj/source/msole/oleembed.cxx Fri Feb 1 08:46:00 2013
@@ -45,14 +45,14 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <rtl/logfile.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <comphelper/mimeconfighelper.hxx>
#include <comphelper/storagehelper.hxx>
-
+#include <comphelper/processfactory.hxx>
#include <targetstatecontrol.hxx>
@@ -878,9 +878,9 @@ void SAL_CALL OleEmbeddedObject::doVerb(
if (m_aTempDumpURL.getLength())
{
- uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( m_xFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))),
- uno::UNO_QUERY_THROW);
+ uno::Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ ::com::sun::star::system::SystemShellExecute::create(
+ ::comphelper::getProcessComponentContext() ) );
xSystemShellExecute->execute(m_aTempDumpURL, ::rtl::OUString(), ::com::sun::star::system::SystemShellExecuteFlags::DEFAULTS);
}
else
Modified: openoffice/branches/ia2/main/extensions.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions.lst?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions.lst (original)
+++ openoffice/branches/ia2/main/extensions.lst Fri Feb 1 08:46:00 2013
@@ -76,10 +76,6 @@
b38cba04b6513dd42b031199d617cce6 http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt"
6ee1e24fb17e44577d8e3200f3e44adc http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt"
-# Norwegian dictionary.
-[ language=no ]
- b4971332a09292af069783b089b9014b http://svn.skolelinux.org/websvn/filedetails.php?repname=skolelinux&path=%2Ftrunk%2Fi18n%2Fopenoffice%2Futils%2Fdictionary-no-NO-1.0.oxt&rev=0&sc=0 "dictionary-no-NO-1.0.oxt"
-
# Romanian dictionary.
[ language=ro ]
b05941b975afc0321df0cd48a4d295c8 http://sourceforge.net/projects/aoo-extensions/files/1392/8/dict-ro.1.5.oxt/download "dict-ro.1.5.oxt"
@@ -103,3 +99,38 @@
# Khmer dictionary.
[ language=km ]
a22266cfa40fb23a79be27a239321a3f http://sourceforge.net/projects/aoo-extensions/files/1009/1/km_spellchecker_OOo30_V_1.0.2.oxt/download "km_spellchecker_OOo30_V_1.0.2.oxt"
+
+# Scottish Gaelic.
+[ language=gd ]
+ d645b36c5d4fc52c18ac180453b48b5c http://sourceforge.net/projects/aoo-extensions/files/4587/7/hunspell-gd-2.5.oxt/download "hunspell-gd-2.5.oxt"
+
+# Basque.
+[ language=eu ]
+ f408bb4a333bea2aec86bffaa4ffa229 http://sourceforge.net/projects/aoo-extensions/files/1383/2/xuxen_4_OOo3.oxt/download "xuxen_4_OOo3.oxt"
+
+# Hungarian.
+[ language=hu ]
+ 76345f925e34fef2d29bade4f29108e9 http://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt"
+ d320e43e815c2dfd599dbfb7cd0e41fb http://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt"
+
+# Asturian.
+[ language=ast ]
+ ed5702f25c8f5e36f97cafc606470c42 http://sourceforge.net/projects/aoo-extensions/files/3932/1/asturianu.oxt/download "asturianu.oxt"
+
+# Norwegian.
+[ language=nb ]
+ 18bbb57caee07d276ef21a0e88859664 http://sourceforge.net/projects/aoo-extensions/files/5955/0/dict-no-ooo330.oxt/download "dict-no-ooo330.oxt"
+
+# Swedish.
+[ language=sv ]
+ 249b3bd3d9de4928ab8c809623dc9c4f http://sourceforge.net/projects/aoo-extensions/files/5959/0/dict-sv.oxt/download "dict-sv.oxt"
+
+# Korean.
+[ language=ko ]
+ c20c155c47174c1b0ec0a53618044ac3 http://sourceforge.net/projects/aoo-extensions/files/5968/0/Korean_spell-checker-0.5.6_OOo.oxt/download "Korean_spell-checker-0.5.6_OOo.oxt"
+
+# Polish.
+[ language=pl ]
+ a69f9221864b1360e38ff3f0b0cc9222 http://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "pl-dict.oxt"
+
+
Modified: openoffice/branches/ia2/main/extensions/source/scanner/sanedlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/scanner/sanedlg.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/scanner/sanedlg.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/scanner/sanedlg.cxx Fri Feb 1 08:46:00 2013
@@ -19,20 +19,18 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_extensions.hxx"
#include <stdio.h>
#include <stdlib.h>
#include <tools/config.hxx>
-
#include <vcl/msgbox.hxx>
#include <sanedlg.hxx>
#include <sanedlg.hrc>
#include <grid.hxx>
#include <math.h>
+#include <vcl/dibtools.hxx>
#define USE_SAVE_STATE
#undef SAVE_ALL_STATES
@@ -732,7 +730,7 @@ void SaneDlg::AcquirePreview()
fprintf( stderr, "Previewbitmapstream contains %d bytes\n", (int)aTransporter.getStream().Tell() );
#endif
aTransporter.getStream().Seek( STREAM_SEEK_TO_BEGIN );
- maPreviewBitmap.Read( aTransporter.getStream(), sal_True );
+ ReadDIB(maPreviewBitmap, aTransporter.getStream(), true);
}
SetAdjustedNumericalValue( "resolution", fResl );
Modified: openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx (original)
+++ openoffice/branches/ia2/main/extensions/source/update/check/updatecheck.cxx Fri Feb 1 08:46:00 2013
@@ -33,7 +33,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/DispatchResultEvent.hpp>
#include <com/sun/star/frame/DispatchResultState.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/task/XJobExecutor.hpp>
@@ -932,8 +932,7 @@ UpdateCheck::install()
osl::MutexGuard aGuard(m_aMutex);
const uno::Reference< c3s::XSystemShellExecute > xShellExecute(
- createService( UNISTRING( "com.sun.star.system.SystemShellExecute" ), m_xContext ),
- uno::UNO_QUERY );
+ c3s::SystemShellExecute::create( m_xContext ) );
try {
// Construct install command ??
Modified: openoffice/branches/ia2/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/external_deps.lst?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/external_deps.lst (original)
+++ openoffice/branches/ia2/main/external_deps.lst Fri Feb 1 08:46:00 2013
@@ -70,7 +70,7 @@ if ( true )
name = Adobe-Core35_AFMs-314.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SOLAR_JAVA == TRUE)
+if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=YES)
MD5 = 17960f35b2239654ba608cf1f3e256b3
name = lucene-2.9.4-src.tar.gz
URL1 = http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
@@ -187,9 +187,9 @@ if ( true )
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
- MD5 = 7740a8ec23878a2f50120e1faa2730f2
- name = libxml2-2.7.6.tar.gz
- URL1 = ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz
+ MD5 = 8127a65e8c3b08856093099b52599c86
+ name = libxml2-2.7.8.tar.gz
+ URL1 = ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
Modified: openoffice/branches/ia2/main/extras/source/gallery/arrows/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/arrows/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/gallery/arrows/makefile.mk (original)
+++ openoffice/branches/ia2/main/extras/source/gallery/arrows/makefile.mk Fri Feb 1 08:46:00 2013
@@ -1,46 +1,26 @@
-#*************************************************************************
-#
-# Licensed Materials - Property of IBM.
-# (C) Copyright IBM Corporation 2003, 2012. All Rights Reserved.
-# U.S. Government Users Restricted Rights:
-# Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-#
-#*************************************************************************
-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
PRJ=..$/..$/..
-
PRJNAME=extras
TARGET=galleryarrows
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg1.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg1.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg1.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg1.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg10.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg10.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg10.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg10.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg10.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg10.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg11.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg11.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg11.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg11.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg11.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg11.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg12.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg12.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg12.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg12.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg13.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg13.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg13.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg13.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg13.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg13.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg14.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg14.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg14.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg14.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg15.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg15.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg15.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg15.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg16.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg16.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg16.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg16.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg17.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg17.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg17.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg17.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg18.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg18.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg18.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg18.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg19.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg19.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg19.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg19.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg19.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg19.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg2.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg2.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg2.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg2.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg2.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg2.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg24.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg24.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg3.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg3.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg3.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg3.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg36.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg36.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg36.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg36.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg36.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg36.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg4.sdg
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg4.sdg?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg4.thm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg4.thm?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg9.sdv
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/gallery/gallery_system/sg9.sdv?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/extras/source/palettes/standard.soc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/palettes/standard.soc?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/palettes/standard.soc (original)
+++ openoffice/branches/ia2/main/extras/source/palettes/standard.soc Fri Feb 1 08:46:00 2013
@@ -1,104 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<office:color-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
- <draw:color draw:name="Black" draw:color="#000000"/>
- <draw:color draw:name="Blue" draw:color="#000080"/>
- <draw:color draw:name="Green" draw:color="#008000"/>
- <draw:color draw:name="Turquoise" draw:color="#008080"/>
- <draw:color draw:name="Red" draw:color="#800000"/>
- <draw:color draw:name="Magenta" draw:color="#800080"/>
- <draw:color draw:name="Brown" draw:color="#808000"/>
- <draw:color draw:name="Gray" draw:color="#808080"/>
- <draw:color draw:name="Light gray" draw:color="#c0c0c0"/>
- <draw:color draw:name="Light blue" draw:color="#0000ff"/>
- <draw:color draw:name="Light green" draw:color="#00ff00"/>
- <draw:color draw:name="Light cyan" draw:color="#00ffff"/>
- <draw:color draw:name="Light red" draw:color="#ff0000"/>
- <draw:color draw:name="Light magenta" draw:color="#ff00ff"/>
- <draw:color draw:name="Yellow" draw:color="#ffff00"/>
- <draw:color draw:name="White" draw:color="#ffffff"/>
- <draw:color draw:name="Gray 80%" draw:color="#333333"/>
- <draw:color draw:name="Gray 70%" draw:color="#4c4c4c"/>
- <draw:color draw:name="Gray 60%" draw:color="#666666"/>
- <draw:color draw:name="Gray 40%" draw:color="#999999"/>
- <draw:color draw:name="Gray 30%" draw:color="#b3b3b3"/>
- <draw:color draw:name="Gray 20%" draw:color="#cccccc"/>
- <draw:color draw:name="Gray 10%" draw:color="#e6e6e6"/>
- <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
- <draw:color draw:name="Red 1" draw:color="#ff3366"/>
- <draw:color draw:name="Red 2" draw:color="#dc2300"/>
- <draw:color draw:name="Red 3" draw:color="#b84700"/>
- <draw:color draw:name="Red 4" draw:color="#ff3333"/>
- <draw:color draw:name="Red 5" draw:color="#eb613d"/>
- <draw:color draw:name="Red 6" draw:color="#b84747"/>
- <draw:color draw:name="Red 7" draw:color="#b80047"/>
- <draw:color draw:name="Red 8" draw:color="#99284c"/>
- <draw:color draw:name="Magenta 1" draw:color="#94006b"/>
- <draw:color draw:name="Magenta 2" draw:color="#94476b"/>
- <draw:color draw:name="Magenta 3" draw:color="#944794"/>
- <draw:color draw:name="Magenta 4" draw:color="#9966cc"/>
- <draw:color draw:name="Magenta 5" draw:color="#6b4794"/>
- <draw:color draw:name="Magenta 6" draw:color="#6b2394"/>
- <draw:color draw:name="Magenta 7" draw:color="#6b0094"/>
- <draw:color draw:name="Magenta 8" draw:color="#5e11a6"/>
- <draw:color draw:name="Blue 1" draw:color="#280099"/>
- <draw:color draw:name="Blue 2" draw:color="#4700b8"/>
- <draw:color draw:name="Blue 3" draw:color="#2300dc"/>
- <draw:color draw:name="Blue 4" draw:color="#2323dc"/>
- <draw:color draw:name="Blue 5" draw:color="#0047ff"/>
- <draw:color draw:name="Blue 6" draw:color="#0099ff"/>
- <draw:color draw:name="Blue 7" draw:color="#00b8ff"/>
- <draw:color draw:name="Blue 8" draw:color="#99ccff"/>
- <draw:color draw:name="Blue 9" draw:color="#CFE7F5"/>
- <draw:color draw:name="Turquoise 1" draw:color="#00dcff"/>
- <draw:color draw:name="Turquoise 2" draw:color="#00cccc"/>
- <draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/>
- <draw:color draw:name="Turquoise 4" draw:color="#47b8b8"/>
- <draw:color draw:name="Turquoise 5" draw:color="#33a3a3"/>
- <draw:color draw:name="Turquoise 6" draw:color="#198a8a"/>
- <draw:color draw:name="Turquoise 7" draw:color="#006b6b"/>
- <draw:color draw:name="Turquoise 8" draw:color="#004a4a"/>
- <draw:color draw:name="Green 1" draw:color="#355e00"/>
- <draw:color draw:name="Green 2" draw:color="#5c8526"/>
- <draw:color draw:name="Green 3" draw:color="#7da647"/>
- <draw:color draw:name="Green 4" draw:color="#94bd5e"/>
- <draw:color draw:name="Green 5" draw:color="#00ae00"/>
- <draw:color draw:name="Green 6" draw:color="#33cc66"/>
- <draw:color draw:name="Green 7" draw:color="#3deb3d"/>
- <draw:color draw:name="Green 8" draw:color="#23ff23"/>
- <draw:color draw:name="Yellow 1" draw:color="#e6ff00"/>
- <draw:color draw:name="Yellow 2" draw:color="#ffff99"/>
- <draw:color draw:name="Yellow 3" draw:color="#ffff66"/>
- <draw:color draw:name="Yellow 4" draw:color="#e6e64c"/>
- <draw:color draw:name="Yellow 5" draw:color="#cccc00"/>
- <draw:color draw:name="Yellow 6" draw:color="#b3b300"/>
- <draw:color draw:name="Yellow 7" draw:color="#808019"/>
- <draw:color draw:name="Yellow 8" draw:color="#666600"/>
- <draw:color draw:name="Brown 1" draw:color="#4c1900"/>
- <draw:color draw:name="Brown 2" draw:color="#663300"/>
- <draw:color draw:name="Brown 3" draw:color="#804c19"/>
- <draw:color draw:name="Brown 4" draw:color="#996633"/>
- <draw:color draw:name="Orange 1" draw:color="#cc6633"/>
- <draw:color draw:name="Orange 2" draw:color="#ff6633"/>
- <draw:color draw:name="Orange 3" draw:color="#ff9966"/>
- <draw:color draw:name="Orange 4" draw:color="#ffcc99"/>
- <draw:color draw:name="Violet" draw:color="#9999ff"/>
- <draw:color draw:name="Bordeaux" draw:color="#993366"/>
- <draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
- <draw:color draw:name="Pale green" draw:color="#ccffff"/>
- <draw:color draw:name="Dark violet" draw:color="#660066"/>
- <draw:color draw:name="Salmon" draw:color="#ff8080"/>
- <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
- <draw:color draw:name="Chart 1" draw:color="#004586"/>
- <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
- <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
- <draw:color draw:name="Chart 4" draw:color="#579d1c"/>
- <draw:color draw:name="Chart 5" draw:color="#7e0021"/>
- <draw:color draw:name="Chart 6" draw:color="#83caff"/>
- <draw:color draw:name="Chart 7" draw:color="#314004"/>
- <draw:color draw:name="Chart 8" draw:color="#aecf00"/>
- <draw:color draw:name="Chart 9" draw:color="#4b1f6f"/>
- <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
- <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
- <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
+ <!-- #121520# use Symphony palette as base, it is organized as groups of twelve entries -->
+ <draw:color draw:name="White" draw:color="#ffffff"/>
+ <draw:color draw:name="Gray 1" draw:color="#eeeeee"/>
+ <draw:color draw:name="Gray 2" draw:color="#dddddd"/>
+ <draw:color draw:name="Gray 3" draw:color="#cccccc"/>
+ <draw:color draw:name="Gray 4" draw:color="#b2b2b2"/>
+ <draw:color draw:name="Gray 5" draw:color="#999999"/>
+ <draw:color draw:name="Gray 6" draw:color="#808080"/>
+ <draw:color draw:name="Gray 7" draw:color="#666666"/>
+ <draw:color draw:name="Gray 8" draw:color="#333333"/>
+ <draw:color draw:name="Gray 9" draw:color="#1c1c1c"/>
+ <draw:color draw:name="Gray 10" draw:color="#111111"/>
+ <draw:color draw:name="Black" draw:color="#000000"/>
+ <draw:color draw:name="Yellow" draw:color="#ffff99"/>
+ <draw:color draw:name="Orange" draw:color="#ff6600"/>
+ <draw:color draw:name="Red" draw:color="#ff3333"/>
+ <draw:color draw:name="Pink" draw:color="#ff00cc"/>
+ <draw:color draw:name="Magenta" draw:color="#ff33ff"/>
+ <draw:color draw:name="Purple" draw:color="#9900ff"/>
+ <draw:color draw:name="Blue" draw:color="#6666ff"/>
+ <draw:color draw:name="Sky Blue" draw:color="#00ccff"/>
+ <draw:color draw:name="Cyan" draw:color="#66ffff"/>
+ <draw:color draw:name="Turquoise" draw:color="#33ff99"/>
+ <draw:color draw:name="Green" draw:color="#99ff66"/>
+ <draw:color draw:name="Yellow Green" draw:color="#ccff00"/>
+ <draw:color draw:name="Yellow 1" draw:color="#ffff66"/>
+ <draw:color draw:name="Orange 1" draw:color="#ffcc00"/>
+ <draw:color draw:name="Red 1" draw:color="#ff9999"/>
+ <draw:color draw:name="Pink 1" draw:color="#ff66cc"/>
+ <draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
+ <draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
+ <draw:color draw:name="Blue 1" draw:color="#9999ff"/>
+ <draw:color draw:name="Sky Blue 1" draw:color="#9999ff"/>
+ <draw:color draw:name="Cyan 1" draw:color="#99ffff"/>
+ <draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>
+ <draw:color draw:name="Green 1" draw:color="#99ff99"/>
+ <draw:color draw:name="Yellow Green 1" draw:color="#ccff66"/>
+ <draw:color draw:name="Yellow 2" draw:color="#ffff00"/>
+ <draw:color draw:name="Orange 2" draw:color="#ff9900"/>
+ <draw:color draw:name="Red 2" draw:color="#ff6666"/>
+ <draw:color draw:name="Pink 2" draw:color="#ff3399"/>
+ <draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>
+ <draw:color draw:name="Purple 2" draw:color="#9933ff"/>
+ <draw:color draw:name="Blue 2" draw:color="#3333ff"/>
+ <draw:color draw:name="Sky Blue 2" draw:color="#3399ff"/>
+ <draw:color draw:name="Cyan 2" draw:color="#00ffff"/>
+ <draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>
+ <draw:color draw:name="Green 2" draw:color="#66ff66"/>
+ <draw:color draw:name="Yellow Green 2" draw:color="#99ff33"/>
+ <draw:color draw:name="Yellow 3" draw:color="#cc9900"/>
+ <draw:color draw:name="Orange 3" draw:color="#ff3300"/>
+ <draw:color draw:name="Red 3" draw:color="#ff0000"/>
+ <draw:color draw:name="Pink 3" draw:color="#ff0066"/>
+ <draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>
+ <draw:color draw:name="Purple 3" draw:color="#6600ff"/>
+ <draw:color draw:name="Blue 3" draw:color="#0000ff"/>
+ <draw:color draw:name="Sky Blue 3" draw:color="#0066ff"/>
+ <draw:color draw:name="Cyan 3" draw:color="#00cccc"/>
+ <draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>
+ <draw:color draw:name="Green 3" draw:color="#00cc00"/>
+ <draw:color draw:name="Yellow Green 3" draw:color="#66ff00"/>
+ <draw:color draw:name="Yellow 4" draw:color="#996600"/>
+ <draw:color draw:name="Orange 4" draw:color="#cc3300"/>
+ <draw:color draw:name="Red 4" draw:color="#cc0000"/>
+ <draw:color draw:name="Pink 4" draw:color="#cc0066"/>
+ <draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>
+ <draw:color draw:name="Purple 4" draw:color="#6600cc"/>
+ <draw:color draw:name="Blue 4" draw:color="#0000cc"/>
+ <draw:color draw:name="Sky Blue 4" draw:color="#0066cc"/>
+ <draw:color draw:name="Cyan 4" draw:color="#009999"/>
+ <draw:color draw:name="Turquoise 4" draw:color="#009933"/>
+ <draw:color draw:name="Green 4" draw:color="#009900"/>
+ <draw:color draw:name="Yellow Green 4" draw:color="#66cc00"/>
+ <draw:color draw:name="Yellow 5" draw:color="#663300"/>
+ <draw:color draw:name="Orange 5" draw:color="#801900"/>
+ <draw:color draw:name="Red 5" draw:color="#990000"/>
+ <draw:color draw:name="Pink 5" draw:color="#990066"/>
+ <draw:color draw:name="Magenta 5" draw:color="#990099"/>
+ <draw:color draw:name="Purple 5" draw:color="#330099"/>
+ <draw:color draw:name="Blue 5" draw:color="#000099"/>
+ <draw:color draw:name="Sky Blue 5" draw:color="#006699"/>
+ <draw:color draw:name="Cyan 5" draw:color="#006666"/>
+ <draw:color draw:name="Turquoise 5" draw:color="#007826"/>
+ <draw:color draw:name="Green 5" draw:color="#006600"/>
+ <draw:color draw:name="Yellow Green 5" draw:color="#669900"/>
+ <draw:color draw:name="Yellow 6" draw:color="#333300"/>
+ <draw:color draw:name="Orange 6" draw:color="#461900"/>
+ <draw:color draw:name="Red 6" draw:color="#330000"/>
+ <draw:color draw:name="Pink 6" draw:color="#330033"/>
+ <draw:color draw:name="Magenta 6" draw:color="#660066"/>
+ <draw:color draw:name="Purple 6" draw:color="#000033"/>
+ <draw:color draw:name="Blue 6" draw:color="#000066"/>
+ <draw:color draw:name="Sky Blue 6" draw:color="#000080"/>
+ <draw:color draw:name="Cyan 6" draw:color="#003333"/>
+ <draw:color draw:name="Turquoise 6" draw:color="#00331a"/>
+ <draw:color draw:name="Green 6" draw:color="#003300"/>
+ <draw:color draw:name="Yellow Green 6" draw:color="#193300"/>
+ <draw:color draw:name="Yellow 7" draw:color="#666633"/>
+ <draw:color draw:name="Orange 7" draw:color="#661900"/>
+ <draw:color draw:name="Red 7" draw:color="#663333"/>
+ <draw:color draw:name="Pink 7" draw:color="#660033"/>
+ <draw:color draw:name="Magenta 7" draw:color="#663366"/>
+ <draw:color draw:name="Purple 7" draw:color="#330066"/>
+ <draw:color draw:name="Blue 7" draw:color="#333366"/>
+ <draw:color draw:name="Sky Blue 7" draw:color="#003366"/>
+ <draw:color draw:name="Cyan 7" draw:color="#336666"/>
+ <draw:color draw:name="Turquoise 7" draw:color="#006633"/>
+ <draw:color draw:name="Green 7" draw:color="#336633"/>
+ <draw:color draw:name="Yellow Green 7" draw:color="#336600"/>
+ <draw:color draw:name="Yellow 8" draw:color="#999966"/>
+ <draw:color draw:name="Orange 8" draw:color="#996633"/>
+ <draw:color draw:name="Red 8" draw:color="#996666"/>
+ <draw:color draw:name="Pink 8" draw:color="#993366"/>
+ <draw:color draw:name="Magenta 8" draw:color="#996699"/>
+ <draw:color draw:name="Purple 8" draw:color="#663399"/>
+ <draw:color draw:name="Blue 8" draw:color="#666699"/>
+ <draw:color draw:name="Sky Blue 8" draw:color="#336699"/>
+ <draw:color draw:name="Cyan 8" draw:color="#669999"/>
+ <draw:color draw:name="Turquoise 8" draw:color="#339966"/>
+ <draw:color draw:name="Green 8" draw:color="#669966"/>
+ <draw:color draw:name="Yellow Green 8" draw:color="#669933"/>
+ <draw:color draw:name="Yellow 9" draw:color="#cccc99"/>
+ <draw:color draw:name="Orange 9" draw:color="#cc9966"/>
+ <draw:color draw:name="Red 9" draw:color="#cc9999"/>
+ <draw:color draw:name="Pink 9" draw:color="#cc6699"/>
+ <draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>
+ <draw:color draw:name="Purple 9" draw:color="#9966cc"/>
+ <draw:color draw:name="Blue 9" draw:color="#9999cc"/>
+ <draw:color draw:name="Sky Blue 9" draw:color="#6699cc"/>
+ <draw:color draw:name="Cyan 9" draw:color="#99cccc"/>
+ <draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>
+ <draw:color draw:name="Green 9" draw:color="#99cc99"/>
+ <draw:color draw:name="Yellow Green 9" draw:color="#99cc66"/>
+ <draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>
+ <draw:color draw:name="Orange 10" draw:color="#ffcc99"/>
+ <draw:color draw:name="Red 10" draw:color="#ffcccc"/>
+ <draw:color draw:name="Pink 10" draw:color="#ff99cc"/>
+ <draw:color draw:name="Magenta 10" draw:color="#ffccff"/>
+ <draw:color draw:name="Purple 10" draw:color="#cc99ff"/>
+ <draw:color draw:name="Blue 10" draw:color="#ccccff"/>
+ <draw:color draw:name="Sky Blue 10" draw:color="#99ccff"/>
+ <draw:color draw:name="Cyan 10" draw:color="#ccffff"/>
+ <draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>
+ <draw:color draw:name="Green 10" draw:color="#ccffcc"/>
+ <draw:color draw:name="Yellow Green 10" draw:color="#ccff99"/>
+
+ <!-- #121520# use some 'nice' colors from original palette -->
+ <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
+ <draw:color draw:name="Blue 9" draw:color="#CFE7F5"/>
+
+ <!-- #121520# add 'pale' colors from original palette -->
+ <draw:color draw:name="Violet" draw:color="#9999ff"/>
+ <draw:color draw:name="Bordeaux" draw:color="#993366"/>
+ <draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
+ <draw:color draw:name="Pale green" draw:color="#ccffff"/>
+ <draw:color draw:name="Dark violet" draw:color="#660066"/>
+ <draw:color draw:name="Salmon" draw:color="#ff8080"/>
+ <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
+
+ <!-- #121520# add Chart colors from original palette -->
+ <draw:color draw:name="Chart 1" draw:color="#004586"/>
+ <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
+ <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
+ <draw:color draw:name="Chart 4" draw:color="#579d1c"/>
+ <draw:color draw:name="Chart 5" draw:color="#7e0021"/>
+ <draw:color draw:name="Chart 6" draw:color="#83caff"/>
+ <draw:color draw:name="Chart 7" draw:color="#314004"/>
+ <draw:color draw:name="Chart 8" draw:color="#aecf00"/>
+ <draw:color draw:name="Chart 9" draw:color="#4b1f6f"/>
+ <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
+ <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
+ <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
</office:color-table>
\ No newline at end of file