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, 83 insertions, 0 deletions

diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 7226a7d0a4ae..87a57af6c61a 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -21,6 +21,89 @@ interface BaseTextFrame
     Automation = FALSE;
 ]
 {
+    SID_ATTR_FILL_STYLE
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_ATTR_FILL_COLOR
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_ATTR_FILL_GRADIENT
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_ATTR_FILL_HATCH
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_ATTR_FILL_BITMAP
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_ATTR_FILL_TRANSPARENCE
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_ATTR_FILL_FLOATTRANSPARENCE
+    [
+        Export = FALSE;
+        ExecMethod = ExecDrawAttrArgsTextFrame;
+        StateMethod = GetDrawAttrStateTextFrame;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
+    SID_COLOR_TABLE
+    [
+        StateMethod = GetDrawAttrStateTextFrame;
+    ]
+
+    SID_GRADIENT_LIST
+    [
+        StateMethod = GetDrawAttrStateTextFrame;
+    ]
+
+    SID_HATCH_LIST
+    [
+        StateMethod = GetDrawAttrStateTextFrame;
+    ]
+
+    SID_BITMAP_LIST
+    [
+        StateMethod = GetDrawAttrStateTextFrame;
+    ]
+
+    SID_ATTRIBUTES_AREA
+    [
+        ExecMethod = ExecDrawDlgTextFrame;
+        StateMethod = DisableStateTextFrame;
+    ]
+
+
     FN_FRAME_TO_ANCHOR  // status()
     [
         /*OS: Datentypen unvertraeglich ?? */