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

11 files changed, 209 insertions, 47 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d43856fe6ae7..35e4208982ba 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1082,6 +1082,13 @@ public:
                             sal_Bool bDelRedlines = sal_True,
                             sal_Bool bCopyFlyAtFly = sal_False ) const;
 
+    //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
+    // and evtl. corrects that items to ensure unique names for that type. This call may
+    // modify/correct entries inside of the given SfxItemSet, and it will apply a name to
+    // the items in question (what is essential to make the named slots associated with
+    // these items work for the UNO API and thus e.g. for ODF im/export)
+    void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
+
     bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
 
     bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
diff --git a/sw/inc/fillattributes.hxx b/sw/inc/fillattributes.hxx
new file mode 100755
index 000000000000..ac0bb10311c6
--- /dev/null
+++ b/sw/inc/fillattributes.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef FILLATTRIBUTES_HXX
+#define FILLATTRIBUTES_HXX
+
+#include <drawinglayer/attribute/fillgradientattribute.hxx>
+#include <drawinglayer/attribute/sdrfillattribute.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <boost/shared_ptr.hpp>
+
+//////////////////////////////////////////////////////////////////////////////
+
+class Color;
+class SfxItemSet;
+class FillAttributes
+{
+private:
+    basegfx::B2DRange                                                   maLastPaintRange;
+    basegfx::B2DRange                                                   maLastDefineRange;
+    boost::shared_ptr< drawinglayer::attribute::SdrFillAttribute >      maFillAttribute;
+    boost::shared_ptr< drawinglayer::attribute::FillGradientAttribute > maFillGradientAttribute;
+    drawinglayer::primitive2d::Primitive2DSequence                      maPrimitives;
+
+    void createPrimitive2DSequence(
+        const basegfx::B2DRange& rPaintRange,
+        const basegfx::B2DRange& rDefineRange);
+
+protected:
+public:
+    FillAttributes();
+    FillAttributes(const Color& rColor);
+    FillAttributes(const SfxItemSet& rSet);
+    ~FillAttributes();
+
+    bool isUsed() const;
+    bool hasSdrFillAttribute() const { return maFillAttribute.get(); }
+    bool hasFillGradientAttribute() const { return maFillGradientAttribute.get(); }
+    bool isTransparent() const;
+
+    const drawinglayer::attribute::SdrFillAttribute& getFillAttribute() const;
+    const drawinglayer::attribute::FillGradientAttribute& getFillGradientAttribute() const;
+    const drawinglayer::primitive2d::Primitive2DSequence& getPrimitive2DSequence(
+        const basegfx::B2DRange& rPaintRange,
+        const basegfx::B2DRange& rDefineRange) const;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+typedef boost::shared_ptr< FillAttributes > FillAttributesPtr;
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif // FILLATTRIBUTES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 038a0834e9d0..1d0f06ee8048 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -25,6 +25,8 @@
 #include <calbck.hxx>
 #include <hintids.hxx>
 #include <boost/shared_ptr.hpp>
+//UUUU
+#include <fillattributes.hxx>
 
 class IDocumentSettingAccess;
 class IDocumentDrawModelAccess;
@@ -87,9 +89,11 @@ public:
     sal_Bool SetDerivedFrom(SwFmt *pDerivedFrom = 0);
 
     /// If bInParents is FALSE, search only in this format for attribute.
-    inline const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich,
+    //UUUUinline
+    const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich,
                                           sal_Bool bInParents = sal_True ) const;
-    inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True,
+    //UUUUinline
+    SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True,
                                     const SfxPoolItem **ppItem = 0 ) const;
     virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
     virtual bool SetFmtAttr( const SfxItemSet& rSet );
@@ -236,7 +240,10 @@ public:
     inline const SwFmtVertOrient      &GetVertOrient( sal_Bool = sal_True ) const;
     inline const SvxBoxItem               &GetBox( sal_Bool = sal_True ) const;
     inline const SvxFmtKeepItem         &GetKeep( sal_Bool = sal_True ) const;
-    inline const SvxBrushItem           &GetBackground( sal_Bool = sal_True ) const;
+
+    //UUUU
+    const SvxBrushItem& GetBackground( sal_Bool = sal_True ) const;
+
     inline const SvxShadowItem            &GetShadow( sal_Bool = sal_True ) const;
     inline const SwFmtPageDesc            &GetPageDesc( sal_Bool = sal_True ) const;
     inline const SvxFmtBreakItem      &GetBreak( sal_Bool = sal_True ) const;
@@ -319,15 +326,18 @@ public:
         @return false, default implementation
     */
     virtual bool IsShadowTransparent() const;
+
+    //UUUU
+    virtual FillAttributesPtr getFillAttributes() const;
 };
 
 // --------------- inline Implementations ------------------------
 
-inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich,
-                                             sal_Bool bInParents ) const
-{
-    return aSet.Get( nWhich, bInParents );
-}
+//UUUUinline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich,
+//UUUU                                             sal_Bool bInParents ) const
+//UUUU{
+//UUUU  return aSet.Get( nWhich, bInParents );
+//UUUU}
 
 inline void SwFmt::SetName( const sal_Char* pNewName,
                              sal_Bool bBroadcast )
@@ -335,11 +345,11 @@ inline void SwFmt::SetName( const sal_Char* pNewName,
     SetName(OUString::createFromAscii(pNewName), bBroadcast);
 }
 
-inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent,
-                                        const SfxPoolItem **ppItem ) const
-{
-    return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
-}
+//UUUUinline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent,
+//UUUU                                      const SfxPoolItem **ppItem ) const
+//UUUU{
+//UUUU  return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
+//UUUU}
 
 #endif // INCLUDED_SW_INC_FORMAT_HXX
 
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 488720d8f7ed..0b97b3c3a5e5 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -43,10 +43,6 @@ inline const SvxFmtKeepItem &SwAttrSet::GetKeep(sal_Bool bInP) const
     { return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); }
 inline const SvxBrushItem &SwAttrSet::GetBackground(sal_Bool bInP) const
     { return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); }
-inline const XFillStyleItem &SwAttrSet::GetFillStyle(sal_Bool bInP) const
-    { return (const XFillStyleItem&)Get( RES_FILL_STYLE,bInP); }
-inline const XFillGradientItem &SwAttrSet::GetFillGradient(sal_Bool bInP) const
-    { return (const XFillGradientItem&)Get( RES_FILL_GRADIENT,bInP); }
 inline const SvxShadowItem &SwAttrSet::GetShadow(sal_Bool bInP) const
     { return (const SvxShadowItem&)Get( RES_SHADOW,bInP); }
 inline const SvxFmtBreakItem &SwAttrSet::GetBreak(sal_Bool bInP) const
@@ -75,8 +71,8 @@ inline const SvxBoxItem &SwFmt::GetBox(sal_Bool bInP) const
     { return aSet.GetBox(bInP); }
 inline const SvxFmtKeepItem &SwFmt::GetKeep(sal_Bool bInP) const
     { return aSet.GetKeep(bInP); }
-inline const SvxBrushItem &SwFmt::GetBackground(sal_Bool bInP) const
-    { return aSet.GetBackground(bInP); }
+//UUUUinline const SvxBrushItem &SwFmt::GetBackground(sal_Bool bInP) const
+//UUUU  { return aSet.GetBackground(bInP); }
 inline const SvxShadowItem &SwFmt::GetShadow(sal_Bool bInP) const
     { return aSet.GetShadow(bInP); }
 inline const SvxFmtBreakItem &SwFmt::GetBreak(sal_Bool bInP) const
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index e4fa0cc4d778..d0f9676b3490 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -43,20 +43,23 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::uno::XInterface> m_wXObject;
 
-protected:
-    SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-                SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT,
-                const sal_uInt16* pWhichRange = 0 )
-          : SwFmt( rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange),
-                pDrvdFrm, nFmtWhich )
-    {}
+    //UUUU
+    FillAttributesPtr           maFillAttributes;
 
-    SwFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
-                SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT,
-                const sal_uInt16* pWhichRange = 0 )
-          : SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange),
-                pDrvdFrm, nFmtWhich )
-    {}
+protected:
+    SwFrmFmt(
+        SwAttrPool& rPool,
+        const sal_Char* pFmtNm,
+        SwFrmFmt *pDrvdFrm,
+        sal_uInt16 nFmtWhich = RES_FRMFMT,
+        const sal_uInt16* pWhichRange = 0);
+
+    SwFrmFmt(
+        SwAttrPool& rPool,
+        const OUString &rFmtNm,
+        SwFrmFmt *pDrvdFrm,
+        sal_uInt16 nFmtWhich = RES_FRMFMT,
+        const sal_uInt16* pWhichRange = 0);
 
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
 
@@ -130,6 +133,9 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt)
     void RegisterToFormat( SwFmt& rFmt );
+
+    //UUUU
+    virtual FillAttributesPtr getFillAttributes() const;
 };
 
 // The FlyFrame-Format
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 23819823d266..e0a668562272 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -230,8 +230,6 @@ RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
     RES_AUTO_STYLE,                                 // 125
     RES_FRMATR_STYLE_NAME,                          // 126
     RES_FRMATR_CONDITIONAL_STYLE_NAME,              // 127
-    RES_FILL_STYLE,                                 // 128
-    RES_FILL_GRADIENT,                              // 129
     RES_FRMATR_GRABBAG,                             // 130
     RES_TEXT_VERT_ADJUST,                           // 131
 RES_FRMATR_END
@@ -282,13 +280,13 @@ RES_UNKNOWNATR_END
 enum RES_FMT
 {
 RES_FMT_BEGIN = RES_UNKNOWNATR_END,
-    RES_CHRFMT = RES_FMT_BEGIN,
-    RES_FRMFMT,
-    RES_FLYFRMFMT,
-    RES_TXTFMTCOLL,
-    RES_GRFFMTCOLL,
-    RES_DRAWFRMFMT,
-    RES_CONDTXTFMTCOLL,
+    RES_CHRFMT = RES_FMT_BEGIN,                     // 144
+    RES_FRMFMT,                                     // 145
+    RES_FLYFRMFMT,                                  // 146
+    RES_TXTFMTCOLL,                                 // 147
+    RES_GRFFMTCOLL,                                 // 148
+    RES_DRAWFRMFMT,                                 // 149
+    RES_CONDTXTFMTCOLL,                             // 150
 RES_FMT_END
 };
 
@@ -296,7 +294,7 @@ RES_FMT_END
 enum RES_MSG
 {
 RES_MSG_BEGIN = RES_FMT_END,
-    RES_OBJECTDYING = RES_MSG_BEGIN,
+    RES_OBJECTDYING = RES_MSG_BEGIN,                // 151
     RES_FMT_CHG,
     RES_ATTRSET_CHG,
     RES_FRM_SIZECHG,
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 782cb26acc4e..4a2c26d1cd9a 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -137,6 +137,12 @@ class SwTblBoxValue;
 
 class SwAttrPool : public SfxItemPool
 {
+private:
+    ///UUUU helpers to add/rmove DrawingLayer ItemPool, used in constructor
+    /// and destructor; still isolated to evtl. allow other use later
+    void createAndAddSecondaryPools();
+    void removeAndDeleteSecondaryPools();
+
     friend void _InitCore();            // For creating/deleting of version maps.
     friend void _FinitCore();
     static sal_uInt16* pVersionMap1;
@@ -272,8 +278,6 @@ public:
     inline const SvxBoxItem               &GetBox( sal_Bool = sal_True ) const;
     inline const SvxFmtKeepItem         &GetKeep( sal_Bool = sal_True ) const;
     inline const SvxBrushItem           &GetBackground( sal_Bool = sal_True ) const;
-    inline const XFillStyleItem           &GetFillStyle( sal_Bool = sal_True ) const;
-    inline const XFillGradientItem        &GetFillGradient( sal_Bool = sal_True ) const;
     inline const SvxShadowItem            &GetShadow( sal_Bool = sal_True ) const;
     inline const SwFmtPageDesc            &GetPageDesc( sal_Bool = sal_True ) const;
     inline const SvxFmtBreakItem      &GetBreak( sal_Bool = sal_True ) const;
diff --git a/sw/inc/unobrushitemhelper.hxx b/sw/inc/unobrushitemhelper.hxx
new file mode 100644
index 000000000000..1c6a3ec9913e
--- /dev/null
+++ b/sw/inc/unobrushitemhelper.hxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _UNOBRUSHITEMHELPER_HXX
+#define _UNOBRUSHITEMHELPER_HXX
+
+#include <editeng/brushitem.hxx>
+
+//UUUU helper function definintions for UNO API fallbacks to replace SvxBrushItem
+void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxItemSet& rToSet);
+SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_Bool bSearchInParents = sal_True);
+
+#endif // _UNOBRUSHITEMHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 30f11c9ec80c..4e3d30b21f02 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -72,6 +72,11 @@ private:
 
     SwPaM*                          m_pCopySource;
 
+    ///UUUU helper to check if fill style is set to color or bitmap
+    /// and thus formally used SvxBrushItem parts need to be mapped
+    /// for backwards compatibility
+    bool needToMapFillItemsToSvxBrushItemTypes() const;
+
 protected:
     com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
     com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  mxStyleFamily;
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index e95309217300..93c3fc5a7f95 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -309,6 +309,14 @@
 #define WID_TXTCOL_AUTO_DISTANCE        6
 #define WID_TXTCOL_LINE_STYLE           7
 
+//UUUU This define would need the include of <svx/unoshprp.hxx>, but this ends
+// in a mess; there *are* double used symbols which are used in a #define in
+// editengine and as an enum in sw; these will then collide and lead to severe
+// problems which will be hard to detect at all (e.g. look for UNO_NAME_CHAR_COLOR).
+// More of these are likely, so better use a local define here, but at least the same
+// as in svx/inc/unoshprp.hxx
+#define OWN_ATTR_FILLBMP_MODE   (OWN_ATTR_VALUE_START+45)
+
 class SwUnoPropertyMapProvider
 {
     SfxItemPropertyMapEntry const * aMapEntriesArr[PROPERTY_MAP_END];
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 0be3cf70fa6e..ab08fc277933 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -632,6 +632,34 @@
 #define UNO_NAME_FRAME_WIDTH_ABSOLUTE "FrameWidthAbsolute"
 #define UNO_NAME_FRAME_WIDTH_PERCENT "FrameWidthPercent"
 
+//UUUU names for FillAttributes from SVX
+#define UNO_NAME_SW_FILLBMP_LOGICAL_SIZE UNO_NAME_FILLBMP_LOGICAL_SIZE
+#define UNO_NAME_SW_FILLBMP_OFFSET_X UNO_NAME_FILLBMP_OFFSET_X
+#define UNO_NAME_SW_FILLBMP_OFFSET_Y UNO_NAME_FILLBMP_OFFSET_Y
+#define UNO_NAME_SW_FILLBMP_POSITION_OFFSET_X UNO_NAME_FILLBMP_POSITION_OFFSET_X
+#define UNO_NAME_SW_FILLBMP_POSITION_OFFSET_Y UNO_NAME_FILLBMP_POSITION_OFFSET_Y
+#define UNO_NAME_SW_FILLBMP_RECTANGLE_POINT UNO_NAME_FILLBMP_RECTANGLE_POINT
+#define UNO_NAME_SW_FILLBMP_SIZE_X UNO_NAME_FILLBMP_SIZE_X
+#define UNO_NAME_SW_FILLBMP_SIZE_Y UNO_NAME_FILLBMP_SIZE_Y
+#define UNO_NAME_SW_FILLBMP_STRETCH UNO_NAME_FILLBMP_STRETCH
+#define UNO_NAME_SW_FILLBMP_TILE UNO_NAME_FILLBMP_TILE
+#define UNO_NAME_SW_FILLBMP_MODE UNO_NAME_FILLBMP_MODE
+#define UNO_NAME_SW_FILLCOLOR UNO_NAME_FILLCOLOR
+#define UNO_NAME_SW_FILLBACKGROUND UNO_NAME_FILLBACKGROUND
+#define UNO_NAME_SW_FILLBITMAP UNO_NAME_FILLBITMAP
+#define UNO_NAME_SW_FILLBITMAPNAME UNO_NAME_FILLBITMAPNAME
+#define UNO_NAME_SW_FILLBITMAPURL UNO_NAME_FILLBITMAPURL
+#define UNO_NAME_SW_FILLGRADIENTSTEPCOUNT UNO_NAME_FILLGRADIENTSTEPCOUNT
+#define UNO_NAME_SW_FILLGRADIENT UNO_NAME_FILLGRADIENT
+#define UNO_NAME_SW_FILLGRADIENTNAME UNO_NAME_FILLGRADIENTNAME
+#define UNO_NAME_SW_FILLHATCH UNO_NAME_FILLHATCH
+#define UNO_NAME_SW_FILLHATCHNAME UNO_NAME_FILLHATCHNAME
+#define UNO_NAME_SW_FILLSTYLE UNO_NAME_FILLSTYLE
+#define UNO_NAME_SW_FILL_TRANSPARENCE UNO_NAME_FILL_TRANSPARENCE
+#define UNO_NAME_SW_FILLTRANSPARENCEGRADIENT UNO_NAME_FILLTRANSPARENCEGRADIENT
+#define UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME UNO_NAME_FILLTRANSPARENCEGRADIENTNAME
+#define UNO_NAME_SW_FILLCOLOR_2 UNO_NAME_FILLCOLOR_2
+
 #define UNO_NAME_PARA_STYLEHEADING "ParaStyleHeading"
 #define UNO_NAME_PARA_STYLELEVEL1 "ParaStyleLevel1"
 #define UNO_NAME_PARA_STYLELEVEL10 "ParaStyleLevel10"
@@ -791,9 +819,6 @@
 #define UNO_NAME_TABLE_BORDER2 "TableBorder2"
 #define UNO_NAME_REPLACEMENT_GRAPHIC_URL "ReplacementGraphicURL"
 #define UNO_NAME_HIDDEN "Hidden"
-#define UNO_NAME_FILL_STYLE "FillStyle"
-#define UNO_NAME_FILL_GRADIENT "FillGradient"
-#define UNO_NAME_FILL_GRADIENT_NAME "FillGradientName"
 #define UNO_NAME_DEFAULT_PAGE_MODE "DefaultPageMode"
 #define UNO_NAME_CHAR_SHADING_VALUE "CharShadingValue"
 #define UNO_NAME_PARA_INTEROP_GRAB_BAG "ParaInteropGrabBag"