Related; #i125163# rename IsAdaptedToNewFillProperties

to supportsFullDrawingLayerFillAttributeSet so as to rename our equivalent
solution of d3de12fcfc85feb36eda3b0495807ef11d8fe772
"Resolves: fdo#81277 missing table cell background color in doc/html import"
with that of 36cc153d32bc262c2285d333a1369f6ca36a7fba
"i125163 Corrected FillStyle handling for tables in Writer"

Change-Id: If8ecbc712e01d823d034ff3771bf38a4df16368d

10 files changed, 26 insertions, 26 deletions

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 1b6056981966..b576048ebdf1 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -334,7 +334,7 @@ public:
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
-    virtual bool IsAdaptedToNewFillProperties() const;
+    virtual bool supportsFullDrawingLayerFillAttributeSet() const;
 };
 
 inline void SwFmt::SetName( const sal_Char* pNewName,
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 715f92a481ca..8b33ec20dd90 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -138,7 +138,7 @@ public:
 
     //UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
     virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
-    virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+    virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
 // The FlyFrame-Format
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 142959e3cdf8..181bf23b67b0 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -42,7 +42,7 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
 
-    virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+    virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
 class SwTableLineFmt : public SwFrmFmt
@@ -64,7 +64,7 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
 
-    virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+    virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
 class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt
@@ -89,7 +89,7 @@ public:
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt)
 
-    virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+    virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
 };
 
 #endif
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 6d36e800beb8..934acd292a0d 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -391,14 +391,14 @@ bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
     return true;
 }
 
-bool SwFmt::IsAdaptedToNewFillProperties() const
+bool SwFmt::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
 const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
 {
-    if (RES_BACKGROUND == nWhich && IsAdaptedToNewFillProperties())
+    if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or makeBackgroundBrushItem (simple fallback is in place and used)");
@@ -417,7 +417,7 @@ const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
 
 SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
 {
-    if (RES_BACKGROUND == nWhich && IsAdaptedToNewFillProperties())
+    if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFmt::GetBackgroundStat (simple fallback is in place and used)");
@@ -452,7 +452,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const S
 
 SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
 {
-    if (IsAdaptedToNewFillProperties())
+    if (supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFill = getSdrAllFillAttributesHelper();
@@ -489,7 +489,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
     bool bRet = false;
 
     //UUUU
-    if (RES_BACKGROUND == rAttr.Which() && IsAdaptedToNewFillProperties())
+    if (RES_BACKGROUND == rAttr.Which() && supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
@@ -590,7 +590,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
         GetDoc()->CheckForUniqueItemForLineFillNameOrIndex(aTempSet);
     }
 
-    if (IsAdaptedToNewFillProperties())
+    if (supportsFullDrawingLayerFillAttributeSet())
     {
         const SfxPoolItem* pSource = 0;
 
@@ -823,7 +823,7 @@ void SwFmt::SetGrabBagItem(const uno::Any& rVal)
 //UUUU
 SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
 {
-    if (IsAdaptedToNewFillProperties())
+    if (supportsFullDrawingLayerFillAttributeSet())
     {
         //UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
         SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)");
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 42fa2e5907ab..d745f8b3322e 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -895,7 +895,7 @@ public:
 
     //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
-    bool IsAdaptedToNewFillProperties() const;
+    bool supportsFullDrawingLayerFillAttributeSet() const;
 
 public:
     // if writer is NULL, dumps the layout structure as XML in layout.xml
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 5932f59d5a16..f8531511f01f 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2423,7 +2423,7 @@ SwFrmFmt::SwFrmFmt(
 {
 }
 
-bool SwFrmFmt::IsAdaptedToNewFillProperties() const
+bool SwFrmFmt::supportsFullDrawingLayerFillAttributeSet() const
 {
     return true;
 }
@@ -2443,7 +2443,7 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
             RES_FOOTER, false, (const SfxPoolItem**)&pF );
 
         //UUUU reset fill information
-        if (maFillAttributes.get() && IsAdaptedToNewFillProperties())
+        if (maFillAttributes.get() && supportsFullDrawingLayerFillAttributeSet())
         {
             SfxItemIter aIter(*((SwAttrSetChg*)pNew)->GetChgSet());
             bool bReset(false);
@@ -2462,7 +2462,7 @@ void SwFrmFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     else if(RES_FMT_CHG == nWhich)
     {
         //UUUU reset fill information on format change (e.g. style changed)
-        if (maFillAttributes.get() && IsAdaptedToNewFillProperties())
+        if (maFillAttributes.get() && supportsFullDrawingLayerFillAttributeSet())
         {
             maFillAttributes.reset();
         }
@@ -2983,7 +2983,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const
 bool SwFlyFrmFmt::IsBackgroundTransparent() const
 {
     //UUUU
-    if (IsAdaptedToNewFillProperties() && getSdrAllFillAttributesHelper())
+    if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper())
     {
         return getSdrAllFillAttributesHelper()->isTransparent();
     }
@@ -3026,7 +3026,7 @@ bool SwFlyFrmFmt::IsBackgroundTransparent() const
 bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
 {
     //UUUU
-    if (IsAdaptedToNewFillProperties() && getSdrAllFillAttributesHelper())
+    if (supportsFullDrawingLayerFillAttributeSet() && getSdrAllFillAttributesHelper())
     {
         return !getSdrAllFillAttributesHelper()->isUsed();
     }
@@ -3257,7 +3257,7 @@ IMapObject* SwFrmFmt::GetIMapObject( const Point& rPoint,
 //UUUU
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrmFmt::getSdrAllFillAttributesHelper() const
 {
-    if (IsAdaptedToNewFillProperties())
+    if (supportsFullDrawingLayerFillAttributeSet())
     {
         // create FillAttributes on demand
         if(!maFillAttributes.get())
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 9f30f8240a59..629512edecca 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -570,7 +570,7 @@ drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFrm::getSdrAllFillAttri
     }
 }
 
-bool SwFrm::IsAdaptedToNewFillProperties() const
+bool SwFrm::supportsFullDrawingLayerFillAttributeSet() const
 {
     if (IsCntntFrm())
     {
@@ -578,7 +578,7 @@ bool SwFrm::IsAdaptedToNewFillProperties() const
     }
     else
     {
-        return static_cast< const SwLayoutFrm* >(this)->GetFmt()->IsAdaptedToNewFillProperties();
+        return static_cast< const SwLayoutFrm* >(this)->GetFmt()->supportsFullDrawingLayerFillAttributeSet();
     }
 }
 
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 76a06b783396..e0b3c28acdb6 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -208,7 +208,7 @@ SwFrmNotify::~SwFrmNotify()
     {
         //UUUU
         bool bUseNewFillProperties(false);
-        if (pFrm->IsAdaptedToNewFillProperties())
+        if (pFrm->supportsFullDrawingLayerFillAttributeSet())
         {
             drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pFrm->getSdrAllFillAttributesHelper());
             if(aFillAttributes.get() && aFillAttributes->isUsed())
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index cf04cf9de827..4b963b961698 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4158,7 +4158,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
         {
             const SwFrmFmt* pSwFrmFmt = dynamic_cast< const SwFrmFmt* >(GetFmt());
 
-            if (pSwFrmFmt && pSwFrmFmt->IsAdaptedToNewFillProperties())
+            if (pSwFrmFmt && pSwFrmFmt->supportsFullDrawingLayerFillAttributeSet())
             {
                 //UUUU check for transparency
                 const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pSwFrmFmt->getSdrAllFillAttributesHelper());
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 99ebf86fbd82..79a1c65bc6cf 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2363,17 +2363,17 @@ void SwTableBoxFmt::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
     SwFrmFmt::Modify( pOld, pNew );
 }
 
-bool SwTableBoxFmt::IsAdaptedToNewFillProperties() const
+bool SwTableBoxFmt::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-bool SwTableFmt::IsAdaptedToNewFillProperties() const
+bool SwTableFmt::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }
 
-bool SwTableLineFmt::IsAdaptedToNewFillProperties() const
+bool SwTableLineFmt::supportsFullDrawingLayerFillAttributeSet() const
 {
     return false;
 }