Merge back branch alg_writerframes to trunk

(cherry picked from commit b635b4fa4e42053d30ab639643d2236a20243f62)

Conflicts:
comphelper/inc/comphelper/TypeGeneration.hxx
comphelper/source/property/TypeGeneration.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/cuitabarea.hxx
cui/source/tabpages/tabarea.cxx
cui/source/tabpages/tabarea.hrc
cui/source/tabpages/tabarea.src
cui/source/tabpages/tparea.cxx
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
drawinglayer/source/texture/texture.cxx
editeng/inc/editeng/unotext.hxx
editeng/source/items/frmitems.cxx
include/drawinglayer/texture/texture.hxx
include/editeng/brushitem.hxx
include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
include/svx/svxids.hrc
include/xmloff/xmltypes.hxx
reportdesign/source/ui/misc/UITools.cxx
sc/source/ui/drawfunc/drawsh.cxx
sfx2/source/dialog/tabdlg.cxx
svl/source/undo/undo.cxx
svx/inc/svx/unoshprp.hxx
sw/Library_sw.mk
sw/inc/doc.hxx
sw/inc/format.hxx
sw/inc/frmfmt.hxx
sw/inc/swatrset.hxx
sw/inc/unomap.hxx
sw/inc/unoprnms.hxx
sw/source/core/access/accpara.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/swatrset.cxx
sw/source/core/doc/docdraw.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/atrfrm.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/txtfly.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/uibase/app/docst.cxx
sw/source/core/uibase/app/docstyle.cxx
sw/source/core/uibase/shells/drawdlg.cxx
sw/source/core/uibase/shells/frmsh.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/fmtui/tmpdlg.src
sw/source/ui/frmdlg/frmdlg.cxx
sw/source/ui/frmdlg/frmpage.src
sw/source/ui/inc/frmsh.hxx
xmloff/source/text/txtprhdl.cxx
xmloff/source/text/txtprmap.cxx

Change-Id: Id3ffaa83bb5594d287f1ac8f2c1c9cf55c70946d

14 files changed, 225 insertions, 57 deletions

diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 89b3aaeb2e4b..5477b36fd475 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -136,6 +136,18 @@ namespace basegfx
         return v / M_PI_2 * 90.0;
     }
 
+    /** Snap v to nearest multiple of fStep, from negative and
+        positive side.
+
+        Examples:
+
+        snapToNearestMultiple(-0.1, 0.5) = 0.0
+        snapToNearestMultiple(0.1, 0.5) = 0.0
+        snapToNearestMultiple(0.25, 0.5) = 0.0
+        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)
diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index 515d1f60934d..1bf2260327b0 100644
--- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -55,8 +55,12 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D
         {
         private:
-            /// the geometric definition
-            basegfx::B2DRange                       maObjectRange;
+            /// 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 gradient definition
             attribute::FillGradientAttribute        maFillGradient;
@@ -64,14 +68,14 @@ namespace drawinglayer
             /// local helpers
             void generateMatricesAndColors(
                 std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) const;
+                basegfx::BColor& rOuterColor) const;
             Primitive2DSequence createOverlappingFill(
                 const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
-                const basegfx::BColor& rOutmostColor,
+                const basegfx::BColor& rOuterColor,
                 const basegfx::B2DPolygon& rUnitPolygon) const;
             Primitive2DSequence createNonOverlappingFill(
                 const std::vector< drawinglayer::texture::B2DHomMatrixAndBColor >& rEntries,
-                const basegfx::BColor& rOutmostColor,
+                const basegfx::BColor& rOuterColor,
                 const basegfx::B2DPolygon& rUnitPolygon) const;
 
         protected:
@@ -82,13 +86,18 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructor
+            /// constructors. The one without definition range will use output range as definition range
+            FillGradientPrimitive2D(
+                const basegfx::B2DRange& rOutputRange,
+                const attribute::FillGradientAttribute& rFillGradient);
             FillGradientPrimitive2D(
-                const basegfx::B2DRange& rObjectRange,
+                const basegfx::B2DRange& rOutputRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 const attribute::FillGradientAttribute& rFillGradient);
 
             /// data read access
-            const basegfx::B2DRange& getObjectRange() const { return maObjectRange; }
+            const basegfx::B2DRange& getOutputRange() const { return maOutputRange; }
+            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
             const attribute::FillGradientAttribute& getFillGradient() const { return maFillGradient; }
 
             /// compare operator
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index 9234cec15857..a7648a64f3e4 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -51,8 +51,12 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D : public DiscreteMetricDependentPrimitive2D
         {
         private:
-            /// the geometric definition
-            basegfx::B2DRange                       maObjectRange;
+            /// 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 hatch definition
             attribute::FillHatchAttribute           maFillHatch;
@@ -65,14 +69,20 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructor
+            /// 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);
             FillHatchPrimitive2D(
-                const basegfx::B2DRange& rObjectRange,
+                const basegfx::B2DRange& rOutputRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 const basegfx::BColor& rBColor,
                 const attribute::FillHatchAttribute& rFillHatch);
 
             /// data read access
-            const basegfx::B2DRange& getObjectRange() const { return maObjectRange; }
+            const basegfx::B2DRange& getOutputRange() const { return maOutputRange; }
+            const basegfx::B2DRange& getDefinitionRange() const { return maDefinitionRange; }
             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 972972727f91..46579cb3b904 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,6 +255,9 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon                     maPolyPolygon;
 
+            /// the definition range
+            basegfx::B2DRange                           maDefinitionRange;
+
             /// the gradient definition
             attribute::FillGradientAttribute            maFillGradient;
 
@@ -263,13 +266,18 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructor
+            /// constructors. The one without definition range will use output range as definition range
+            PolyPolygonGradientPrimitive2D(
+                const basegfx::B2DPolyPolygon& rPolyPolygon,
+                const attribute::FillGradientAttribute& rFillGradient);
             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
@@ -300,6 +308,9 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon                     maPolyPolygon;
 
+            /// the definition range
+            basegfx::B2DRange                           maDefinitionRange;
+
             /// the hatch background color (if used)
             basegfx::BColor                             maBackgroundColor;
 
@@ -311,14 +322,20 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructor
+            /// 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);
             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; }
 
@@ -350,6 +367,9 @@ namespace drawinglayer
             /// the PolyPolygon geometry
             basegfx::B2DPolyPolygon                     maPolyPolygon;
 
+            /// the definition range
+            basegfx::B2DRange                           maDefinitionRange;
+
             /// the bitmap fill definition (may include tiling)
             attribute::FillGraphicAttribute             maFillGraphic;
 
@@ -358,13 +378,18 @@ namespace drawinglayer
             virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
 
         public:
-            /// constructor
+            /// constructors. The one without definition range will use output range as definition range
+            PolyPolygonGraphicPrimitive2D(
+                const basegfx::B2DPolyPolygon& rPolyPolygon,
+                const attribute::FillGraphicAttribute& rFillGraphic);
             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 0fa666d19411..daa0348103a3 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                   maTargetRange;
+            basegfx::B2DRange                   maDefinitionRange;
             basegfx::BColor                     maStart;
             basegfx::BColor                     maEnd;
             double                              mfBorder;
 
         public:
             GeoTexSvxGradient(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 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& rOutmostColor) = 0;
+                basegfx::BColor& rOuterColor) = 0;
 
             // data access
             const basegfx::BColor& getStart() const { return maStart; }
@@ -113,9 +113,15 @@ namespace drawinglayer
     {
         class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear : public GeoTexSvxGradient
         {
+        protected:
+            double                  mfUnitMinX;
+            double                  mfUnitWidth;
+            double                  mfUnitMaxY;
+
         public:
             GeoTexSvxGradientLinear(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rOutputRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -125,7 +131,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
+                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -139,9 +145,14 @@ namespace drawinglayer
     {
         class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial : public GeoTexSvxGradient
         {
+        protected:
+            double                  mfUnitMinX;
+            double                  mfUnitWidth;
+
         public:
             GeoTexSvxGradientAxial(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rOutputRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -151,7 +162,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
+                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -167,7 +178,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientRadial(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -178,7 +189,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
+                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -194,7 +205,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientElliptical(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -206,7 +217,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
+                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -222,7 +233,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientSquare(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -234,7 +245,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
+                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -250,7 +261,7 @@ namespace drawinglayer
         {
         public:
             GeoTexSvxGradientRect(
-                const basegfx::B2DRange& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
                 const basegfx::BColor& rStart,
                 const basegfx::BColor& rEnd,
                 sal_uInt32 nSteps,
@@ -262,7 +273,7 @@ namespace drawinglayer
 
             virtual void appendTransformationsAndColors(
                 std::vector< B2DHomMatrixAndBColor >& rEntries,
-                basegfx::BColor& rOutmostColor) SAL_OVERRIDE;
+                basegfx::BColor& rOuterColor) SAL_OVERRIDE;
             virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const SAL_OVERRIDE;
         };
     } // end of namespace texture
@@ -277,15 +288,20 @@ 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& rTargetRange,
+                const basegfx::B2DRange& rDefinitionRange,
+                const basegfx::B2DRange& rOutputRange,
                 double fDistance,
                 double fAngle);
             virtual ~GeoTexSvxHatch();
@@ -293,7 +309,7 @@ namespace drawinglayer
             // compare operator
             virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE;
 
-            virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
+            void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
             double getDistanceToHatch(const basegfx::B2DPoint& rUV) const;
             const basegfx::B2DHomMatrix& getBackTextureTransform() const;
         };
@@ -332,7 +348,7 @@ namespace drawinglayer
             // compare operator
             virtual bool operator==(const GeoTexSvx& rGeoTexSvx) const SAL_OVERRIDE;
 
-            virtual void appendTransformations(::std::vector< basegfx::B2DHomMatrix >& rMatrices);
+            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 24b9220d26e9..61397f16b0e6 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -111,6 +111,11 @@ 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 8b7c89637d34..0d754ed83142 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -34,8 +34,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"
 
@@ -59,6 +64,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"
diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
index 1d9ef5a8ff9e..f69a8578a71d 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 createNewSdrFillAttribute(
+        attribute::SdrFillAttribute SVX_DLLPUBLIC 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 createNewTransparenceGradientAttribute(
+        attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute(
             const SfxItemSet& rSet);
 
         attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute(
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index 63a8ea4c67a4..eb7a29911f6e 100644
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -22,6 +22,7 @@
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
+#include <svx/svxdllapi.h>
 
 // predefines
 namespace basegfx {
@@ -45,19 +46,23 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        Primitive2DReference createPolyPolygonFillPrimitive(
-            const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
-            const basegfx::B2DHomMatrix& rObjectTransform,
+        Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive(
+            const basegfx::B2DPolyPolygon& rPolyPolygon,
             const attribute::SdrFillAttribute& rFill,
             const attribute::FillGradientAttribute& rFillGradient);
 
-        Primitive2DReference createPolygonLinePrimitive(
-            const basegfx::B2DPolygon& rUnitPolygon,
-            const basegfx::B2DHomMatrix& rObjectTransform,
+        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 createTextPrimitive(
+        Primitive2DReference SVX_DLLPUBLIC createTextPrimitive(
             const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
             const basegfx::B2DHomMatrix& rObjectTransform,
             const attribute::SdrTextAttribute& rText,
@@ -66,7 +71,7 @@ namespace drawinglayer
             bool bWordWrap,
             bool bClipOnBounds);
 
-        Primitive2DSequence createEmbeddedShadowPrimitive(
+        Primitive2DSequence SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
             const Primitive2DSequence& rContent,
             const attribute::SdrShadowAttribute& rShadow);
 
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 572e152acf0e..579912a4fdb4 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -432,7 +432,7 @@ public:
     virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,
                                                             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,
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index fdfae532d717..f8921ad1fc72 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -274,12 +274,19 @@
 // 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 )
 #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 )
@@ -293,6 +300,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_RULER_NULL_OFFSET                           ( SID_SVX_START + 79 )
 #define SID_RULER_BORDERS                               ( SID_SVX_START + 80 )
 #define SID_RULER_OBJECT                                ( SID_SVX_START + 81 )
@@ -426,6 +436,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_DRAW_TEXT                                   ( SID_SVX_START + 253 )
 #define SID_DRAW_CAPTION                                ( SID_SVX_START + 254 )
 #define SID_DRAW_SELECT                                 ( SID_SVX_START + 255 )
@@ -458,6 +471,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_SHEAR                        ( SID_SVX_START + 304 )
 #define SID_ATTR_TRANSFORM_SHEAR_X                      ( SID_SVX_START + 305 )
@@ -489,6 +505,9 @@
 #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 )
@@ -525,6 +544,8 @@
 #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 )
@@ -555,6 +576,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_ATTR_ALIGN_INDENT                           ( SID_SVX_START + 460 )
 #define SID_DEC_INDENT                                  ( SID_SVX_START + 461 )
 #define SID_INC_INDENT                                  ( SID_SVX_START + 462 )
@@ -579,8 +603,13 @@
 #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 )
@@ -716,6 +745,9 @@
 #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 )
@@ -728,15 +760,26 @@
 #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 )
@@ -744,10 +787,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 )
@@ -765,9 +813,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 )
@@ -805,10 +862,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 )
@@ -954,15 +1017,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 )
 
+//UUUU
+#define SID_OFFER_IMPORT                                ( SID_SVX_START + 1142 )
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               (SID_ATTR_BORDER_DEFAULT_WIDTH + 1)
+#define SID_SVX_FIRSTFREE                               (SID_OFFER_IMPORT + 1)
 
 
 // Overflow check for slot IDs
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 9ce517b256db..665712e1f91c 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -247,17 +247,17 @@
     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("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_FILLBITMAPNAME),           XATTR_FILLBITMAP        , ::getCppuType((const OUString*)0), 0, MID_NAME }, \
+    { OUString(UNO_NAME_FILLBITMAPURL),            XATTR_FILLBITMAP        , ::getCppuType((const OUString*)0), 0, MID_GRAFURL }, \
+    { OUString(UNO_NAME_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_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_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_FILLTRANSPARENCEGRADIENT), XATTR_FILLFLOATTRANSPARENCE, ::getCppuType((const ::com::sun::star::awt::Gradient*)0),         0,     MID_FILLGRADIENT}, \
+    { OUString(UNO_NAME_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 },
 
diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx
index dc8de7026395..2de9987d5c92 100644
--- a/include/xmloff/txtprmap.hxx
+++ b/include/xmloff/txtprmap.hxx
@@ -198,6 +198,14 @@
 #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 5511bf1abea2..4226166993b7 100644
--- a/include/xmloff/xmltypes.hxx
+++ b/include/xmloff/xmltypes.hxx
@@ -272,12 +272,20 @@
 #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)