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

1 files changed, 28 insertions, 3 deletions

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"