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, 23 insertions, 13 deletions

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