CWS-TOOLING: integrate CWS aw062

2009-01-27 15:15:53 +0100 aw  r266999 : #i97982# corrected small error in ObjectContactOfPageView::isOutputToPDFFile()
2009-01-15 16:02:22 +0100 aw  r266378 : #i89872# corrected SdrModel::ImpSetUIUnit to not lose numeric information
2009-01-14 15:16:43 +0100 aw  r266309 : #i98072# adde d text suppression for FontworkGallery AutoShapes in ViewContactOfSdrObjCustomShape::createViewIndependentPrimitive2DSequence
2009-01-14 12:35:32 +0100 aw  r266283 : #i97878# added TRGetBaseGeometry/TRSetBaseGeometry implementations to SdrMeasureObj
2009-01-14 12:06:47 +0100 aw  r266274 : #i97981# corrected the interpretation of bBehaveCompatibleToPaintVersion for line attribute in SdrOle2Primitive2D::createLocalDecomposition
2009-01-14 11:54:07 +0100 aw  r266272 : #i97982# added #i97772# to have a correct ChartPrettyPainter output for ChartPrettyPainter
2009-01-14 11:53:13 +0100 aw  r266271 : #i97982# added support for ChartPrettyPainter for PDF export
2009-01-13 16:19:19 +0100 aw  r266234 : #i96708# adapted RenderBitmapPrimitive2D_self to work with metafile recording and PDF exporting

2 files changed, 29 insertions, 26 deletions

diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index edc7d482641b..0923a223a924 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -602,14 +602,18 @@ namespace drawinglayer
             return pRetval;
         }
 
-        attribute::SdrShadowTextAttribute* createNewSdrShadowTextAttribute(const SfxItemSet& rSet, const SdrText& rText)
+        attribute::SdrShadowTextAttribute* createNewSdrShadowTextAttribute(const SfxItemSet& rSet, const SdrText& rText, bool bSuppressText)
         {
             attribute::SdrShadowTextAttribute* pRetval(0L);
             attribute::SdrShadowAttribute* pShadow(0L);
             attribute::SdrTextAttribute* pText(0L);
 
+            // #i98072# added option to suppress text
             // look for text first
-            pText = createNewSdrTextAttribute(rSet, rText);
+            if(!bSuppressText)
+            {
+                pText = createNewSdrTextAttribute(rSet, rText);
+            }
 
             // try shadow
             pShadow = createNewSdrShadowAttribute(rSet);
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 76f776a8077f..2cedb1bfce29 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -66,32 +66,31 @@ namespace drawinglayer
             }
 
             // add line
-            if(getSdrLFSTAttribute().getLine())
+            // #i97981# condition was inverse to purpose. When being compatible to paint version,
+            // border needs to be suppressed
+            if(!bBehaveCompatibleToPaintVersion && getSdrLFSTAttribute().getLine())
             {
-                if(bBehaveCompatibleToPaintVersion)
+                // if line width is given, polygon needs to be grown by half of it to make the
+                // outline to be outside of the bitmap
+                if(0.0 != getSdrLFSTAttribute().getLine()->getWidth())
                 {
-                    // if line width is given, polygon needs to be grown by half of it to make the
-                    // outline to be outside of the bitmap
-                    if(0.0 != getSdrLFSTAttribute().getLine()->getWidth())
-                    {
-                        // decompose to get scale
-                        basegfx::B2DVector aScale, aTranslate;
-                        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));
-
-                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, createPolygonLinePrimitive(aExpandedUnitOutline, getTransform(), *getSdrLFSTAttribute().getLine()));
-                    }
-                    else
-                    {
-                        appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, createPolygonLinePrimitive(aUnitOutline, getTransform(), *getSdrLFSTAttribute().getLine()));
-                    }
+                    // decompose to get scale
+                    basegfx::B2DVector aScale, aTranslate;
+                    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));
+
+                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, createPolygonLinePrimitive(aExpandedUnitOutline, getTransform(), *getSdrLFSTAttribute().getLine()));
+                }
+                else
+                {
+                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, createPolygonLinePrimitive(aUnitOutline, getTransform(), *getSdrLFSTAttribute().getLine()));
                 }
             }
             else