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>

17 files changed, 76 insertions, 219 deletions

diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index b4ae0a484bd8..55ff7a559d62 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -147,6 +147,16 @@ namespace basegfx
         snapToNearestMultiple(0.26, 0.5) = 0.5
      */
     BASEGFX_DLLPUBLIC double snapToNearestMultiple(double v, const double fStep);
+    /** return fValue with the sign of fSignCarrier, thus evtl. changed
+    */
+    inline double copySign(double fValue, double fSignCarrier)
+    {
+#ifdef WNT
+        return _copysign(fValue, fSignCarrier);
+#else
+        return copysign(fValue, fSignCarrier);
+#endif
+    }
 
     class BASEGFX_DLLPUBLIC fTools
     {
diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index 1bf2260327b0..515d1f60934d 100644
--- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -55,12 +55,8 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
-            /// the geometrically visible area
-            basegfx::B2DRange                       maOutputRange;
-
-            /// the area the gradient definition is based on
-            /// in the simplest case identical to OutputRange
-            basegfx::B2DRange                       maDefinitionRange;
+            /// the geometric definition
+            basegfx::B2DRange                       maObjectRange;
 
             /// the gradient definition
             attribute::FillGradientAttribute        maFillGradient;
@@ -68,14 +64,14 @@ namespace drawinglayer
             /// local helpers
             void generateMatricesAndColors(
                 std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) const;
+                basegfx::BColor& rOutmostColor) const;
             Primitive2DSequence createOverlappingFill(
                 const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
-                const basegfx::BColor& rOuterColor,
+                const basegfx::BColor& rOutmostColor,
                 const basegfx::B2DPolygon& rUnitPolygon) const;
             Primitive2DSequence createNonOverlappingFill(
                 const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
-                const basegfx::BColor& rOuterColor,
+                const basegfx::BColor& rOutmostColor,
                 const basegfx::B2DPolygon& rUnitPolygon) const;
 
         protected:
@@ -86,18 +82,13 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructors. The one without definition range will use output range as definition range
-            FillGradientPrimitive2D(
-                const basegfx::B2DRange& rOutputRange,
-                const attribute::FillGradientAttribute& rFillGradient);
+            /// constructor
             FillGradientPrimitive2D(
-                const basegfx::B2DRange& rOutputRange,
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rObjectRange,
                 const attribute::FillGradientAttribute& rFillGradient);
 
             /// data read access
-            const basegfx::B2DRange& getOutputRange() const { return maOutputRange; }
-            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
+            const basegfx::B2DRange& getObjectRange() const { return maObjectRange; }
             const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; }
 
             /// compare operator
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index a7648a64f3e4..9234cec15857 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -51,12 +51,8 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D : public DiscreteMetricDependentPrimitive2D
         {
         private:
-            /// the geometrically visible area
-            basegfx::B2DRange                       maOutputRange;
-
-            /// the area the gradient definition is based on
-            /// in the simplest case identical to OutputRange
-            basegfx::B2DRange                       maDefinitionRange;
+            /// the geometric definition
+            basegfx::B2DRange                       maObjectRange;
 
             /// the hatch definition
             attribute::FillHatchAttribute           maFillHatch;
@@ -69,20 +65,14 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructors. The one without definition range will use output range as definition range
-            FillHatchPrimitive2D(
-                const basegfx::B2DRange& rOutputRange,
-                const basegfx::BColor& rBColor,
-                const attribute::FillHatchAttribute& rFillHatch);
+            /// constructor
             FillHatchPrimitive2D(
-                const basegfx::B2DRange& rOutputRange,
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rObjectRange,
                 const basegfx::BColor& rBColor,
                 const attribute::FillHatchAttribute& rFillHatch);
 
             /// data read access
-            const basegfx::B2DRange& getOutputRange() const { return maOutputRange; }
-            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
+            const basegfx::B2DRange& getObjectRange() const { return maObjectRange; }
             const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; }
             const basegfx::BColor& getBColor() const { return maBColor; }
 
diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index e65952250362..52effbdb0c94 100644
--- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer
 
             This primitive defines a multi-PolygonHairlinePrimitive2D and is
             just for convenience. The definition is not different from the single
-                defined PolygonHairlinePrimitive2Ds.
+            defined PolygonHairlinePrimitive2Ds.
          */
         class DRAWINGLAYER_DLLPUBLIC PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D
         {
@@ -255,9 +255,6 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon                     maPolyPolygon;
 
-            /// the definition range
-            basegfx::B2DRange                           maDefinitionRange;
-
             /// the gradient definition
             attribute::FillGradientAttribute            maFillGradient;
 
@@ -266,18 +263,13 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructors. The one without definition range will use output range as definition range
-            PolyPolygonGradientPrimitive2D(
-                const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const attribute::FillGradientAttribute& rFillGradient);
+            /// constructor
             PolyPolygonGradientPrimitive2D(
                 const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const basegfx::B2DRange& rDefinitionRange,
                 const attribute::FillGradientAttribute& rFillGradient);
 
             /// data read access
             const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
-            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
             const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; }
 
             /// compare operator
@@ -308,9 +300,6 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon                     maPolyPolygon;
 
-            /// the definition range
-            basegfx::B2DRange                           maDefinitionRange;
-
             /// the hatch background color (if used)
             basegfx::BColor                             maBackgroundColor;
 
@@ -322,20 +311,14 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructors. The one without definition range will use output range as definition range
-            PolyPolygonHatchPrimitive2D(
-                const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const basegfx::BColor& rBackgroundColor,
-                const attribute::FillHatchAttribute& rFillHatch);
+            /// constructor
             PolyPolygonHatchPrimitive2D(
                 const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const basegfx::B2DRange& rDefinitionRange,
                 const basegfx::BColor& rBackgroundColor,
                 const attribute::FillHatchAttribute& rFillHatch);
 
             /// data read access
             const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
-            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
             const basegfx::BColor& getBackgroundColor() const { return maBackgroundColor; }
             const attribute::FillHatchAttribute& getFillHatch() const { return maFillHatch; }
 
@@ -367,9 +350,6 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon                     maPolyPolygon;
 
-            /// the definition range
-            basegfx::B2DRange                           maDefinitionRange;
-
             /// the bitmap fill definition (may include tiling)
             attribute::FillGraphicAttribute             maFillGraphic;
 
@@ -378,18 +358,13 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructors. The one without definition range will use output range as definition range
-            PolyPolygonGraphicPrimitive2D(
-                const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const attribute::FillGraphicAttribute& rFillGraphic);
+            /// constructor
             PolyPolygonGraphicPrimitive2D(
                 const basegfx::B2DPolyPolygon& rPolyPolygon,
-                const basegfx::B2DRange& rDefinitionRange,
                 const attribute::FillGraphicAttribute& rFillGraphic);
 
             /// data read access
             const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
-            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
             const attribute::FillGraphicAttribute& getFillGraphic() const { return maFillGraphic; }
 
             /// compare operator
diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx
index daa0348103a3..0fa666d19411 100644
--- a/include/drawinglayer/texture/texture.hxx
+++ b/include/drawinglayer/texture/texture.hxx
@@ -76,14 +76,14 @@ namespace drawinglayer
         {
         protected:
             basegfx::ODFGradientInfo            maGradientInfo;
-            basegfx::B2DRange                   maDefinitionRange;
+            basegfx::B2DRange                   maTargetRange;
             basegfx::BColor                     maStart;
             basegfx::BColor                     maEnd;
             double                              mfBorder;
 
         public:
             GeoTexSvxGradient(
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -96,7 +96,7 @@ namespace drawinglayer
             // virtual base methods
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) = 0;
+                basegfx::BColor& rOutmostColor) = 0;
 
             // data access
             const basegfx::BColor& getStart() const { return maStart; }
@@ -113,15 +113,9 @@ namespace drawinglayer
     {
         class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear : public GeoTexSvxGradient
         {
-        protected:
-            double                  mfUnitMinX;
-            double                  mfUnitWidth;
-            double                  mfUnitMaxY;
-
         public:
             GeoTexSvxGradientLinear(
-                const basegfx::B2DRange& rDefinitionRange,
-                const basegfx::B2DRange& rOutputRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -131,7 +125,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
+                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -145,14 +139,9 @@ namespace drawinglayer
     {
         class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial : public GeoTexSvxGradient
         {
-        protected:
-            double                  mfUnitMinX;
-            double                  mfUnitWidth;
-
         public:
             GeoTexSvxGradientAxial(
-                const basegfx::B2DRange& rDefinitionRange,
-                const basegfx::B2DRange& rOutputRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -162,7 +151,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
+                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -178,7 +167,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientRadial(
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -189,7 +178,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
+                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -205,7 +194,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientElliptical(
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -217,7 +206,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
+                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -233,7 +222,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientSquare(
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -245,7 +234,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
+                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -261,7 +250,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientRect(
-                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rTargetRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -273,7 +262,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
+                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -288,20 +277,15 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch : public GeoTexSvx
         {
         protected:
-            basegfx::B2DRange                   maOutputRange;
             basegfx::B2DHomMatrix               maTextureTransform;
             basegfx::B2DHomMatrix               maBackTextureTransform;
             double                              mfDistance;
             double                              mfAngle;
             sal_uInt32                          mnSteps;
 
-            /// bitfield
-            bool                                mbDefinitionRangeEqualsOutputRange : 1;
-
         public:
             GeoTexSvxHatch(
-                const basegfx::B2DRange& rDefinitionRange,
-                const basegfx::B2DRange& rOutputRange,
+                const basegfx::B2DRange& rTargetRange,
                 double fDistance,
                 double fAngle);
             virtual ~GeoTexSvxHatch();
@@ -309,7 +293,7 @@ namespace drawinglayer
             // compare operator
             virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE;
 
-            void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
+            virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
             double getDistanceToHatch(const basegfx::B2DPoint& rUV) const;
             const basegfx::B2DHomMatrix& getBackTextureTransform() const;
         };
@@ -348,7 +332,7 @@ namespace drawinglayer
             // compare operator
             virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE;
 
-            void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
+            virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
         };
     } // end of namespace texture
 } // end of namespace drawinglayer
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 12cb66657cea..084fcb8c1ac6 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -111,11 +111,6 @@ public:
     OUString                GetGraphicFilter() const    { return maStrFilter; }
 
     void                SetShadingValue( const sal_uInt32 nNew );
-
-    //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 );
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 0d754ed83142..8b7c89637d34 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -34,13 +34,8 @@
 #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"
 
@@ -64,8 +59,6 @@
 #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"
diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
index f69a8578a71d..1d9ef5a8ff9e 100644
--- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
@@ -66,7 +66,7 @@ namespace drawinglayer
         attribute::SdrShadowAttribute createNewSdrShadowAttribute(
             const SfxItemSet& rSet);
 
-        attribute::SdrFillAttribute SVX_DLLPUBLIC createNewSdrFillAttribute(
+        attribute::SdrFillAttribute createNewSdrFillAttribute(
             const SfxItemSet& rSet);
 
         // #i101508# Support handing over given text-to-border distances
@@ -78,7 +78,7 @@ namespace drawinglayer
             const sal_Int32* pRight = 0,
             const sal_Int32* pLower = 0);
 
-        attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute(
+        attribute::FillGradientAttribute createNewTransparenceGradientAttribute(
             const SfxItemSet& rSet);
 
         attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute(
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index eb7a29911f6e..63a8ea4c67a4 100644
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -22,7 +22,6 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
-#include <svx/svxdllapi.h>
 
 // predefines
 namespace basegfx {
@@ -46,23 +45,19 @@ namespace drawinglayer
 {
     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,
+        Primitive2DReference createPolyPolygonFillPrimitive(
+            const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
+            const basegfx::B2DHomMatrix& rObjectTransform,
             const attribute::SdrFillAttribute& rFill,
             const attribute::FillGradientAttribute& rFillGradient);
 
-        Primitive2DReference SVX_DLLPUBLIC createPolygonLinePrimitive(
-            const basegfx::B2DPolygon& rPolygon,
+        Primitive2DReference createPolygonLinePrimitive(
+            const basegfx::B2DPolygon& rUnitPolygon,
+            const basegfx::B2DHomMatrix& rObjectTransform,
             const attribute::SdrLineAttribute& rLine,
             const attribute::SdrLineStartEndAttribute& rStroke);
 
-        Primitive2DReference SVX_DLLPUBLIC createTextPrimitive(
+        Primitive2DReference createTextPrimitive(
             const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
             const basegfx::B2DHomMatrix& rObjectTransform,
             const attribute::SdrTextAttribute& rText,
@@ -71,7 +66,7 @@ namespace drawinglayer
             bool bWordWrap,
             bool bClipOnBounds);
 
-        Primitive2DSequence SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
+        Primitive2DSequence createEmbeddedShadowPrimitive(
             const Primitive2DSequence& rContent,
             const attribute::SdrShadowAttribute& rShadow);
 
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index facf6cbaadef..2f9e64232dee 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -413,7 +413,7 @@ public:
     virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
-                                                            bool bShadow) = 0 ;
+                                                            const SdrView* pSdrView = NULL ) = 0 ;
     virtual SfxAbstractTabDialog*           CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
                                                                  SdrModel* pModel,
                                                                  const SdrObject* pObj = NULL,
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index cec1a0ee9f14..b782c1657460 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -251,12 +251,8 @@
 // include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the
 // same id for two different attributes
 
-// 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 )
@@ -264,6 +260,7 @@
 
 // CAUTION! Range <48 .. 49> used by EditEngine (!)
 
+#define SID_ATTR_SEARCH                                 ( SID_SVX_START + 47 )
 #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 )
@@ -277,9 +274,6 @@
 #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_RULER_NULL_OFFSET                           ( SID_SVX_START + 79 )
 #define SID_RULER_BORDERS                               ( SID_SVX_START + 80 )
 #define SID_RULER_OBJECT                                ( SID_SVX_START + 81 )
@@ -413,9 +407,6 @@
 #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_DRAW_TEXT                                   ( SID_SVX_START + 253 )
 #define SID_DRAW_CAPTION                                ( SID_SVX_START + 254 )
 #define SID_DRAW_SELECT                                 ( SID_SVX_START + 255 )
@@ -448,9 +439,6 @@
 #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_SHEAR                        ( SID_SVX_START + 304 )
 #define SID_ATTR_TRANSFORM_SHEAR_X                      ( SID_SVX_START + 305 )
@@ -482,9 +470,6 @@
 #define SID_BMPMASK                                     ( SID_SVX_START + 350 )
 #define SID_BMPMASK_PIPETTE                             ( SID_SVX_START + 351 )
 #define SID_BMPMASK_EXEC                                ( SID_SVX_START + 353 )
-
-// CAUTION! Range <363 .. 363> used by EditEngine (!)
-
 #define SID_ATTR_TEXT_FITTOSIZE                         ( SID_SVX_START + 367 )
 #define SID_ATTR_BRUSH_ROW                              ( SID_SVX_START + 368 )
 #define SID_OPTFILTER_MSOFFICE                          ( SID_SVX_START + 369 )
@@ -521,8 +506,6 @@
 #define SID_ATTR_3D_LIGHT                               ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */
 #define SID_ATTR_3D_START                                   SID_ATTR_3D_LIGHT
 
-// CAUTION! Range <413 .. 413> used by EditEngine (!)
-
 #define SID_RULER_PROTECT                               ( SID_SVX_START + 415 )
 #define SID_COLOR_CONTROL                               ( SID_SVX_START + 417 )
 #define SID_ATTR_3D_INTERN                              ( SID_SVX_START + 422 )
@@ -553,9 +536,6 @@
 #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_ATTR_ALIGN_INDENT                           ( SID_SVX_START + 460 )
 #define SID_DEC_INDENT                                  ( SID_SVX_START + 461 )
 #define SID_INC_INDENT                                  ( SID_SVX_START + 462 )
@@ -580,13 +560,8 @@
 #define SID_ATTR_ALIGN_LOCKPOS                          ( SID_SVX_START + 578 )
 #define SID_ATTR_LINEEND_WIDTH_DEFAULT                  ( SID_SVX_START + 579 )
 #define SID_ATTR_NUMBERFORMAT_ONE_AREA                  ( SID_SVX_START + 580 )
-
-// CAUTION! Range <587 .. 587> used by EditEngine (!)
-
 #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 )
@@ -722,9 +697,6 @@
 #define SID_HLINKBAR_LINK                               ( SID_SVX_START + 851 )
 #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_NUM_LEVEL                         ( SID_SVX_START + 859 )
 #define SID_CREATE_SW_DRAWVIEW                          ( SID_SVX_START + 860 )
@@ -737,26 +709,15 @@
 #define SID_ATTR_GRAF_TRANSPARENCE                      ( SID_SVX_START + 869 )
 #define SID_ATTR_GRAF_INVERT                            ( SID_SVX_START + 870 )
 #define SID_ATTR_GRAF_MODE                              ( SID_SVX_START + 871 )
-
-// CAUTION! Range <877 .. 877> used by EditEngine (!)
-
 #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 )
 #define SID_DRAW_TEXT_VERTICAL                              SID_ATTR_CHAR_VERTICAL
-
-// CAUTION! Range <887 .. 903> used by EditEngine (!)
-
-// 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 )
@@ -764,15 +725,10 @@
 #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 )
@@ -790,18 +746,9 @@
 #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 )
@@ -839,16 +786,10 @@
 #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 )
@@ -994,16 +935,15 @@
 
 #define FN_SVX_SET_NUMBER                               ( SID_SVX_START + 1136 )
 #define FN_SVX_SET_BULLET                               ( SID_SVX_START + 1137 )
+#define SID_SW_ATTR_FILL_STYLE                          ( SID_SVX_START + 1138 )
+#define SID_SW_ATTR_FILL_GRADIENT                       ( SID_SVX_START + 1139 )
 
 #define SID_ATTR_BORDER_STYLES                          ( SID_SVX_START + 1140 )
 #define SID_ATTR_BORDER_DEFAULT_WIDTH                   ( SID_SVX_START + 1141 )
-// 1142 is used by editeng (SID_ATTR_CHAR_GRABBAG)
 
-//UUUU
-#define SID_OFFER_IMPORT                                ( SID_SVX_START + 1143 )
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               (SID_OFFER_IMPORT + 1)
+#define SID_SVX_FIRSTFREE                               (SID_ATTR_BORDER_DEFAULT_WIDTH + 1)
 
 // Overflow check for slot IDs
 
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 94d358c12a36..b6e2dc2d7e69 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -249,19 +249,19 @@
     FILL_PROPERTIES_DEFAULTS \
     { OUString(UNO_NAME_FILLBACKGROUND),    XATTR_FILLBACKGROUND    , ::getBooleanCppuType(),              0,   0}, \
     { OUString(UNO_NAME_FILLBITMAP),        XATTR_FILLBITMAP        , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0)  ,       0,     MID_BITMAP}, \
-    { OUString(UNO_NAME_FILLBITMAPNAME),           XATTR_FILLBITMAP        , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { OUString(UNO_NAME_FILLBITMAPURL),            XATTR_FILLBITMAP        , ::cppu::UnoType<OUString>::get(), 0, MID_GRAFURL }, \
-    { OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT),    XATTR_GRADIENTSTEPCOUNT , ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
-    { OUString(UNO_NAME_FILLGRADIENT),      XATTR_FILLGRADIENT      , ::cppu::UnoType<com::sun::star::awt::Gradient>::get(),        0,     MID_FILLGRADIENT}, \
-    { OUString(UNO_NAME_FILLGRADIENTNAME),         XATTR_FILLGRADIENT      , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { OUString(UNO_NAME_FILLHATCH),         XATTR_FILLHATCH         , ::cppu::UnoType<com::sun::star::drawing::Hatch>::get(),           0,     MID_FILLHATCH}, \
-    { OUString(UNO_NAME_FILLHATCHNAME),            XATTR_FILLHATCH         , ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { OUString(UNO_NAME_FILLSTYLE),         XATTR_FILLSTYLE         , ::cppu::UnoType<com::sun::star::drawing::FillStyle>::get() ,      0,     0}, \
-    { OUString(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, ::cppu::UnoType<sal_Int16>::get() ,           0,     0}, \
-    { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<com::sun::star::awt::Gradient>::get(),         0,     MID_FILLGRADIENT}, \
-    { OUString(UNO_NAME_FILLTRANSPARENCEGRADIENTNAME), XATTR_FILLFLOATTRANSPARENCE, ::cppu::UnoType<OUString>::get(), 0, MID_NAME }, \
-    { OUString(UNO_NAME_FILLCOLOR_2),       XATTR_SECONDARYFILLCOLOR, ::cppu::UnoType<sal_Int32>::get(),          0,     0}, \
-    { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP      , ::cppu::UnoType<com::sun::star::text::GraphicCrop>::get(), 0, 0 },
+    { OUString("FillBitmapName"),           XATTR_FILLBITMAP        , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { OUString("FillBitmapURL"),            XATTR_FILLBITMAP        , ::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \
+    { OUString("FillGradientStepCount"),    XATTR_GRADIENTSTEPCOUNT , ::getCppuType((const sal_Int16*)0), 0, 0}, \
+    { OUString(UNO_NAME_FILLGRADIENT),      XATTR_FILLGRADIENT      , ::getCppuType((const ::com::sun::star::awt::Gradient*)0),        0,     MID_FILLGRADIENT}, \
+    { OUString("FillGradientName"),         XATTR_FILLGRADIENT      , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { OUString(UNO_NAME_FILLHATCH),         XATTR_FILLHATCH         , ::getCppuType((const ::com::sun::star::drawing::Hatch*)0),           0,     MID_FILLHATCH}, \
+    { OUString("FillHatchName"),            XATTR_FILLHATCH         , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { OUString(UNO_NAME_FILLSTYLE),         XATTR_FILLSTYLE         , ::getCppuType((const ::com::sun::star::drawing::FillStyle*)0) ,      0,     0}, \
+    { OUString(UNO_NAME_FILL_TRANSPARENCE), XATTR_FILLTRANSPARENCE, ::getCppuType((const sal_Int16*)0) ,           0,     0}, \
+    { OUString("FillTransparenceGradient"), XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const ::com::sun::star::awt::Gradient*)0),         0,     MID_FILLGRADIENT}, \
+    { OUString("FillTransparenceGradientName"), XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { OUString(UNO_NAME_FILLCOLOR_2),       XATTR_SECONDARYFILLCOLOR, ::getCppuType((const sal_Int32*)0),          0,     0}, \
+    { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP), SDRATTR_GRAFCROP      , ::getCppuType((const ::com::sun::star::text::GraphicCrop*)0), 0, 0 },
 
 #define EDGERADIUS_PROPERTIES \
     { OUString(UNO_NAME_EDGERADIUS),        SDRATTR_ECKENRADIUS     , ::cppu::UnoType<sal_Int32>::get()  ,            0,     SFX_METRIC_ITEM},
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 51edf4e2e7b0..8c24fcb386ce 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -35,6 +35,7 @@ class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem
 public:
                             TYPEINFO_OVERRIDE();
                             XFillStyleItem(XFillStyle = XFILL_SOLID);
+                            XFillStyleItem(XFillStyle, sal_uInt16 nWhich);
                             XFillStyleItem(SvStream& rIn);
 
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE;
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index b97d0c0d0a6d..30c1741f31eb 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -75,6 +75,7 @@ public:
     sal_uInt16         GetStartIntens() const           { return nIntensStart; }
     sal_uInt16         GetEndIntens() const             { return nIntensEnd; }
     sal_uInt16         GetSteps() const                 { return nStepCount; }
+    Gradient VclGradient() const;
 };
 
 #endif
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index a93181a5d71a..89662c09be30 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -36,8 +36,6 @@ protected:
     OUString     m_sControlDataStyleName;
     OUString     m_sListStyleName;
     bool         m_bIsNumRuleAlreadyConverted;
-    //UUUU
-    bool         m_bIsFillStyleAlreadyConverted;
 
 protected:
     virtual void SetAttribute( sal_uInt16 nPrefixKey,
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index 2de9987d5c92..dc8de7026395 100644
--- a/include/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
@@ -198,14 +198,6 @@
 #define CTF_RELHEIGHTREL                    (XML_TEXT_CTF_START + 169)
 
 
-//UUUU
-#define CTF_SW_REPEAT_OFFSET_X              (XML_TEXT_CTF_START + 170)
-#define CTF_SW_REPEAT_OFFSET_Y              (XML_TEXT_CTF_START + 171)
-#define CTF_SW_FILLGRADIENTNAME             (XML_TEXT_CTF_START + 172)
-#define CTF_SW_FILLHATCHNAME                (XML_TEXT_CTF_START + 173)
-#define CTF_SW_FILLBITMAPNAME               (XML_TEXT_CTF_START + 174)
-#define CTF_SW_FILLTRANSNAME                (XML_TEXT_CTF_START + 175)
-
 #define TEXT_PROP_MAP_TEXT 0
 #define TEXT_PROP_MAP_PARA 1
 #define TEXT_PROP_MAP_FRAME 2
diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index 4226166993b7..5511bf1abea2 100644
--- a/include/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
@@ -272,20 +272,12 @@
 #define XML_TYPE_TEXT_OVERLINE_COLOR    (XML_TEXT_TYPES_START + 112)
 #define XML_TYPE_TEXT_OVERLINE_HASCOLOR (XML_TEXT_TYPES_START + 113)
 #define XML_TYPE_BOOL_FALSE             (XML_TEXT_TYPES_START + 114)
+#define XML_TYPE_FILLSTYLE              (XML_TEXT_TYPES_START + 115)
 
 #define XML_TYPE_CHAR_SCRIPT            (XML_TEXT_TYPES_START + 116)
 #define XML_TYPE_CHAR_RFC_LANGUAGE_TAG  (XML_TEXT_TYPES_START + 117)
 #define XML_TYPE_VERTICAL_ALIGN         (XML_TEXT_TYPES_START + 118)
 
-//UUUU
-#define XML_SW_TYPE_FILLSTYLE           (XML_TEXT_TYPES_START + 119)
-#define XML_SW_TYPE_FILLBITMAPSIZE      (XML_TEXT_TYPES_START + 120)
-#define XML_SW_TYPE_LOGICAL_SIZE        (XML_TEXT_TYPES_START + 121)
-#define XML_SW_TYPE_BITMAP_REFPOINT     (XML_TEXT_TYPES_START + 122)
-#define XML_SW_TYPE_BITMAP_MODE         (XML_TEXT_TYPES_START + 123)
-#define XML_SW_TYPE_BITMAPREPOFFSETX    (XML_TEXT_TYPES_START + 124)
-#define XML_SW_TYPE_BITMAPREPOFFSETY    (XML_TEXT_TYPES_START + 125)
-
 #define XML_SCH_TYPES_START (0x4 << XML_TYPE_APP_SHIFT)
 #define XML_PM_TYPES_START  (0x5 << XML_TYPE_APP_SHIFT) // page master
 #define XML_DB_TYPES_START  (0x6 << XML_TYPE_APP_SHIFT)