You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2014/03/19 17:17:04 UTC
svn commit: r1579280 [5/8] - in /openoffice/trunk: ./ main/boost/
main/chart2/source/controller/main/ main/comphelper/inc/comphelper/
main/comphelper/source/property/ main/cui/source/factory/
main/cui/source/inc/ main/cui/source/tabpages/ main/drawingl...
Modified: openoffice/trunk/main/drawinglayer/source/texture/texture3d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/source/texture/texture3d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/drawinglayer/source/texture/texture3d.cxx (original)
+++ openoffice/trunk/main/drawinglayer/source/texture/texture3d.cxx Wed Mar 19 16:17:02 2014
@@ -32,60 +32,60 @@
namespace drawinglayer
{
- namespace texture
- {
- GeoTexSvxMono::GeoTexSvxMono(
+ namespace texture
+ {
+ GeoTexSvxMono::GeoTexSvxMono(
const basegfx::BColor& rSingleColor,
double fOpacity)
- : maSingleColor(rSingleColor),
- mfOpacity(fOpacity)
- {
- }
-
- bool GeoTexSvxMono::operator==(const GeoTexSvx& rGeoTexSvx) const
- {
- const GeoTexSvxMono* pCompare = dynamic_cast< const GeoTexSvxMono* >(&rGeoTexSvx);
-
+ : maSingleColor(rSingleColor),
+ mfOpacity(fOpacity)
+ {
+ }
+
+ bool GeoTexSvxMono::operator==(const GeoTexSvx& rGeoTexSvx) const
+ {
+ const GeoTexSvxMono* pCompare = dynamic_cast< const GeoTexSvxMono* >(&rGeoTexSvx);
+
return (pCompare
- && maSingleColor == pCompare->maSingleColor
- && mfOpacity == pCompare->mfOpacity);
- }
-
- void GeoTexSvxMono::modifyBColor(const basegfx::B2DPoint& /*rUV*/, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
- {
- rBColor = maSingleColor;
- }
-
- void GeoTexSvxMono::modifyOpacity(const basegfx::B2DPoint& /*rUV*/, double& rfOpacity) const
- {
- rfOpacity = mfOpacity;
- }
- } // end of namespace texture
+ && maSingleColor == pCompare->maSingleColor
+ && mfOpacity == pCompare->mfOpacity);
+ }
+
+ void GeoTexSvxMono::modifyBColor(const basegfx::B2DPoint& /*rUV*/, basegfx::BColor& rBColor, double& /*rfOpacity*/) const
+ {
+ rBColor = maSingleColor;
+ }
+
+ void GeoTexSvxMono::modifyOpacity(const basegfx::B2DPoint& /*rUV*/, double& rfOpacity) const
+ {
+ rfOpacity = mfOpacity;
+ }
+ } // end of namespace texture
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
namespace drawinglayer
{
- namespace texture
- {
- GeoTexSvxBitmapEx::GeoTexSvxBitmapEx(
+ namespace texture
+ {
+ GeoTexSvxBitmapEx::GeoTexSvxBitmapEx(
const BitmapEx& rBitmapEx,
const basegfx::B2DRange& rRange)
- : maBitmapEx(rBitmapEx),
- mpReadBitmap(0),
+ : maBitmapEx(rBitmapEx),
+ mpReadBitmap(0),
maTransparence(),
mpReadTransparence(0),
- maTopLeft(rRange.getMinimum()),
- maSize(rRange.getRange()),
- mfMulX(0.0),
- mfMulY(0.0),
+ maTopLeft(rRange.getMinimum()),
+ maSize(rRange.getRange()),
+ mfMulX(0.0),
+ mfMulY(0.0),
mbIsAlpha(false),
mbIsTransparent(maBitmapEx.IsTransparent())
- {
+ {
// #121194# Todo: use alpha channel, too (for 3d)
- mpReadBitmap = maBitmapEx.GetBitmap().AcquireReadAccess();
- OSL_ENSURE(mpReadBitmap, "GeoTexSvxBitmapEx: Got no read access to Bitmap (!)");
+ mpReadBitmap = maBitmapEx.GetBitmap().AcquireReadAccess();
+ OSL_ENSURE(mpReadBitmap, "GeoTexSvxBitmapEx: Got no read access to Bitmap (!)");
if(mbIsTransparent)
{
@@ -101,9 +101,9 @@ namespace drawinglayer
mpReadTransparence = maTransparence.AcquireReadAccess();
}
-
+
mfMulX = (double)mpReadBitmap->Width() / maSize.getX();
- mfMulY = (double)mpReadBitmap->Height() / maSize.getY();
+ mfMulY = (double)mpReadBitmap->Height() / maSize.getY();
if(maSize.getX() <= 1.0)
{
@@ -114,13 +114,13 @@ namespace drawinglayer
{
maSize.setY(1.0);
}
- }
+ }
- GeoTexSvxBitmapEx::~GeoTexSvxBitmapEx()
- {
+ GeoTexSvxBitmapEx::~GeoTexSvxBitmapEx()
+ {
delete mpReadTransparence;
- delete mpReadBitmap;
- }
+ delete mpReadBitmap;
+ }
sal_uInt8 GeoTexSvxBitmapEx::impGetTransparence(sal_Int32& rX, sal_Int32& rY) const
{
@@ -164,37 +164,37 @@ namespace drawinglayer
return 0;
}
- bool GeoTexSvxBitmapEx::impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const
- {
- if(mpReadBitmap)
- {
- rX = (sal_Int32)((rUV.getX() - maTopLeft.getX()) * mfMulX);
-
- if(rX >= 0L && rX < mpReadBitmap->Width())
- {
- rY = (sal_Int32)((rUV.getY() - maTopLeft.getY()) * mfMulY);
-
- return (rY >= 0L && rY < mpReadBitmap->Height());
- }
- }
-
- return false;
- }
-
- void GeoTexSvxBitmapEx::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const
- {
- sal_Int32 nX, nY;
-
- if(impIsValid(rUV, nX, nY))
- {
- const double fConvertColor(1.0 / 255.0);
- const BitmapColor aBMCol(mpReadBitmap->GetColor(nY, nX));
- const basegfx::BColor aBSource(
- (double)aBMCol.GetRed() * fConvertColor,
- (double)aBMCol.GetGreen() * fConvertColor,
- (double)aBMCol.GetBlue() * fConvertColor);
+ bool GeoTexSvxBitmapEx::impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const
+ {
+ if(mpReadBitmap)
+ {
+ rX = (sal_Int32)((rUV.getX() - maTopLeft.getX()) * mfMulX);
+
+ if(rX >= 0L && rX < mpReadBitmap->Width())
+ {
+ rY = (sal_Int32)((rUV.getY() - maTopLeft.getY()) * mfMulY);
+
+ return (rY >= 0L && rY < mpReadBitmap->Height());
+ }
+ }
+
+ return false;
+ }
+
+ void GeoTexSvxBitmapEx::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const
+ {
+ sal_Int32 nX, nY;
+
+ if(impIsValid(rUV, nX, nY))
+ {
+ const double fConvertColor(1.0 / 255.0);
+ const BitmapColor aBMCol(mpReadBitmap->GetColor(nY, nX));
+ const basegfx::BColor aBSource(
+ (double)aBMCol.GetRed() * fConvertColor,
+ (double)aBMCol.GetGreen() * fConvertColor,
+ (double)aBMCol.GetBlue() * fConvertColor);
- rBColor = aBSource;
+ rBColor = aBSource;
if(mbIsTransparent)
{
@@ -207,19 +207,19 @@ namespace drawinglayer
{
rfOpacity = 1.0;
}
- }
- else
- {
- rfOpacity = 0.0;
- }
- }
-
- void GeoTexSvxBitmapEx::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const
- {
- sal_Int32 nX, nY;
+ }
+ else
+ {
+ rfOpacity = 0.0;
+ }
+ }
+
+ void GeoTexSvxBitmapEx::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const
+ {
+ sal_Int32 nX, nY;
- if(impIsValid(rUV, nX, nY))
- {
+ if(impIsValid(rUV, nX, nY))
+ {
if(mbIsTransparent)
{
// this texture has an alpha part, use it
@@ -231,28 +231,28 @@ namespace drawinglayer
else
{
// this texture is a color bitmap used as transparence map
- const BitmapColor aBMCol(mpReadBitmap->GetColor(nY, nX));
- const Color aColor(aBMCol.GetRed(), aBMCol.GetGreen(), aBMCol.GetBlue());
+ const BitmapColor aBMCol(mpReadBitmap->GetColor(nY, nX));
+ const Color aColor(aBMCol.GetRed(), aBMCol.GetGreen(), aBMCol.GetBlue());
- rfOpacity = ((double)(0xff - aColor.GetLuminance()) * (1.0 / 255.0));
+ rfOpacity = ((double)(0xff - aColor.GetLuminance()) * (1.0 / 255.0));
}
- }
- else
- {
- rfOpacity = 0.0;
- }
- }
- } // end of namespace texture
+ }
+ else
+ {
+ rfOpacity = 0.0;
+ }
+ }
+ } // end of namespace texture
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
namespace drawinglayer
{
- namespace texture
- {
- basegfx::B2DPoint GeoTexSvxBitmapExTiled::impGetCorrected(const basegfx::B2DPoint& rUV) const
- {
+ namespace texture
+ {
+ basegfx::B2DPoint GeoTexSvxBitmapExTiled::impGetCorrected(const basegfx::B2DPoint& rUV) const
+ {
double fX(rUV.getX() - maTopLeft.getX());
double fY(rUV.getY() - maTopLeft.getY());
@@ -289,122 +289,134 @@ namespace drawinglayer
}
return basegfx::B2DPoint(fX + maTopLeft.getX(), fY + maTopLeft.getY());
- }
+ }
GeoTexSvxBitmapExTiled::GeoTexSvxBitmapExTiled(
const BitmapEx& rBitmapEx,
const basegfx::B2DRange& rRange,
double fOffsetX,
double fOffsetY)
- : GeoTexSvxBitmapEx(rBitmapEx, rRange),
+ : GeoTexSvxBitmapEx(rBitmapEx, rRange),
mfOffsetX(basegfx::clamp(fOffsetX, 0.0, 1.0)),
mfOffsetY(basegfx::clamp(fOffsetY, 0.0, 1.0)),
mbUseOffsetX(!basegfx::fTools::equalZero(mfOffsetX)),
mbUseOffsetY(!mbUseOffsetX && !basegfx::fTools::equalZero(mfOffsetY))
- {
- }
+ {
+ }
+
+ void GeoTexSvxBitmapExTiled::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const
+ {
+ if(mpReadBitmap)
+ {
+ GeoTexSvxBitmapEx::modifyBColor(impGetCorrected(rUV), rBColor, rfOpacity);
+ }
+ }
- void GeoTexSvxBitmapExTiled::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const
- {
- if(mpReadBitmap)
- {
- GeoTexSvxBitmapEx::modifyBColor(impGetCorrected(rUV), rBColor, rfOpacity);
- }
- }
-
- void GeoTexSvxBitmapExTiled::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const
- {
- if(mpReadBitmap)
- {
- GeoTexSvxBitmapEx::modifyOpacity(impGetCorrected(rUV), rfOpacity);
- }
- }
- } // end of namespace texture
+ void GeoTexSvxBitmapExTiled::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const
+ {
+ if(mpReadBitmap)
+ {
+ GeoTexSvxBitmapEx::modifyOpacity(impGetCorrected(rUV), rfOpacity);
+ }
+ }
+ } // end of namespace texture
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
namespace drawinglayer
{
- namespace texture
- {
- GeoTexSvxMultiHatch::GeoTexSvxMultiHatch(
+ namespace texture
+ {
+ GeoTexSvxMultiHatch::GeoTexSvxMultiHatch(
const primitive3d::HatchTexturePrimitive3D& rPrimitive,
double fLogicPixelSize)
- : mfLogicPixelSize(fLogicPixelSize),
- mp0(0L),
- mp1(0L),
- mp2(0L)
- {
- const attribute::FillHatchAttribute& rHatch(rPrimitive.getHatch());
- const basegfx::B2DRange aOutlineRange(0.0, 0.0, rPrimitive.getTextureSize().getX(), rPrimitive.getTextureSize().getY());
- const double fAngleA(rHatch.getAngle());
- maColor = rHatch.getColor();
- mbFillBackground = rHatch.isFillBackground();
- mp0 = new GeoTexSvxHatch(aOutlineRange, rHatch.getDistance(), fAngleA);
-
- if(attribute::HATCHSTYLE_DOUBLE == rHatch.getStyle() || attribute::HATCHSTYLE_TRIPLE == rHatch.getStyle())
- {
- mp1 = new GeoTexSvxHatch(aOutlineRange, rHatch.getDistance(), fAngleA + F_PI2);
- }
-
- if(attribute::HATCHSTYLE_TRIPLE == rHatch.getStyle())
- {
- mp2 = new GeoTexSvxHatch(aOutlineRange, rHatch.getDistance(), fAngleA + F_PI4);
- }
- }
-
- GeoTexSvxMultiHatch::~GeoTexSvxMultiHatch()
- {
- delete mp0;
- delete mp1;
- delete mp2;
- }
-
- bool GeoTexSvxMultiHatch::impIsOnHatch(const basegfx::B2DPoint& rUV) const
- {
- if(mp0->getDistanceToHatch(rUV) < mfLogicPixelSize)
- {
- return true;
- }
-
- if(mp1 && mp1->getDistanceToHatch(rUV) < mfLogicPixelSize)
- {
- return true;
- }
-
- if(mp2 && mp2->getDistanceToHatch(rUV) < mfLogicPixelSize)
- {
- return true;
- }
-
- return false;
- }
-
- void GeoTexSvxMultiHatch::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const
- {
- if(impIsOnHatch(rUV))
- {
- rBColor = maColor;
- }
- else if(!mbFillBackground)
- {
- rfOpacity = 0.0;
- }
- }
-
- void GeoTexSvxMultiHatch::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const
- {
- if(mbFillBackground || impIsOnHatch(rUV))
- {
- rfOpacity = 1.0;
- }
- else
- {
- rfOpacity = 0.0;
- }
- }
- } // end of namespace texture
+ : mfLogicPixelSize(fLogicPixelSize),
+ mp0(0L),
+ mp1(0L),
+ mp2(0L)
+ {
+ const attribute::FillHatchAttribute& rHatch(rPrimitive.getHatch());
+ const basegfx::B2DRange aOutlineRange(0.0, 0.0, rPrimitive.getTextureSize().getX(), rPrimitive.getTextureSize().getY());
+ const double fAngleA(rHatch.getAngle());
+ maColor = rHatch.getColor();
+ mbFillBackground = rHatch.isFillBackground();
+ mp0 = new GeoTexSvxHatch(
+ aOutlineRange,
+ aOutlineRange,
+ rHatch.getDistance(),
+ fAngleA);
+
+ if(attribute::HATCHSTYLE_DOUBLE == rHatch.getStyle() || attribute::HATCHSTYLE_TRIPLE == rHatch.getStyle())
+ {
+ mp1 = new GeoTexSvxHatch(
+ aOutlineRange,
+ aOutlineRange,
+ rHatch.getDistance(),
+ fAngleA + F_PI2);
+ }
+
+ if(attribute::HATCHSTYLE_TRIPLE == rHatch.getStyle())
+ {
+ mp2 = new GeoTexSvxHatch(
+ aOutlineRange,
+ aOutlineRange,
+ rHatch.getDistance(),
+ fAngleA + F_PI4);
+ }
+ }
+
+ GeoTexSvxMultiHatch::~GeoTexSvxMultiHatch()
+ {
+ delete mp0;
+ delete mp1;
+ delete mp2;
+ }
+
+ bool GeoTexSvxMultiHatch::impIsOnHatch(const basegfx::B2DPoint& rUV) const
+ {
+ if(mp0->getDistanceToHatch(rUV) < mfLogicPixelSize)
+ {
+ return true;
+ }
+
+ if(mp1 && mp1->getDistanceToHatch(rUV) < mfLogicPixelSize)
+ {
+ return true;
+ }
+
+ if(mp2 && mp2->getDistanceToHatch(rUV) < mfLogicPixelSize)
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ void GeoTexSvxMultiHatch::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const
+ {
+ if(impIsOnHatch(rUV))
+ {
+ rBColor = maColor;
+ }
+ else if(!mbFillBackground)
+ {
+ rfOpacity = 0.0;
+ }
+ }
+
+ void GeoTexSvxMultiHatch::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const
+ {
+ if(mbFillBackground || impIsOnHatch(rUV))
+ {
+ rfOpacity = 1.0;
+ }
+ else
+ {
+ rfOpacity = 0.0;
+ }
+ }
+ } // end of namespace texture
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
Modified: openoffice/trunk/main/editeng/inc/editeng/brshitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/brshitem.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/inc/editeng/brshitem.hxx (original)
+++ openoffice/trunk/main/editeng/inc/editeng/brshitem.hxx Wed Mar 19 16:17:02 2014
@@ -119,6 +119,10 @@ public:
const String* GetGraphicLink() const { return pStrLink; }
const String* GetGraphicFilter() const { return pStrFilter; }
+ //UUUU get graphic transparency in percent
+ sal_Int8 getGraphicTransparency() const;
+ void setGraphicTransparency(sal_Int8 nNew);
+
void SetGraphicPos( SvxGraphicPosition eNew );
void SetGraphic( const Graphic& rNew );
void SetGraphicObject( const GraphicObject& rNewObj );
Modified: openoffice/trunk/main/editeng/inc/editeng/unoprnms.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unoprnms.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/inc/editeng/unoprnms.hxx (original)
+++ openoffice/trunk/main/editeng/inc/editeng/unoprnms.hxx Wed Mar 19 16:17:02 2014
@@ -37,8 +37,13 @@
#define UNO_NAME_FILLSTYLE "FillStyle"
#define UNO_NAME_FILLCOLOR "FillColor"
#define UNO_NAME_FILLGRADIENT "FillGradient"
+#define UNO_NAME_FILLGRADIENTNAME "FillGradientName"
#define UNO_NAME_FILLHATCH "FillHatch"
+#define UNO_NAME_FILLHATCHNAME "FillHatchName"
#define UNO_NAME_FILLBITMAP "FillBitmap"
+#define UNO_NAME_FILLBITMAPNAME "FillBitmapName"
+#define UNO_NAME_FILLBITMAPURL "FillBitmapURL"
+#define UNO_NAME_FILLGRADIENTSTEPCOUNT "FillGradientStepCount"
#define UNO_NAME_FILLBACKGROUND "FillBackground"
#define UNO_NAME_FILLCOLOR_2 "FillColor2"
@@ -62,6 +67,8 @@
#define UNO_NAME_FILLBMP_SIZE_X "FillBitmapSizeX"
#define UNO_NAME_FILLBMP_SIZE_Y "FillBitmapSizeY"
#define UNO_NAME_FILL_TRANSPARENCE "FillTransparence"
+#define UNO_NAME_FILLTRANSPARENCEGRADIENT "FillTransparenceGradient"
+#define UNO_NAME_FILLTRANSPARENCEGRADIENTNAME "FillTransparenceGradientName"
#define UNO_NAME_FILLBMP_MODE "FillBitmapMode"
#define UNO_NAME_FILL_GRADIENT_STYLE "FillGradientStyle"
Modified: openoffice/trunk/main/editeng/inc/editeng/unotext.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/inc/editeng/unotext.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/inc/editeng/unotext.hxx (original)
+++ openoffice/trunk/main/editeng/inc/editeng/unotext.hxx Wed Mar 19 16:17:02 2014
@@ -255,7 +255,7 @@ class EDITENG_DLLPUBLIC SvxUnoTextRangeB
{
friend class SvxUnoTextRangeEnumeration;
- friend class accessibility::AccessibleEditableTextPara;
+ friend class ::accessibility::AccessibleEditableTextPara;
protected:
SvxEditSource* mpEditSource;
Modified: openoffice/trunk/main/editeng/source/items/frmitems.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/items/frmitems.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/items/frmitems.cxx (original)
+++ openoffice/trunk/main/editeng/source/items/frmitems.cxx Wed Mar 19 16:17:02 2014
@@ -4127,6 +4127,24 @@ const GraphicObject* SvxBrushItem::GetGr
}
// -----------------------------------------------------------------------
+//UUUU
+sal_Int8 SvxBrushItem::getGraphicTransparency() const
+{
+ return pImpl->nGraphicTransparency;
+}
+
+// -----------------------------------------------------------------------
+//UUUU
+void SvxBrushItem::setGraphicTransparency(sal_Int8 nNew)
+{
+ if(nNew != pImpl->nGraphicTransparency)
+ {
+ pImpl->nGraphicTransparency = nNew;
+ ApplyGraphicTransparency_Impl();
+ }
+}
+
+// -----------------------------------------------------------------------
const Graphic* SvxBrushItem::GetGraphic() const
{
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Wed Mar 19 16:17:02 2014
@@ -351,6 +351,7 @@
DrawImpress, TextObject, hidden ;
DrawImpress, OLE, hidden ;
WriterVariants, Draw, visible ;
+ Writer, Frame, visible ;
</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
Modified: openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx (original)
+++ openoffice/trunk/main/reportdesign/source/ui/misc/UITools.cxx Wed Mar 19 16:17:02 2014
@@ -770,7 +770,7 @@ bool openAreaDialog( const uno::Referenc
{ // want the dialog to be destroyed before our set
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() ));
+ ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(), true));
bSuccess = ( RET_OK == pDialog->Execute() );
if ( bSuccess )
{
Modified: openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/drawfunc/drawsh.cxx Wed Mar 19 16:17:02 2014
@@ -459,7 +459,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxReq
AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(),
&aNewAttr,
pViewData->GetDocument()->GetDrawLayer(),
- pView);
+ true);
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
// #i74099# by default, the dialog deletes the current color table if a different one is loaded
Modified: openoffice/trunk/main/sd/source/ui/func/fuarea.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/func/fuarea.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/func/fuarea.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/func/fuarea.cxx Wed Mar 19 16:17:02 2014
@@ -78,7 +78,7 @@ void FuArea::DoExecute( SfxRequest& rReq
AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL,
&aNewAttr,
mpDoc,
- mpView) : 0;
+ true) : 0;
if( pDlg && (pDlg->Execute() == RET_OK) )
{
mpView->SetAttributes (*(pDlg->GetOutputItemSet ()));
Modified: openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx (original)
+++ openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx Wed Mar 19 16:17:02 2014
@@ -1394,14 +1394,24 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl
*/
{
- sal_uInt16 const nId = pTabCtrl->GetCurPageId();
+ sal_uInt16 nId = pTabCtrl->GetCurPageId();
DBG_ASSERT( pImpl->pData->Count(), "keine Pages angemeldet" );
SFX_APP();
- // Tab Page schon da?
- SfxTabPage* pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
- Data_Impl* pDataObject = Find( *pImpl->pData, nId );
+ // Tab Page schon da?
+ SfxTabPage* pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
+ Data_Impl* pDataObject = Find( *pImpl->pData, nId );
+
+ //UUUU fallback to 1st page when requested one does not exist
+ if(!pDataObject && pTabCtrl->GetPageCount())
+ {
+ pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0));
+ nId = pTabCtrl->GetCurPageId();
+ pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId));
+ Data_Impl* pDataObject = Find(*pImpl->pData, nId);
+ }
+
DBG_ASSERT( pDataObject, "Id nicht bekannt" );
// ggf. TabPage erzeugen:
Modified: openoffice/trunk/main/svl/source/undo/undo.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/undo/undo.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/undo/undo.cxx (original)
+++ openoffice/trunk/main/svl/source/undo/undo.cxx Wed Mar 19 16:17:02 2014
@@ -636,7 +636,15 @@ bool SfxUndoManager::ImplAddUndoAction_N
{
i_guard.markForDeletion( m_pData->pActUndoArray->aUndoActions[0].pAction );
m_pData->pActUndoArray->aUndoActions.Remove(0);
- --m_pData->pActUndoArray->nCurUndoAction;
+
+ if(m_pData->pActUndoArray->nCurUndoAction)
+ {
+ --m_pData->pActUndoArray->nCurUndoAction;
+ }
+ else
+ {
+ OSL_ENSURE(false, "CurrentUndoAction going negative (!)");
+ }
}
}
Modified: openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx Wed Mar 19 16:17:02 2014
@@ -70,7 +70,7 @@ namespace drawinglayer
attribute::SdrShadowAttribute createNewSdrShadowAttribute(
const SfxItemSet& rSet);
- attribute::SdrFillAttribute createNewSdrFillAttribute(
+ attribute::SdrFillAttribute SVX_DLLPUBLIC createNewSdrFillAttribute(
const SfxItemSet& rSet);
// #i101508# Support handing over given text-to-border distances
@@ -82,7 +82,7 @@ namespace drawinglayer
const sal_Int32* pRight = 0,
const sal_Int32* pLower = 0);
- attribute::FillGradientAttribute createNewTransparenceGradientAttribute(
+ attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute(
const SfxItemSet& rSet);
attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute(
Modified: openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx Wed Mar 19 16:17:02 2014
@@ -26,6 +26,8 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <svx/svxdllapi.h>
+
//////////////////////////////////////////////////////////////////////////////
// predefines
namespace basegfx {
@@ -47,30 +49,34 @@ namespace drawinglayer { namespace attri
namespace drawinglayer
{
- namespace primitive2d
- {
- Primitive2DReference createPolyPolygonFillPrimitive(
- const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
- const basegfx::B2DHomMatrix& rObjectTransform,
- const attribute::SdrFillAttribute& rFill,
- const attribute::FillGradientAttribute& rFillGradient);
-
- Primitive2DReference createPolygonLinePrimitive(
- const basegfx::B2DPolygon& rUnitPolygon,
- const basegfx::B2DHomMatrix& rObjectTransform,
- const attribute::SdrLineAttribute& rLine,
- const attribute::SdrLineStartEndAttribute& rStroke);
-
- Primitive2DReference createTextPrimitive(
- const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
- const basegfx::B2DHomMatrix& rObjectTransform,
- const attribute::SdrTextAttribute& rText,
- const attribute::SdrLineAttribute& rStroke,
- bool bCellText,
+ namespace primitive2d
+ {
+ Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive(
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ const attribute::SdrFillAttribute& rFill,
+ const attribute::FillGradientAttribute& rFillGradient);
+
+ Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive(
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ const basegfx::B2DRange& rDefinitionRange,
+ const attribute::SdrFillAttribute& rFill,
+ const attribute::FillGradientAttribute& rFillGradient);
+
+ Primitive2DReference SVX_DLLPUBLIC createPolygonLinePrimitive(
+ const basegfx::B2DPolygon& rPolygon,
+ const attribute::SdrLineAttribute& rLine,
+ const attribute::SdrLineStartEndAttribute& rStroke);
+
+ Primitive2DReference SVX_DLLPUBLIC createTextPrimitive(
+ const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
+ const basegfx::B2DHomMatrix& rObjectTransform,
+ const attribute::SdrTextAttribute& rText,
+ const attribute::SdrLineAttribute& rStroke,
+ bool bCellText,
bool bWordWrap,
- bool bClipOnBounds);
+ bool bClipOnBounds);
- Primitive2DSequence createEmbeddedShadowPrimitive(
+ Primitive2DSequence SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
const Primitive2DSequence& rContent,
const attribute::SdrShadowAttribute& rShadow);
Modified: openoffice/trunk/main/svx/inc/svx/svxdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/svxdlg.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/svxdlg.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/svxdlg.hxx Wed Mar 19 16:17:02 2014
@@ -446,7 +446,7 @@ public:
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
- const SdrView* pSdrView = NULL ) = 0 ;
+ bool bShadow) = 0 ;
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj = NULL,
Modified: openoffice/trunk/main/svx/inc/svx/svxids.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/svxids.hrc?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/trunk/main/svx/inc/svx/svxids.hrc Wed Mar 19 16:17:02 2014
@@ -413,13 +413,19 @@
#define SID_ATTR_ZOOM ( SID_SVX_START + 0 )
+// CAUTION! Range <1 .. 22> used by EditEngine (!)
+
#define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 )
+// CAUTION! Range <24 .. 43> used by EditEngine (!)
#define SID_ATTR_POSTIT_AUTHOR ( SID_SVX_START + 44 )
#define SID_ATTR_POSTIT_DATE ( SID_SVX_START + 45 )
#define SID_ATTR_POSTIT_TEXT ( SID_SVX_START + 46 )
#define SID_ATTR_SEARCH ( SID_SVX_START + 47 )
+
+// CAUTION! Range <48 .. 49> used by EditEngine (!)
+
#define SID_ATTR_PAGE ( SID_SVX_START + 50 )
#define SID_ATTR_PAGE_SIZE ( SID_SVX_START + 51 )
#define SID_ATTR_PAGE_MAXSIZE ( SID_SVX_START + 52 )
@@ -433,6 +439,9 @@
#define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 )
#define SID_ATTR_PAGE_SHARED ( SID_SVX_START + 62 )
#define SID_ATTR_PAGE_BSP ( SID_SVX_START + 63 )
+
+// CAUTION! Range <64 .. 67> used by EditEngine (!)
+
#define SID_ATTR_DBSESS_SERVERTYPE ( SID_SVX_START + 70 )
#define SID_ATTR_DBSESS_SERVEROPTS ( SID_SVX_START + 71 )
#define SID_ATTR_DBSESS_USERNAME ( SID_SVX_START + 72 )
@@ -608,6 +617,9 @@
#define SID_SPELL_DIALOG ( SID_SVX_START + 243 )
#define SID_INSERT_DRAW ( SID_SVX_START + 244 )
#define SID_THESAURUS ( SID_SVX_START + 245 )
+
+// CAUTION! Range <250 .. 250> used by EditEngine (!)
+
#define SID_AUTOCOMPLETEWORD ( SID_SVX_START + 251 )
#define SID_DRAW_TEXT ( SID_SVX_START + 253 )
#define SID_DRAW_CAPTION ( SID_SVX_START + 254 )
@@ -655,6 +667,9 @@
#define SID_PARA_DLG ( SID_SVX_START + 297 )
#define SID_ATTR_GRID_OPTIONS ( SID_SVX_START + 298 )
#define SID_ATTR_FILL_SHADOW ( SID_SVX_START + 299 )
+
+// CAUTION! Range <300 .. 300> used by EditEngine (!)
+
#define SID_ATTR_LINEEND_STYLE ( SID_SVX_START + 301 )
#define SID_ATTR_TRANSFORM_SLANT ( SID_SVX_START + 302 ) // !!!
#define SID_ATTR_TRANSFORM_SHEAR ( SID_SVX_START + 304 )
@@ -704,6 +719,9 @@
//#define SID_HYPERLINK_INSERT ( SID_SVX_START + 360 ) -> sfxsids.hrc
//#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc
//#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc
+
+// CAUTION! Range <363 .. 363> used by EditEngine (!)
+
#define SID_NO_GRAPHICS ( SID_SVX_START + 364 )
#define SID_IMPORT_GRAPH_LASTURL ( SID_SVX_START + 365 )
//#define SID_NAVIGATOR ( SID_SVX_START + 366 ) -> sfxsids.hrc
@@ -753,7 +771,7 @@
#define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 )
#define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 )
-//#define SID_ATTR_PARA_REGISTER ( SID_SVX_START + 413 ) -> editids.hrc
+// CAUTION! Range <413 .. 413> used by EditEngine (!)
//! moved to sfx2, still in use:
//#define SID_HTML_MODE ( SID_SVX_START + 414 )
@@ -803,6 +821,9 @@
#define SID_GROUP ( SID_SVX_START + 454 )
#define SID_UNGROUP ( SID_SVX_START + 455 )
#define SID_SET_DEFAULT ( SID_SVX_START + 456 )
+
+// CAUTION! Range <457 .. 457> used by EditEngine (!)
+
#define SID_BEZIER ( SID_SVX_START + 458 )
#define SID_ATTR_3D_DOUBLE_SIDED ( SID_SVX_START + 459 )
#define SID_ATTR_ALIGN_INDENT ( SID_SVX_START + 460 )
@@ -857,10 +878,15 @@
#define SID_TAB_REMOVE_ALL ( SID_SVX_START + 583 )
#define SID_TAB_REMOVE_BY_INDEX ( SID_SVX_START + 584 )
#define SID_OFA_VW_CREATE ( SID_SVX_START + 585 )
+
+// CAUTION! Range <587 .. 587> used by EditEngine (!)
+
#define SID_OFA_REL_DESIGNVIEW ( SID_SVX_START + 588 )
#define SID_OFA_MANUAL_SQL ( SID_SVX_START + 589 )
#define SID_PARA_BACKGRND_DESTINATION ( SID_SVX_START + 590 )
+// CAUTION! Range <591 .. 591> used by EditEngine (!)
+
#define SID_FMSLOTS_START ( SID_SVX_START + 592 )
#define SID_FM_CONFIG ( SID_SVX_START + 593 )
#define SID_FM_PUSHBUTTON ( SID_SVX_START + 594 )
@@ -1051,6 +1077,9 @@
#define SID_HLINKBAR_BOOKMARK ( SID_SVX_START + 852 )
#define SID_HLINKBAR_SEARCH ( SID_SVX_START + 853 )
#define SID_HLINKBAR_TARGET ( SID_SVX_START + 854 )
+
+// CAUTION! Range <855 .. 855> used by EditEngine (!)
+
#define SID_PARAM_NUM_PRESET ( SID_SVX_START + 856 )
#define SID_PARAM_CUR_NUMBER ( SID_SVX_START + 857 )
#define SID_PARAM_CHILD_LEVELS ( SID_SVX_START + 858 )
@@ -1069,17 +1098,29 @@
#define SID_ATTR_GRAF_RESERVE3 ( SID_SVX_START + 873 )
#define SID_ATTR_GRAF_RESERVE4 ( SID_SVX_START + 874 )
#define SID_ATTR_GRAF_RESERVE5 ( SID_SVX_START + 875 )
+
+// CAUTION! Range <877 .. 877> used by EditEngine (!)
+
//#define SID_COMP_BIBLIOGRAPHY ( SID_SVX_START + 880 ) -> sfxsids.hrc
#define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 )
#define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 )
#define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 )
#define SID_ATTR_GRAF_FRMSIZE_PERCENT ( SID_SVX_START + 885 )
#define SID_ATTR_GRAF_GRAPHIC ( SID_SVX_START + 886 )
+
+// CAUTION! Range <887 .. 903> used by EditEngine (!)
+
#define SID_ASIAN_DLG ( SID_SVX_START + 904 )
#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL
+
+// CAUTION! Range <905 .. 905> used by EditEngine (!)
+
#define SID_DRAW_CAPTION_VERTICAL ( SID_SVX_START + 906 )
#define SID_TEXTDIRECTION_LEFT_TO_RIGHT ( SID_SVX_START + 907 )
#define SID_TEXTDIRECTION_TOP_TO_BOTTOM ( SID_SVX_START + 908 )
+
+// CAUTION! Range <910 .. 911> used by EditEngine (!)
+
#define SID_TRANSLITERATE_UPPER ( SID_SVX_START + 912 )
#define SID_TRANSLITERATE_LOWER ( SID_SVX_START + 913 )
#define SID_TRANSLITERATE_HALFWIDTH ( SID_SVX_START + 914 )
@@ -1087,10 +1128,15 @@
#define SID_TRANSLITERATE_HIRAGANA ( SID_SVX_START + 916 )
#define SID_TRANSLITERATE_KATAGANA ( SID_SVX_START + 917 )
#define SID_MN_SUB_TRANSLITERATE ( SID_SVX_START + 918 )
+
+// CAUTION! Range <919 .. 920> used by EditEngine (!)
+
#define SID_LANGUAGE_OPTIONS ( SID_SVX_START + 921 )
#define SID_GETUNDOSTRINGS ( SID_SVX_START + 923 )
#define SID_GETREDOSTRINGS ( SID_SVX_START + 924 )
+// CAUTION! Range <925 .. 925> used by EditEngine (!)
+
#define SID_INSERT_IMAGECONTROL ( SID_SVX_START + 926 )
#define SID_INSERT_PROGRESSBAR ( SID_SVX_START + 927 )
#define SID_INSERT_HFIXEDLINE ( SID_SVX_START + 928 )
@@ -1109,9 +1155,18 @@
#define SID_INSERT_PATTERNFIELD ( SID_SVX_START + 941 )
#define SID_INSERT_FILECONTROL ( SID_SVX_START + 942 )
#define SID_SHOW_PROPERTYBROWSER ( SID_SVX_START + 943 )
+
+// CAUTION! Range <944 .. 945> used by EditEngine (!)
+
#define SID_ATTR_TABSTOP_VERTICAL ( SID_SVX_START + 946 )
+
+// CAUTION! Range <947 .. 947> used by EditEngine (!)
+
#define SID_RULER_BORDERS_VERTICAL ( SID_SVX_START + 948 )
#define SID_ATTR_ALIGN_ASIANVERTICAL ( SID_SVX_START + 949 )
+
+// CAUTION! Range <950 .. 951> used by EditEngine (!)
+
#define SID_RULER_TEXT_RIGHT_TO_LEFT ( SID_SVX_START + 952 )
#define SID_ATTR_HDFT_DYNAMIC_SPACING ( SID_SVX_START + 953 )
#define SID_ATTR_NUMBERFORMAT_ADD_AUTO ( SID_SVX_START + 954 )
@@ -1149,10 +1204,16 @@
#define SID_FONTWORK_KERN_CHARACTER_PAIRS ( SID_SVX_START + 986 )
#define SID_DRAW_FONTWORK ( SID_SVX_START + 987 )
#define SID_DRAW_FONTWORK_VERTICAL ( SID_SVX_START + 988 )
+
+// CAUTION! Range <989 .. 989> used by EditEngine (!)
+
#define SID_ATTR_BORDER_CONNECT ( SID_SVX_START + 990 )
#define SID_SW_FOLLOW_TEXT_FLOW ( SID_SVX_START + 991 ) /* #i18732# - slot-id for new option IsFollowingTextFlow' */
#define SID_RULER_ROWS ( SID_SVX_START + 992 )
#define SID_RULER_ROWS_VERTICAL ( SID_SVX_START + 993 )
+
+// CAUTION! Range <994 .. 998> used by EditEngine (!)
+
#define SID_ATTR_TRANSFORM_HORI_POSITION ( SID_SVX_START + 999 )
#define SID_ATTR_TRANSFORM_VERT_POSITION ( SID_SVX_START + 1000 )
#define SID_SHOW_ITEMBROWSER ( SID_SVX_START + 1001 )
@@ -1284,8 +1345,11 @@
#define FN_SVX_SET_NUMBER (SID_SVX_START + 1117)
#define FN_SVX_SET_BULLET (SID_SVX_START + 1118)
+//UUUU
+#define SID_OFFER_IMPORT ( SID_SVX_START + 1119)
+
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (FN_SVX_SET_BULLET + 1)
+#define SID_SVX_FIRSTFREE (SID_OFFER_IMPORT + 1)
// --------------------------------------------------------------------------
// Overflow check for slot IDs
Modified: openoffice/trunk/main/svx/inc/svx/unoshprp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/unoshprp.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/unoshprp.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/unoshprp.hxx Wed Mar 19 16:17:02 2014
@@ -254,17 +254,17 @@
FILL_PROPERTIES_DEFAULTS \
{ MAP_CHAR_LEN(UNO_NAME_FILLBACKGROUND), XATTR_FILLBACKGROUND , &::getBooleanCppuType(), 0, 0}, \
{ MAP_CHAR_LEN(UNO_NAME_FILLBITMAP), XATTR_FILLBITMAP , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) , 0, MID_BITMAP}, \
- { MAP_CHAR_LEN("FillBitmapName"), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
- { MAP_CHAR_LEN("FillBitmapURL"), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAFURL }, \
- { MAP_CHAR_LEN("FillGradientStepCount"), XATTR_GRADIENTSTEPCOUNT , &::getCppuType((const sal_Int16*)0), 0, 0}, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLBITMAPNAME), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLBITMAPURL), XATTR_FILLBITMAP , &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAFURL }, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLGRADIENTSTEPCOUNT), XATTR_GRADIENTSTEPCOUNT , &::getCppuType((const sal_Int16*)0), 0, 0}, \
{ MAP_CHAR_LEN(UNO_NAME_FILLGRADIENT), XATTR_FILLGRADIENT , &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \
- { MAP_CHAR_LEN("FillGradientName"), XATTR_FILLGRADIENT , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLGRADIENTNAME), XATTR_FILLGRADIENT , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
{ MAP_CHAR_LEN(UNO_NAME_FILLHATCH), XATTR_FILLHATCH , &::getCppuType((const ::com::sun::star::drawing::Hatch*)0), 0, MID_FILLHATCH}, \
- { MAP_CHAR_LEN("FillHatchName"), XATTR_FILLHATCH , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLHATCHNAME), XATTR_FILLHATCH , &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
{ MAP_CHAR_LEN(UNO_NAME_FILLSTYLE), XATTR_FILLSTYLE , &::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) , 0, 0}, \
{ MAP_CHAR_LEN(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, &::getCppuType((const sal_Int16*)0) , 0, 0}, \
- { MAP_CHAR_LEN("FillTransparenceGradient"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \
- { MAP_CHAR_LEN("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::com::sun::star::awt::Gradient*)0), 0, MID_FILLGRADIENT}, \
+ { MAP_CHAR_LEN(UNO_NAME_FILLTRANSPARENCEGRADIENTNAME), XATTR_FILLFLOATTRANSPARENCE, &::getCppuType((const ::rtl::OUString*)0), 0, MID_NAME }, \
{ MAP_CHAR_LEN(UNO_NAME_FILLCOLOR_2), XATTR_SECONDARYFILLCOLOR, &::getCppuType((const sal_Int32*)0), 0, 0},
#define EDGERADIUS_PROPERTIES \
Modified: openoffice/trunk/main/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx Wed Mar 19 16:17:02 2014
@@ -75,11 +75,9 @@ namespace sdr
rOwnerPage.GetWdt() - rOwnerPage.GetRgtBorder(),
rOwnerPage.GetHgt() - rOwnerPage.GetLwrBorder());
const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange));
- const basegfx::B2DHomMatrix aEmptyTransform;
const drawinglayer::primitive2d::Primitive2DReference xReference(
drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
basegfx::B2DPolyPolygon(aInnerPolgon),
- aEmptyTransform,
aFill,
drawinglayer::attribute::FillGradientAttribute()));
Modified: openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx Wed Mar 19 16:17:02 2014
@@ -175,7 +175,6 @@ namespace sdr
// if there is shadow, create the specialized shadow primitive
xSpecialShadow = drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
aClippedShadow,
- basegfx::B2DHomMatrix(),
aFill,
drawinglayer::attribute::FillGradientAttribute());
}
Modified: openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/contact/viewcontactofsdrpage.cxx Wed Mar 19 16:17:02 2014
@@ -251,11 +251,9 @@ namespace sdr
rPage.GetLftBorder(), rPage.GetUppBorder(),
rPage.GetWdt() - rPage.GetRgtBorder(), rPage.GetHgt() - rPage.GetLwrBorder());
const basegfx::B2DPolygon aInnerPolgon(basegfx::tools::createPolygonFromRect(aInnerRange));
- const basegfx::B2DHomMatrix aEmptyTransform;
const drawinglayer::primitive2d::Primitive2DReference xReference(
drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
basegfx::B2DPolyPolygon(aInnerPolgon),
- aEmptyTransform,
aFill,
drawinglayer::attribute::FillGradientAttribute()));
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -60,11 +60,13 @@ namespace drawinglayer
getTransform()));
}
else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aUnitOutline),
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -84,20 +86,23 @@ namespace drawinglayer
false,
basegfx::B2DPolyPolygon(getTail()),
getTransform()));
- }
- else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ }
+ else
+ {
+ basegfx::B2DPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- aUnitOutline,
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
- attribute::SdrLineStartEndAttribute()));
+ attribute::SdrLineStartEndAttribute()));
+ aTransformed = getTail();
+ aTransformed.transform(getTransform());
appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- getTail(),
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
getSdrLFSTAttribute().getLineStartEnd()));
}
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -51,14 +51,13 @@ namespace drawinglayer
appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createHiddenGeometryPrimitives2D(
false,
- basegfx::B2DPolyPolygon(getUnitPolygon())));
- }
- else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ basegfx::B2DPolyPolygon(getUnitPolygon())));
+ }
+ else
+ {
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
getUnitPolygon(),
- basegfx::B2DHomMatrix(),
getSdrLSTAttribute().getLine(),
getSdrLSTAttribute().getLineStartEnd()));
}
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx Wed Mar 19 16:17:02 2014
@@ -58,93 +58,118 @@ using namespace com::sun::star;
namespace drawinglayer
{
- namespace primitive2d
- {
- Primitive2DReference createPolyPolygonFillPrimitive(
- const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
- const basegfx::B2DHomMatrix& rObjectTransform,
- const attribute::SdrFillAttribute& rFill,
- const attribute::FillGradientAttribute& rFillGradient)
- {
- // prepare fully scaled polygon
- basegfx::B2DPolyPolygon aScaledPolyPolygon(rUnitPolyPolygon);
- aScaledPolyPolygon.transform(rObjectTransform);
- BasePrimitive2D* pNewFillPrimitive = 0;
+ namespace primitive2d
+ {
+ Primitive2DReference createPolyPolygonFillPrimitive(
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ const attribute::SdrFillAttribute& rFill,
+ const attribute::FillGradientAttribute& rFillGradient)
+ {
+ // when we have no given definition range, use the range of the given geometry
+ // also for definition (simplest case)
+ const basegfx::B2DRange aRange(basegfx::tools::getRange(rPolyPolygon));
+
+ return createPolyPolygonFillPrimitive(
+ rPolyPolygon,
+ aRange,
+ rFill,
+ rFillGradient);
+ }
- if(!rFill.getGradient().isDefault())
- {
- pNewFillPrimitive = new PolyPolygonGradientPrimitive2D(aScaledPolyPolygon, rFill.getGradient());
- }
- else if(!rFill.getHatch().isDefault())
- {
- pNewFillPrimitive = new PolyPolygonHatchPrimitive2D(aScaledPolyPolygon, rFill.getColor(), rFill.getHatch());
- }
- else if(!rFill.getFillGraphic().isDefault())
- {
- const basegfx::B2DRange aRange(basegfx::tools::getRange(aScaledPolyPolygon));
- pNewFillPrimitive = new PolyPolygonGraphicPrimitive2D(aScaledPolyPolygon, rFill.getFillGraphic().createFillGraphicAttribute(aRange));
- }
- else
- {
- pNewFillPrimitive = new PolyPolygonColorPrimitive2D(aScaledPolyPolygon, rFill.getColor());
- }
+ Primitive2DReference createPolyPolygonFillPrimitive(
+ const basegfx::B2DPolyPolygon& rPolyPolygon,
+ const basegfx::B2DRange& rDefinitionRange,
+ const attribute::SdrFillAttribute& rFill,
+ const attribute::FillGradientAttribute& rFillGradient)
+ {
+ if(basegfx::fTools::moreOrEqual(rFill.getTransparence(), 1.0))
+ {
+ return Primitive2DReference();
+ }
- if(0.0 != rFill.getTransparence())
- {
- // create simpleTransparencePrimitive, add created fill primitive
- const Primitive2DReference xRefA(pNewFillPrimitive);
- const Primitive2DSequence aContent(&xRefA, 1L);
- return Primitive2DReference(new UnifiedTransparencePrimitive2D(aContent, rFill.getTransparence()));
- }
- else if(!rFillGradient.isDefault())
- {
- // create sequence with created fill primitive
- const Primitive2DReference xRefA(pNewFillPrimitive);
- const Primitive2DSequence aContent(&xRefA, 1L);
+ // prepare fully scaled polygon
+ BasePrimitive2D* pNewFillPrimitive = 0;
- // create FillGradientPrimitive2D for transparence and add to new sequence
- // fillGradientPrimitive is enough here (compared to PolyPolygonGradientPrimitive2D) since float transparence will be masked anyways
- const basegfx::B2DRange aRange(basegfx::tools::getRange(aScaledPolyPolygon));
- const Primitive2DReference xRefB(new FillGradientPrimitive2D(aRange, rFillGradient));
- const Primitive2DSequence aAlpha(&xRefB, 1L);
+ if(!rFill.getGradient().isDefault())
+ {
+ pNewFillPrimitive = new PolyPolygonGradientPrimitive2D(
+ rPolyPolygon,
+ rDefinitionRange,
+ rFill.getGradient());
+ }
+ else if(!rFill.getHatch().isDefault())
+ {
+ pNewFillPrimitive = new PolyPolygonHatchPrimitive2D(
+ rPolyPolygon,
+ rDefinitionRange,
+ rFill.getColor(),
+ rFill.getHatch());
+ }
+ else if(!rFill.getFillGraphic().isDefault())
+ {
+ pNewFillPrimitive = new PolyPolygonGraphicPrimitive2D(
+ rPolyPolygon,
+ rDefinitionRange,
+ rFill.getFillGraphic().createFillGraphicAttribute(rDefinitionRange));
+ }
+ else
+ {
+ pNewFillPrimitive = new PolyPolygonColorPrimitive2D(
+ rPolyPolygon,
+ rFill.getColor());
+ }
- // create TransparencePrimitive2D using alpha and content
- return Primitive2DReference(new TransparencePrimitive2D(aContent, aAlpha));
- }
- else
- {
- // add to decomposition
- return Primitive2DReference(pNewFillPrimitive);
- }
- }
+ if(0.0 != rFill.getTransparence())
+ {
+ // create simpleTransparencePrimitive, add created fill primitive
+ const Primitive2DReference xRefA(pNewFillPrimitive);
+ const Primitive2DSequence aContent(&xRefA, 1L);
+ return Primitive2DReference(new UnifiedTransparencePrimitive2D(aContent, rFill.getTransparence()));
+ }
+ else if(!rFillGradient.isDefault())
+ {
+ // create sequence with created fill primitive
+ const Primitive2DReference xRefA(pNewFillPrimitive);
+ const Primitive2DSequence aContent(&xRefA, 1L);
+
+ // create FillGradientPrimitive2D for transparence and add to new sequence
+ // fillGradientPrimitive is enough here (compared to PolyPolygonGradientPrimitive2D) since float transparence will be masked anyways
+ const basegfx::B2DRange aRange(basegfx::tools::getRange(rPolyPolygon));
+ const Primitive2DReference xRefB(new FillGradientPrimitive2D(aRange, rFillGradient));
+ const Primitive2DSequence aAlpha(&xRefB, 1L);
+
+ // create TransparencePrimitive2D using alpha and content
+ return Primitive2DReference(new TransparencePrimitive2D(aContent, aAlpha));
+ }
+ else
+ {
+ // add to decomposition
+ return Primitive2DReference(pNewFillPrimitive);
+ }
+ }
Primitive2DReference createPolygonLinePrimitive(
- const basegfx::B2DPolygon& rUnitPolygon,
- const basegfx::B2DHomMatrix& rObjectTransform,
+ const basegfx::B2DPolygon& rPolygon,
const attribute::SdrLineAttribute& rLine,
const attribute::SdrLineStartEndAttribute& rStroke)
{
- // prepare fully scaled polygon
- basegfx::B2DPolygon aScaledPolygon(rUnitPolygon);
- aScaledPolygon.transform(rObjectTransform);
-
// create line and stroke attribute
const attribute::LineAttribute aLineAttribute(rLine.getColor(), rLine.getWidth(), rLine.getJoin(), rLine.getCap());
const attribute::StrokeAttribute aStrokeAttribute(rLine.getDotDashArray(), rLine.getFullDotDashLen());
BasePrimitive2D* pNewLinePrimitive = 0L;
- if(!rUnitPolygon.isClosed() && !rStroke.isDefault())
+ if(!rPolygon.isClosed() && !rStroke.isDefault())
{
attribute::LineStartEndAttribute aStart(rStroke.getStartWidth(), rStroke.getStartPolyPolygon(), rStroke.isStartCentered());
attribute::LineStartEndAttribute aEnd(rStroke.getEndWidth(), rStroke.getEndPolyPolygon(), rStroke.isEndCentered());
// create data
- pNewLinePrimitive = new PolygonStrokeArrowPrimitive2D(aScaledPolygon, aLineAttribute, aStrokeAttribute, aStart, aEnd);
+ pNewLinePrimitive = new PolygonStrokeArrowPrimitive2D(rPolygon, aLineAttribute, aStrokeAttribute, aStart, aEnd);
}
else
{
// create data
- pNewLinePrimitive = new PolygonStrokePrimitive2D(aScaledPolygon, aLineAttribute, aStrokeAttribute);
+ pNewLinePrimitive = new PolygonStrokePrimitive2D(rPolygon, aLineAttribute, aStrokeAttribute);
}
if(0.0 != rLine.getTransparence())
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -59,13 +59,15 @@ namespace drawinglayer
// apply to the geometry
aUnitOutline.transform(aUnitCorrectionMatrix);
- // add fill
- if(!getSdrLFSTAttribute().getFill().isDefault())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ // add fill
+ if(!getSdrLFSTAttribute().getFill().isDefault())
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aUnitOutline),
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -79,13 +81,15 @@ namespace drawinglayer
false,
basegfx::B2DPolyPolygon(aUnitOutline),
getTransform()));
- }
- else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ }
+ else
+ {
+ basegfx::B2DPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- aUnitOutline,
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
attribute::SdrLineStartEndAttribute()));
}
@@ -175,13 +179,15 @@ namespace drawinglayer
// apply to the geometry
aUnitOutline.transform(aUnitCorrectionMatrix);
- // add fill
- if(!getSdrLFSTAttribute().getFill().isDefault() && aUnitOutline.isClosed())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ // add fill
+ if(!getSdrLFSTAttribute().getFill().isDefault() && aUnitOutline.isClosed())
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aUnitOutline),
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -195,13 +201,15 @@ namespace drawinglayer
false,
basegfx::B2DPolyPolygon(aUnitOutline),
getTransform()));
- }
- else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ }
+ else
+ {
+ basegfx::B2DPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- aUnitOutline,
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
getSdrLFSTAttribute().getLineStartEnd()));
}
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -44,13 +44,15 @@ namespace drawinglayer
// create unit outline polygon
basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon());
- // add fill, but only when graphic ist transparent
- if(!getSdrLFSTAttribute().getFill().isDefault() && isTransparent())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
- createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aUnitOutline),
- getTransform(),
+ // add fill, but only when graphic ist transparent
+ if(!getSdrLFSTAttribute().getFill().isDefault() && isTransparent())
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ createPolyPolygonFillPrimitive(
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -87,22 +89,25 @@ namespace drawinglayer
const basegfx::B2DRange aExpandedRange(-fScaleX, -fScaleY, 1.0 + fScaleX, 1.0 + fScaleY);
basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange));
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ aExpandedUnitOutline.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
aExpandedUnitOutline,
- getTransform(),
getSdrLFSTAttribute().getLine(),
- attribute::SdrLineStartEndAttribute()));
- }
- else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ attribute::SdrLineStartEndAttribute()));
+ }
+ else
+ {
+ basegfx::B2DPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- aUnitOutline, getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
- attribute::SdrLineStartEndAttribute()));
- }
- }
+ attribute::SdrLineStartEndAttribute()));
+ }
+ }
// add text
if(!getSdrLFSTAttribute().getText().isDefault())
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -42,49 +42,51 @@ using namespace com::sun::star;
namespace drawinglayer
{
- namespace primitive2d
- {
- Primitive2DReference SdrMeasurePrimitive2D::impCreatePart(
- const attribute::SdrLineAttribute& rLineAttribute,
- const basegfx::B2DHomMatrix& rObjectMatrix,
- const basegfx::B2DPoint& rStart,
- const basegfx::B2DPoint& rEnd,
- bool bLeftActive,
- bool bRightActive) const
- {
- const attribute::SdrLineStartEndAttribute& rLineStartEnd = getSdrLSTAttribute().getLineStartEnd();
- basegfx::B2DPolygon aPolygon;
+ namespace primitive2d
+ {
+ Primitive2DReference SdrMeasurePrimitive2D::impCreatePart(
+ const attribute::SdrLineAttribute& rLineAttribute,
+ const basegfx::B2DHomMatrix& rObjectMatrix,
+ const basegfx::B2DPoint& rStart,
+ const basegfx::B2DPoint& rEnd,
+ bool bLeftActive,
+ bool bRightActive) const
+ {
+ const attribute::SdrLineStartEndAttribute& rLineStartEnd = getSdrLSTAttribute().getLineStartEnd();
+ basegfx::B2DPolygon aPolygon;
+
+ aPolygon.append(rStart);
+ aPolygon.append(rEnd);
+ aPolygon.transform(rObjectMatrix);
- aPolygon.append(rStart);
- aPolygon.append(rEnd);
-
- if(rLineStartEnd.isDefault() || (!bLeftActive && !bRightActive))
- {
- return createPolygonLinePrimitive(
- aPolygon,
- rObjectMatrix,
- rLineAttribute,
- attribute::SdrLineStartEndAttribute());
- }
-
+ if(rLineStartEnd.isDefault() || (!bLeftActive && !bRightActive))
+ {
+ return createPolygonLinePrimitive(
+ aPolygon,
+ rLineAttribute,
+ attribute::SdrLineStartEndAttribute());
+ }
+
if(bLeftActive && bRightActive)
- {
- return createPolygonLinePrimitive(
- aPolygon,
- rObjectMatrix,
- rLineAttribute,
- rLineStartEnd);
- }
-
- const basegfx::B2DPolyPolygon aEmpty;
- const attribute::SdrLineStartEndAttribute aLineStartEnd(
- bLeftActive ? rLineStartEnd.getStartPolyPolygon() : aEmpty, bRightActive ? rLineStartEnd.getEndPolyPolygon() : aEmpty,
- bLeftActive ? rLineStartEnd.getStartWidth() : 0.0, bRightActive ? rLineStartEnd.getEndWidth() : 0.0,
- bLeftActive ? rLineStartEnd.isStartActive() : false, bRightActive ? rLineStartEnd.isEndActive() : false,
- bLeftActive ? rLineStartEnd.isStartCentered() : false, bRightActive? rLineStartEnd.isEndCentered() : false);
-
- return createPolygonLinePrimitive(aPolygon, rObjectMatrix, rLineAttribute, aLineStartEnd);
- }
+ {
+ return createPolygonLinePrimitive(
+ aPolygon,
+ rLineAttribute,
+ rLineStartEnd);
+ }
+
+ const basegfx::B2DPolyPolygon aEmpty;
+ const attribute::SdrLineStartEndAttribute aLineStartEnd(
+ bLeftActive ? rLineStartEnd.getStartPolyPolygon() : aEmpty, bRightActive ? rLineStartEnd.getEndPolyPolygon() : aEmpty,
+ bLeftActive ? rLineStartEnd.getStartWidth() : 0.0, bRightActive ? rLineStartEnd.getEndWidth() : 0.0,
+ bLeftActive ? rLineStartEnd.isStartActive() : false, bRightActive ? rLineStartEnd.isEndActive() : false,
+ bLeftActive ? rLineStartEnd.isStartCentered() : false, bRightActive? rLineStartEnd.isEndCentered() : false);
+
+ return createPolygonLinePrimitive(
+ aPolygon,
+ rLineAttribute,
+ aLineStartEnd);
+ }
Primitive2DSequence SdrMeasurePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const
{
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -85,14 +85,16 @@ namespace drawinglayer
// create unit outline polygon
const basegfx::B2DPolygon aUnitOutline(basegfx::tools::createUnitPolygon());
- // add fill
- if(!bBehaveCompatibleToPaintVersion
- && !getSdrLFSTAttribute().getFill().isDefault())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
- createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aUnitOutline),
- getTransform(),
+ // add fill
+ if(!bBehaveCompatibleToPaintVersion
+ && !getSdrLFSTAttribute().getFill().isDefault())
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ createPolyPolygonFillPrimitive(
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -112,30 +114,32 @@ namespace drawinglayer
double fRotate, fShearX;
getTransform().decompose(aScale, aTranslate, fRotate, fShearX);
- // create expanded range (add relative half line width to unit rectangle)
- double fHalfLineWidth(getSdrLFSTAttribute().getLine().getWidth() * 0.5);
- double fScaleX(0.0 != aScale.getX() ? fHalfLineWidth / fabs(aScale.getX()) : 1.0);
- double fScaleY(0.0 != aScale.getY() ? fHalfLineWidth / fabs(aScale.getY()) : 1.0);
- const basegfx::B2DRange aExpandedRange(-fScaleX, -fScaleY, 1.0 + fScaleX, 1.0 + fScaleY);
- basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange));
+ // create expanded range (add relative half line width to unit rectangle)
+ double fHalfLineWidth(getSdrLFSTAttribute().getLine().getWidth() * 0.5);
+ double fScaleX(0.0 != aScale.getX() ? fHalfLineWidth / fabs(aScale.getX()) : 1.0);
+ double fScaleY(0.0 != aScale.getY() ? fHalfLineWidth / fabs(aScale.getY()) : 1.0);
+ const basegfx::B2DRange aExpandedRange(-fScaleX, -fScaleY, 1.0 + fScaleX, 1.0 + fScaleY);
+ basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange));
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ aExpandedUnitOutline.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
aExpandedUnitOutline,
- getTransform(),
getSdrLFSTAttribute().getLine(),
- attribute::SdrLineStartEndAttribute()));
- }
- else
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ attribute::SdrLineStartEndAttribute()));
+ }
+ else
+ {
+ basegfx::B2DPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- aUnitOutline,
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
- attribute::SdrLineStartEndAttribute()));
- }
- }
+ attribute::SdrLineStartEndAttribute()));
+ }
+ }
else
{
// if initially no line is defined, create one for HitTest and BoundRect
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -49,10 +49,12 @@ namespace drawinglayer
{
// #i108255# no need to use correctOrientations here; target is
// straight visualisation
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ basegfx::B2DPolyPolygon aTransformed(getUnitPolyPolygon());
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolyPolygonFillPrimitive(
- getUnitPolyPolygon(),
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -66,22 +68,24 @@ namespace drawinglayer
false,
getUnitPolyPolygon(),
getTransform()));
- }
- else
- {
- Primitive2DSequence aTemp(getUnitPolyPolygon().count());
-
- for(sal_uInt32 a(0); a < getUnitPolyPolygon().count(); a++)
- {
- aTemp[a] = createPolygonLinePrimitive(
- getUnitPolyPolygon().getB2DPolygon(a),
- getTransform(),
+ }
+ else
+ {
+ Primitive2DSequence aTemp(getUnitPolyPolygon().count());
+
+ for(sal_uInt32 a(0); a < getUnitPolyPolygon().count(); a++)
+ {
+ basegfx::B2DPolygon aTransformed(getUnitPolyPolygon().getB2DPolygon(a));
+
+ aTransformed.transform(getTransform());
+ aTemp[a] = createPolygonLinePrimitive(
+ aTransformed,
getSdrLFSTAttribute().getLine(),
getSdrLFSTAttribute().getLineStartEnd());
- }
+ }
- appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, aTemp);
- }
+ appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, aTemp);
+ }
// add text
if(!getSdrLFSTAttribute().getText().isDefault())
Modified: openoffice/trunk/main/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx (original)
+++ openoffice/trunk/main/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx Wed Mar 19 16:17:02 2014
@@ -50,13 +50,15 @@ namespace drawinglayer
getCornerRadiusX(),
getCornerRadiusY()));
- // add fill
- if(!getSdrLFSTAttribute().getFill().isDefault())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ // add fill
+ if(!getSdrLFSTAttribute().getFill().isDefault())
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolyPolygonFillPrimitive(
- basegfx::B2DPolyPolygon(aUnitOutline),
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getFill(),
getSdrLFSTAttribute().getFillFloatTransGradient()));
}
@@ -71,16 +73,18 @@ namespace drawinglayer
getTransform()));
}
- // add line
- if(!getSdrLFSTAttribute().getLine().isDefault())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ // add line
+ if(!getSdrLFSTAttribute().getLine().isDefault())
+ {
+ basegfx::B2DPolygon aTransformed(aUnitOutline);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
createPolygonLinePrimitive(
- aUnitOutline,
- getTransform(),
+ aTransformed,
getSdrLFSTAttribute().getLine(),
- attribute::SdrLineStartEndAttribute()));
- }
+ attribute::SdrLineStartEndAttribute()));
+ }
else if(!getForceFillForHitTest())
{
// if initially no line is defined and it's not a text frame, create
Modified: openoffice/trunk/main/svx/source/svdraw/svddrgmt.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svddrgmt.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svddrgmt.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svddrgmt.cxx Wed Mar 19 16:17:02 2014
@@ -942,28 +942,27 @@ drawinglayer::primitive2d::Primitive2DSe
}
}
- if(bUseSolidDragging)
- {
- const SfxItemSet& rItemSet = pEdge->GetMergedItemSet();
- const drawinglayer::attribute::SdrLineAttribute aLine(
- drawinglayer::primitive2d::createNewSdrLineAttribute(rItemSet));
+ if(bUseSolidDragging)
+ {
+ const SfxItemSet& rItemSet = pEdge->GetMergedItemSet();
+ const drawinglayer::attribute::SdrLineAttribute aLine(
+ drawinglayer::primitive2d::createNewSdrLineAttribute(rItemSet));
- if(!aLine.isDefault())
- {
- const drawinglayer::attribute::SdrLineStartEndAttribute aLineStartEnd(
- drawinglayer::primitive2d::createNewSdrLineStartEndAttribute(
- rItemSet,
- aLine.getWidth()));
-
- drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(
- aRetval, drawinglayer::primitive2d::createPolygonLinePrimitive(
- aEdgePolygon,
- basegfx::B2DHomMatrix(),
- aLine,
- aLineStartEnd));
- }
- }
- else
+ if(!aLine.isDefault())
+ {
+ const drawinglayer::attribute::SdrLineStartEndAttribute aLineStartEnd(
+ drawinglayer::primitive2d::createNewSdrLineStartEndAttribute(
+ rItemSet,
+ aLine.getWidth()));
+
+ drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(
+ aRetval, drawinglayer::primitive2d::createPolygonLinePrimitive(
+ aEdgePolygon,
+ aLine,
+ aLineStartEnd));
+ }
+ }
+ else
{
const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
basegfx::BColor aColA(aSvtOptionsDrawinglayer.GetStripeColorA().getBColor());
Modified: openoffice/trunk/main/svx/source/table/viewcontactoftableobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/table/viewcontactoftableobj.cxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/table/viewcontactoftableobj.cxx (original)
+++ openoffice/trunk/main/svx/source/table/viewcontactoftableobj.cxx Wed Mar 19 16:17:02 2014
@@ -95,16 +95,18 @@ namespace drawinglayer
Primitive2DSequence aRetval;
const basegfx::B2DPolyPolygon aUnitPolyPolygon(basegfx::tools::createUnitPolygon());
- // add fill
- if(!getSdrFTAttribute().getFill().isDefault())
- {
- appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
- createPolyPolygonFillPrimitive(
- aUnitPolyPolygon,
- getTransform(),
- getSdrFTAttribute().getFill(),
- getSdrFTAttribute().getFillFloatTransGradient()));
- }
+ // add fill
+ if(!getSdrFTAttribute().getFill().isDefault())
+ {
+ basegfx::B2DPolyPolygon aTransformed(aUnitPolyPolygon);
+
+ aTransformed.transform(getTransform());
+ appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
+ createPolyPolygonFillPrimitive(
+ aTransformed,
+ getSdrFTAttribute().getFill(),
+ getSdrFTAttribute().getFillFloatTransGradient()));
+ }
else
{
// if no fill create one for HitTest and BoundRect fallback
Modified: openoffice/trunk/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_sw.mk?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_sw.mk (original)
+++ openoffice/trunk/main/sw/Library_sw.mk Wed Mar 19 16:17:02 2014
@@ -281,6 +281,7 @@ $(eval $(call gb_Library_add_exception_o
sw/source/core/layout/anchoreddrawobject \
sw/source/core/layout/anchoredobject \
sw/source/core/layout/atrfrm \
+ sw/source/core/layout/fillattributes \
sw/source/core/layout/calcmove \
sw/source/core/layout/colfrm \
sw/source/core/layout/dbg_lay \
@@ -449,6 +450,7 @@ $(eval $(call gb_Library_add_exception_o
sw/source/core/unocore/unoport \
sw/source/core/unocore/unoportenum \
sw/source/core/unocore/unoprnms \
+ sw/source/core/unocore/unobrushitemhelper \
sw/source/core/unocore/unoredline \
sw/source/core/unocore/unoredlines \
sw/source/core/unocore/unorefmk \
Modified: openoffice/trunk/main/sw/inc/doc.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/doc.hxx?rev=1579280&r1=1579279&r2=1579280&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/doc.hxx (original)
+++ openoffice/trunk/main/sw/inc/doc.hxx Wed Mar 19 16:17:02 2014
@@ -1120,6 +1120,13 @@ public:
const sal_Bool bDelRedlines = sal_True,
const sal_Bool bCopyFlyAtFly = sal_False ) const;
+ //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
+ // and evtl. corrects that items to ensure unique names for that type. This call may
+ // modify/correct entries inside of the given SfxItemSet, and it will apply a name to
+ // the items in question (what is essential to make the named slots associated with
+ // these items work for the UNO API and thus e.g. for ODF im/export)
+ void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
+
sal_Bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
sal_Bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,