fdo#78908 Revert "Merge back branch alg_writerframes to trunk"

This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not
to have this on libreoffice-4-3 without
7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step
of DrawingLayer FillAttributes..., 2014-06-02).

Conflicts:
cui/source/inc/backgrnd.hxx
cui/source/inc/cuitabarea.hxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/tparea.cxx
include/basegfx/numeric/ftools.hxx
include/svx/svxids.hrc
include/svx/unoshprp.hxx
sc/source/ui/drawfunc/drawsh.cxx
sd/source/ui/func/fuarea.cxx
sfx2/source/dialog/tabdlg.cxx
sw/inc/fillattributes.hxx
sw/inc/format.hxx
sw/inc/frmatr.hxx
sw/inc/swatrset.hxx
sw/inc/unobrushitemhelper.hxx
sw/qa/extras/rtfexport/rtfexport.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/swatrset.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/notxtfrm.cxx
sw/source/core/inc/frame.hxx
sw/source/core/inc/frmtool.hxx
sw/source/core/layout/fillattributes.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/uibase/shells/frmsh.cxx
sw/source/core/unocore/unobrushitemhelper.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unostyle.cxx
xmloff/source/text/txtexppr.cxx
xmloff/source/text/txtprhdl.cxx

Also:
Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types"
This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93.

Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'"
This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3.

Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..."
This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c.

Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID"
This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90.

Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32"
This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b.

Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property"
This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea.

Revert "SwXTextFrame: restore semi-lost BackColor property"
This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60.

Revert "DocxAttributeOutput: port to FillAttributes"
This reverts commit ec221b7339f8fe5520926ef85b450daa94392780.

Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones"
This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14.

Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public"
This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d.

Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color"
This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06.

Revert "sw: still use SvxBrushItem for page style background"
This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505.

Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl"
This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6.

Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl"
This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21.

Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl"
This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3.

Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()"
This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4.

Revert "svx: fix Writer's insert -> frame crash"
This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3.

Revert "sw: adapt frame/templatedialog4.ui to FillAttributes"
This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc.

Revert "-Werror,-Wunused-variable"
This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97.

Revert "loplugin:implicitboolconversion,literaltoboolconversion"
This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76.

Revert "loplugin:saloverride"
This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5.

Revert "loplugin:literaltoboolconversion"
This reverts commit 355b31fe347479f63906e41300042ec5cb38837c.

Revert "-Werror,-Wunused-private-field"
This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1.

Revert "-Werror,-Wunused-const-variable"
This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46.

Revert "unused XFillStyleItem ctor"
This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38.

Revert "unused XGradient::VclGradient"
This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d.

Revert "fix "transparency" of floating tables in docx import (fdo#77723)"
This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e.

Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6
Reviewed-on: https://gerrit.libreoffice.org/10077
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

16 files changed, 84 insertions, 115 deletions

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 0ace4bf3ea66..965fbd046ced 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1383,7 +1383,7 @@ void GradientLB::Modify( const XGradientEntry& rEntry, sal_Int32 nPos, const Bit
 void GradientLB::SelectEntryByList( const XGradientListRef &pList, const OUString& rStr,
                                     const XGradient& rGradient, sal_uInt16 nDist )
 {
-    long nCount = pList.get() ? pList->Count() : 0;
+    long nCount = pList->Count();
     XGradientEntry* pEntry;
     bool bFound = false;
     OUString aStr;
diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
index a9893045d222..95c0e2c3bab2 100644
--- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
+++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx
@@ -68,9 +68,11 @@ 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()));
 
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 4dfdf337955b..7b04c2057ad4 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -179,6 +179,7 @@ namespace sdr
                             // if there is shadow, create the specialized shadow primitive
                             xSpecialShadow = drawinglayer::primitive2d::createPolyPolygonFillPrimitive(
                                 aClippedShadow,
+                                basegfx::B2DHomMatrix(),
                                 aFill,
                                 drawinglayer::attribute::FillGradientAttribute());
                         }
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index ce25218f3354..7269fb4c93d2 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -242,9 +242,11 @@ 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()));
 
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 33c3f37cde41..fc7d98e80b48 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -56,12 +56,10 @@ namespace drawinglayer
             }
             else
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        basegfx::B2DPolyPolygon(aUnitOutline),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -84,20 +82,17 @@ namespace drawinglayer
             }
             else
             {
-                basegfx::B2DPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolygonLinePrimitive(
-                        aTransformed,
+                        aUnitOutline,
+                        getTransform(),
                         getSdrLFSTAttribute().getLine(),
                         attribute::SdrLineStartEndAttribute()));
 
-                aTransformed = getTail();
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolygonLinePrimitive(
-                        aTransformed,
+                        getTail(),
+                        getTransform(),
                         getSdrLFSTAttribute().getLine(),
                         getSdrLFSTAttribute().getLineStartEnd()));
             }
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index b2d5c778a6f4..5758f74d7db9 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
@@ -53,6 +53,7 @@ namespace drawinglayer
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolygonLinePrimitive(
                         getUnitPolygon(),
+                        basegfx::B2DHomMatrix(),
                         getSdrLSTAttribute().getLine(),
                         getSdrLSTAttribute().getLineStartEnd()));
             }
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index a12ff99bd98b..798ba0151af2 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -56,62 +56,32 @@ namespace drawinglayer
     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);
-        }
-
-        Primitive2DReference createPolyPolygonFillPrimitive(
-            const basegfx::B2DPolyPolygon& rPolyPolygon,
-            const basegfx::B2DRange& rDefinitionRange,
+            const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
+            const basegfx::B2DHomMatrix& rObjectTransform,
             const attribute::SdrFillAttribute& rFill,
             const attribute::FillGradientAttribute& rFillGradient)
         {
-            if(basegfx::fTools::moreOrEqual(rFill.getTransparence(), 1.0))
-            {
-                return Primitive2DReference();
-            }
-
             // prepare fully scaled polygon
+            basegfx::B2DPolyPolygon aScaledPolyPolygon(rUnitPolyPolygon);
+            aScaledPolyPolygon.transform(rObjectTransform);
             BasePrimitive2D* pNewFillPrimitive = 0;
 
             if(!rFill.getGradient().isDefault())
             {
-                pNewFillPrimitive = new PolyPolygonGradientPrimitive2D(
-                    rPolyPolygon,
-                    rDefinitionRange,
-                    rFill.getGradient());
+                pNewFillPrimitive = new PolyPolygonGradientPrimitive2D(aScaledPolyPolygon, rFill.getGradient());
             }
             else if(!rFill.getHatch().isDefault())
             {
-                pNewFillPrimitive = new PolyPolygonHatchPrimitive2D(
-                    rPolyPolygon,
-                    rDefinitionRange,
-                    rFill.getColor(),
-                    rFill.getHatch());
+                pNewFillPrimitive = new PolyPolygonHatchPrimitive2D(aScaledPolyPolygon, rFill.getColor(), rFill.getHatch());
             }
             else if(!rFill.getFillGraphic().isDefault())
             {
-                pNewFillPrimitive = new PolyPolygonGraphicPrimitive2D(
-                    rPolyPolygon,
-                    rDefinitionRange,
-                    rFill.getFillGraphic().createFillGraphicAttribute(rDefinitionRange));
+                const basegfx::B2DRange aRange(basegfx::tools::getRange(aScaledPolyPolygon));
+                pNewFillPrimitive = new PolyPolygonGraphicPrimitive2D(aScaledPolyPolygon, rFill.getFillGraphic().createFillGraphicAttribute(aRange));
             }
             else
             {
-                pNewFillPrimitive = new PolyPolygonColorPrimitive2D(
-                    rPolyPolygon,
-                    rFill.getColor());
+                pNewFillPrimitive = new PolyPolygonColorPrimitive2D(aScaledPolyPolygon, rFill.getColor());
             }
 
             if(0.0 != rFill.getTransparence())
@@ -129,7 +99,7 @@ namespace drawinglayer
 
                 // 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 basegfx::B2DRange aRange(basegfx::tools::getRange(aScaledPolyPolygon));
                 const Primitive2DReference xRefB(new FillGradientPrimitive2D(aRange, rFillGradient));
                 const Primitive2DSequence aAlpha(&xRefB, 1L);
 
@@ -144,27 +114,32 @@ namespace drawinglayer
         }
 
         Primitive2DReference createPolygonLinePrimitive(
-            const basegfx::B2DPolygon& rPolygon,
+            const basegfx::B2DPolygon& rUnitPolygon,
+            const basegfx::B2DHomMatrix& rObjectTransform,
             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(!rPolygon.isClosed() && !rStroke.isDefault())
+            if(!rUnitPolygon.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(rPolygon, aLineAttribute, aStrokeAttribute, aStart, aEnd);
+                pNewLinePrimitive = new PolygonStrokeArrowPrimitive2D(aScaledPolygon, aLineAttribute, aStrokeAttribute, aStart, aEnd);
             }
             else
             {
                 // create data
-                pNewLinePrimitive = new PolygonStrokePrimitive2D(rPolygon, aLineAttribute, aStrokeAttribute);
+                pNewLinePrimitive = new PolygonStrokePrimitive2D(aScaledPolygon, aLineAttribute, aStrokeAttribute);
             }
 
             if(0.0 != rLine.getTransparence())
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index 19223a0abc44..fc845ee14a29 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -57,12 +57,10 @@ namespace drawinglayer
             // add fill
             if(!getSdrLFSTAttribute().getFill().isDefault())
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        basegfx::B2DPolyPolygon(aUnitOutline),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -79,12 +77,10 @@ namespace drawinglayer
             }
             else
             {
-                basegfx::B2DPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolygonLinePrimitive(
-                        aTransformed,
+                        aUnitOutline,
+                        getTransform(),
                         getSdrLFSTAttribute().getLine(),
                         attribute::SdrLineStartEndAttribute()));
             }
@@ -177,12 +173,10 @@ namespace drawinglayer
             // add fill
             if(!getSdrLFSTAttribute().getFill().isDefault() && aUnitOutline.isClosed())
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        basegfx::B2DPolyPolygon(aUnitOutline),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -199,12 +193,10 @@ namespace drawinglayer
             }
             else
             {
-                basegfx::B2DPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolygonLinePrimitive(
-                        aTransformed,
+                        aUnitOutline,
+                        getTransform(),
                         getSdrLFSTAttribute().getLine(),
                         getSdrLFSTAttribute().getLineStartEnd()));
             }
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index f5bce280e92a..df2b5f8c1877 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -42,12 +42,10 @@ namespace drawinglayer
             // add fill, but only when graphic ist transparent
             if(!getSdrLFSTAttribute().getFill().isDefault() && isTransparent())
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        basegfx::B2DPolyPolygon(aUnitOutline),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -84,21 +82,18 @@ namespace drawinglayer
                     const basegfx::B2DRange aExpandedRange(-fScaleX, -fScaleY, 1.0 + fScaleX, 1.0 + fScaleY);
                     basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange));
 
-                    aExpandedUnitOutline.transform(getTransform());
                     appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                         createPolygonLinePrimitive(
                             aExpandedUnitOutline,
+                            getTransform(),
                             getSdrLFSTAttribute().getLine(),
                             attribute::SdrLineStartEndAttribute()));
                 }
                 else
                 {
-                    basegfx::B2DPolygon aTransformed(aUnitOutline);
-
-                    aTransformed.transform(getTransform());
                     appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                         createPolygonLinePrimitive(
-                            aTransformed,
+                            aUnitOutline, getTransform(),
                             getSdrLFSTAttribute().getLine(),
                             attribute::SdrLineStartEndAttribute()));
                 }
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index ea9ae60597b6..cf01e7f68bef 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -52,12 +52,12 @@ namespace drawinglayer
 
             aPolygon.append(rStart);
             aPolygon.append(rEnd);
-            aPolygon.transform(rObjectMatrix);
 
             if(rLineStartEnd.isDefault() || (!bLeftActive && !bRightActive))
             {
                 return createPolygonLinePrimitive(
                     aPolygon,
+                    rObjectMatrix,
                     rLineAttribute,
                     attribute::SdrLineStartEndAttribute());
             }
@@ -66,6 +66,7 @@ namespace drawinglayer
             {
                 return createPolygonLinePrimitive(
                     aPolygon,
+                    rObjectMatrix,
                     rLineAttribute,
                     rLineStartEnd);
             }
@@ -77,10 +78,7 @@ namespace drawinglayer
                 bLeftActive && rLineStartEnd.isStartActive(), bRightActive && rLineStartEnd.isEndActive(),
                 bLeftActive && rLineStartEnd.isStartCentered(), bRightActive && rLineStartEnd.isEndCentered());
 
-            return createPolygonLinePrimitive(
-                aPolygon,
-                rLineAttribute,
-                aLineStartEnd);
+            return createPolygonLinePrimitive(aPolygon, rObjectMatrix, rLineAttribute, aLineStartEnd);
         }
 
         Primitive2DSequence SdrMeasurePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index acc3349a2758..fec204adce53 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -84,12 +84,10 @@ namespace drawinglayer
             if(!bBehaveCompatibleToPaintVersion
                 && !getSdrLFSTAttribute().getFill().isDefault())
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        basegfx::B2DPolyPolygon(aUnitOutline),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -116,21 +114,19 @@ namespace drawinglayer
                     const basegfx::B2DRange aExpandedRange(-fScaleX, -fScaleY, 1.0 + fScaleX, 1.0 + fScaleY);
                     basegfx::B2DPolygon aExpandedUnitOutline(basegfx::tools::createPolygonFromRect(aExpandedRange));
 
-                    aExpandedUnitOutline.transform(getTransform());
                     appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                         createPolygonLinePrimitive(
                             aExpandedUnitOutline,
+                            getTransform(),
                             getSdrLFSTAttribute().getLine(),
                             attribute::SdrLineStartEndAttribute()));
                 }
                 else
                 {
-                    basegfx::B2DPolygon aTransformed(aUnitOutline);
-
-                    aTransformed.transform(getTransform());
                     appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                         createPolygonLinePrimitive(
-                            aTransformed,
+                            aUnitOutline,
+                            getTransform(),
                             getSdrLFSTAttribute().getLine(),
                             attribute::SdrLineStartEndAttribute()));
                 }
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 512098ecf514..3ebe0af33df2 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -44,12 +44,10 @@ namespace drawinglayer
             {
                 // #i108255# no need to use correctOrientations here; target is
                 // straight visualisation
-                basegfx::B2DPolyPolygon aTransformed(getUnitPolyPolygon());
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        getUnitPolyPolygon(),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -70,11 +68,9 @@ namespace drawinglayer
 
                 for(sal_uInt32 a(0); a < getUnitPolyPolygon().count(); a++)
                 {
-                    basegfx::B2DPolygon aTransformed(getUnitPolyPolygon().getB2DPolygon(a));
-
-                    aTransformed.transform(getTransform());
                     aTemp[a] = createPolygonLinePrimitive(
-                        aTransformed,
+                        getUnitPolyPolygon().getB2DPolygon(a),
+                        getTransform(),
                         getSdrLFSTAttribute().getLine(),
                         getSdrLFSTAttribute().getLineStartEnd());
                 }
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 0822d7cf0018..801851db6ad9 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -48,12 +48,10 @@ namespace drawinglayer
             // add fill
             if(!getSdrLFSTAttribute().getFill().isDefault())
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        basegfx::B2DPolyPolygon(aUnitOutline),
+                        getTransform(),
                         getSdrLFSTAttribute().getFill(),
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
             }
@@ -71,12 +69,10 @@ namespace drawinglayer
             // add line
             if(!getSdrLFSTAttribute().getLine().isDefault())
             {
-                basegfx::B2DPolygon aTransformed(aUnitOutline);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolygonLinePrimitive(
-                        aTransformed,
+                        aUnitOutline,
+                        getTransform(),
                         getSdrLFSTAttribute().getLine(),
                         attribute::SdrLineStartEndAttribute()));
             }
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 8124d7562de8..63fe7bfa061e 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -931,6 +931,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla
                             drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(
                                 aRetval, drawinglayer::primitive2d::createPolygonLinePrimitive(
                                     aEdgePolygon,
+                                    basegfx::B2DHomMatrix(),
                                     aLine,
                                     aLineStartEnd));
                         }
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 08e282578f28..0abbd68c6389 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -92,12 +92,10 @@ namespace drawinglayer
             // add fill
             if(!getSdrFTAttribute().getFill().isDefault())
             {
-                basegfx::B2DPolyPolygon aTransformed(aUnitPolyPolygon);
-
-                aTransformed.transform(getTransform());
                 appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
                     createPolyPolygonFillPrimitive(
-                        aTransformed,
+                        aUnitPolyPolygon,
+                        getTransform(),
                         getSdrFTAttribute().getFill(),
                         getSdrFTAttribute().getFillFloatTransGradient()));
             }
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 20c60e1387e2..b617c8d3fe7f 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2247,6 +2247,11 @@ XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) :
 {
 }
 
+XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle, sal_uInt16 nWhich_) :
+    SfxEnumItem(nWhich_, sal::static_int_cast< sal_uInt16 >(eFillStyle))
+{
+}
+
 XFillStyleItem::XFillStyleItem(SvStream& rIn) :
     SfxEnumItem(XATTR_FILLSTYLE, rIn)
 {
@@ -2511,6 +2516,22 @@ bool XGradient::operator==(const XGradient& rGradient) const
              nStepCount     == rGradient.nStepCount );
 }
 
+Gradient XGradient::VclGradient() const
+{
+    Gradient aGradient;
+    aGradient.SetStyle((GradientStyle)eStyle);
+    aGradient.SetStartColor(aStartColor);
+    aGradient.SetEndColor(aEndColor);
+    aGradient.SetAngle(nAngle);
+    aGradient.SetBorder(nBorder);
+    aGradient.SetOfsX(nOfsX);
+    aGradient.SetOfsY(nOfsY);
+    aGradient.SetStartIntensity(nIntensStart);
+    aGradient.SetEndIntensity(nIntensEnd);
+    aGradient.SetSteps(nStepCount);
+    return aGradient;
+}
+
 // class XFillGradientItem
 
 TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);