diff options
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editdoc.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 7 | ||||
| -rw-r--r-- | editeng/source/items/numitem.cxx | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index e833d8b005ce..755e642e345d 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -289,7 +289,7 @@ public: /// return length including expanded fields sal_uLong GetExpandedLen() const; /// return content including expanded fields - OUString GetExpandedText(sal_Int32 nStartPos = 0, sal_Int32 nEndPos = -1, bool bResolveFields = true) const; + OUString GetExpandedText(sal_Int32 nStartPos = 0, sal_Int32 nEndPos = -1) const; /// re-write offsets in the expanded text to string offsets void UnExpandPositions( sal_Int32 &rStartPos, sal_Int32 &rEndPos ); diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 50e16d6ba63b..32b965d7cc6d 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1626,7 +1626,7 @@ sal_uLong ContentNode::GetExpandedLen() const return nLen; } -OUString ContentNode::GetExpandedText(sal_Int32 nStartPos, sal_Int32 nEndPos, bool bResolveFields) const +OUString ContentNode::GetExpandedText(sal_Int32 nStartPos, sal_Int32 nEndPos) const { if ( nEndPos < 0 || nEndPos > Len() ) nEndPos = Len(); @@ -1658,8 +1658,7 @@ OUString ContentNode::GetExpandedText(sal_Int32 nStartPos, sal_Int32 nEndPos, bo case EE_FEATURE_LINEBR: aStr += "\x0A"; break; case EE_FEATURE_FIELD: - if ( bResolveFields ) - aStr += static_cast<const EditCharAttribField*>(pNextFeature)->GetFieldValue(); + aStr += static_cast<const EditCharAttribField*>(pNextFeature)->GetFieldValue(); break; default: OSL_FAIL( "What feature?" ); } @@ -2163,7 +2162,7 @@ OUString EditDoc::GetParaAsString( sal_Int32 nNode ) const OUString EditDoc::GetParaAsString( const ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nEndPos) { - return pNode->GetExpandedText(nStartPos, nEndPos, true/*bResolveFields*/); + return pNode->GetExpandedText(nStartPos, nEndPos); } EditPaM EditDoc::GetStartPaM() const diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 6b8a322a704c..3eeb00ae3573 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -670,7 +670,7 @@ void SvxNumRule::Store( SvStream &rStream ) if(!pConverter) pConverter = CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetFamilyName(), - FontToSubsFontFlags::EXPORT|FontToSubsFontFlags::ONLYOLDSOSYMBOLFONTS); + FontToSubsFontFlags::EXPORT); } aFmts[i]->Store(rStream, pConverter); } |