diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-10-06 15:36:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-06 16:19:13 +0100 |
commit | 5c1482c3e37502bce2b3be106d1a70938ce8b30c (patch) | |
tree | 03b20b15083ebb996053583107188006b3bc0ba0 /sw/source/core/attr/format.cxx | |
parent | 0a4d77f35e96e4dfdf69cc5ceb788ddaa849084c (diff) |
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
Diffstat (limited to 'sw/source/core/attr/format.cxx')
-rw-r--r-- | sw/source/core/attr/format.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
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)"); |