Kaydet (Commit) 96664bf0 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: move IsIgnoredCharFmtForNumbering() to SwTxtNode

I need this in SwTxtFormatter.

Change-Id: Ib1586299f468a88e92fdb367fbab69a683791dc9
üst 115a4b7c
......@@ -805,6 +805,9 @@ public:
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
/// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
static bool IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich);
};
inline SwpHints & SwTxtNode::GetSwpHints()
......
......@@ -1779,8 +1779,7 @@ void SwTxtNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd )
}
}
//In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich)
bool SwTxtNode::IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich)
{
return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND || nWhich == RES_CHRATR_ESCAPEMENT);
}
......@@ -1830,7 +1829,7 @@ bool SwTxtNode::TryCharSetExpandToNum(const SfxItemSet& aCharSet)
{
if (pCurrNumFmt->IsItemize() && lcl_IsIgnoredCharFmtForBullets(nWhich))
return bRet;
if (pCurrNumFmt->IsEnumeration() && lcl_IsIgnoredCharFmtForNumbering(nWhich))
if (pCurrNumFmt->IsEnumeration() && SwTxtNode::IsIgnoredCharFmtForNumbering(nWhich))
return bRet;
SwCharFmt* pCurrCharFmt =pCurrNumFmt->GetCharFmt();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment