summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-11-08 14:42:11 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-11-10 19:49:27 +0100
commit2a8fe7ad8f53abe40f190c735f88887dd192f453 (patch)
tree42f0294756bb7b2c416eae531c72d9dda22882f0
parent1cfe06a6ac01d8b16659938be460a1ced78ff870 (diff)
sw_redlinehide_3: pass layout into SwTextNode::GetExpandText()
Thanks to [loplugin:nullptr] and [loplugin:implicitboolconversion] for finding one of the call sites; 3 current C++ compilers would otherwise have implicitly converted the parameters into nonsense without warning. Change-Id: I3cf6697b37616570fd56fd32da27752983a66f4a
-rw-r--r--sw/inc/ndtxt.hxx3
-rw-r--r--sw/source/core/crsr/crsrsh.cxx3
-rw-r--r--sw/source/core/crsr/crstrvl.cxx7
-rw-r--r--sw/source/core/doc/DocumentOutlineNodesManager.cxx8
-rw-r--r--sw/source/core/doc/doccomp.cxx6
-rw-r--r--sw/source/core/doc/docglbl.cxx2
-rw-r--r--sw/source/core/doc/docnum.cxx14
-rw-r--r--sw/source/core/edit/edattr.cxx2
-rw-r--r--sw/source/core/edit/editsh.cxx8
-rw-r--r--sw/source/core/fields/expfld.cxx2
-rw-r--r--sw/source/core/fields/reffld.cxx6
-rw-r--r--sw/source/core/tox/tox.cxx2
-rw-r--r--sw/source/core/tox/txmsrt.cxx3
-rw-r--r--sw/source/core/txtnode/atrfld.cxx2
-rw-r--r--sw/source/core/txtnode/atrftn.cxx4
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx9
-rw-r--r--sw/source/core/unocore/unoport.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx3
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx2
20 files changed, 49 insertions, 41 deletions
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index d204527165e0..8fd2c5449f7b 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -673,7 +673,8 @@ public:
add 5th optional parameter <bWithSpacesForLevel> indicating, if additional
spaces are inserted in front of the expanded text string depending on
the list level. */
- OUString GetExpandText( const sal_Int32 nIdx = 0,
+ OUString GetExpandText( SwRootFrame const* pLayout,
+ const sal_Int32 nIdx = 0,
const sal_Int32 nLen = -1,
const bool bWithNum = false,
const bool bAddSpaceAfterListLabelStr = false,
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 6889862e26d2..b5c08d53d015 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2436,6 +2436,7 @@ OUString SwCursorShell::GetSelText() const
? pEnd->nContent.GetIndex()
: rNode.GetTextNode()->Len());
buf.append(rNode.GetTextNode()->GetExpandText(
+ GetLayout(),
nStart, nEnd - nStart, false, false, false,
ExpandMode::HideDeletions));
@@ -2451,7 +2452,7 @@ OUString SwCursorShell::GetSelText() const
if( pTextNd )
{
const sal_Int32 nStt = m_pCurrentCursor->Start()->nContent.GetIndex();
- aText = pTextNd->GetExpandText( nStt,
+ aText = pTextNd->GetExpandText(GetLayout(), nStt,
m_pCurrentCursor->End()->nContent.GetIndex() - nStt );
}
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a7edee8146b9..7b14d3156938 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1536,7 +1536,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
const sal_Int32* pEnd = pTextAttr->GetEnd();
if( pEnd )
rContentAtPos.sStr =
- pTextNd->GetExpandText( pTextAttr->GetStart(), *pEnd - pTextAttr->GetStart() );
+ pTextNd->GetExpandText(GetLayout(), pTextAttr->GetStart(), *pEnd - pTextAttr->GetStart());
else if( RES_TXTATR_TOXMARK == pTextAttr->Which())
rContentAtPos.sStr =
pTextAttr->GetTOXMark().GetAlternativeText();
@@ -1582,7 +1582,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
const sal_Int32 nSt = pTextAttr->GetStart();
const sal_Int32 nEnd = *pTextAttr->End();
- rContentAtPos.sStr = pTextNd->GetExpandText(nSt, nEnd-nSt);
+ rContentAtPos.sStr = pTextNd->GetExpandText(GetLayout(), nSt, nEnd-nSt);
rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
rContentAtPos.eContentAtPos = IsAttrAtPos::InetAttr;
@@ -2438,7 +2438,8 @@ bool SwCursorShell::SelectNxtPrvHyperlink( bool bNext )
? ( aPos < aCmpPos && aCurPos < aPos )
: ( aCmpPos < aPos && aPos < aCurPos ))
{
- OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
+ OUString sText(pTextNd->GetExpandText(GetLayout(),
+ rAttr.GetStart(),
*rAttr.GetEnd() - rAttr.GetStart() ) );
sText = sText.replaceAll(OUStringLiteral1(0x0a), "");
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
index 12945c76ae6e..4f66fd4a3d0e 100644
--- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -60,8 +60,8 @@ OUString GetExpandTextMerged(SwRootFrame const*const pLayout,
else
{
ExpandMode const mode(ExpandMode::HideDeletions | i_mode);
- OUStringBuffer ret(rNode.GetExpandText(0, -1, bWithNumber,
- bWithNumber, bWithSpacesForLevel, mode));
+ OUStringBuffer ret(rNode.GetExpandText(pLayout, 0, -1,
+ bWithNumber, bWithNumber, bWithSpacesForLevel, mode));
for (sal_uLong i = rNode.GetIndex() + 1;
i <= pMerged->pLastNode->GetIndex(); ++i)
{
@@ -69,7 +69,7 @@ OUString GetExpandTextMerged(SwRootFrame const*const pLayout,
if (pTmp->GetRedlineMergeFlag() == SwNode::Merge::NonFirst)
{
ret.append(pTmp->GetTextNode()->GetExpandText(
- 0, -1, false, false, false, mode));
+ pLayout, 0, -1, false, false, false, mode));
}
}
return ret.makeStringAndClear();
@@ -77,7 +77,7 @@ OUString GetExpandTextMerged(SwRootFrame const*const pLayout,
}
}
}
- return rNode.GetExpandText( 0, -1, bWithNumber,
+ return rNode.GetExpandText(pLayout, 0, -1, bWithNumber,
bWithNumber, bWithSpacesForLevel, i_mode);
}
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 3766facb5cc1..fead8dd1ec45 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1068,7 +1068,7 @@ namespace
{
sRet.append( '\n' );
}
- sRet.append( aIdx.GetNode().GetTextNode()->GetExpandText() );
+ sRet.append( aIdx.GetNode().GetTextNode()->GetExpandText(nullptr) );
}
++aIdx;
}
@@ -1177,7 +1177,7 @@ OUString SwCompareLine::GetText() const
switch( rNode.GetNodeType() )
{
case SwNodeType::Text:
- sRet = rNode.GetTextNode()->GetExpandText();
+ sRet = rNode.GetTextNode()->GetExpandText(nullptr);
break;
case SwNodeType::Table:
@@ -1231,7 +1231,7 @@ OUString SwCompareLine::GetText() const
sal_uLong SwCompareLine::GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal )
{
- OUString sStr( rNd.GetExpandText() );
+ OUString sStr( rNd.GetExpandText(nullptr) );
for( sal_Int32 n = 0; n < sStr.getLength(); ++n )
( nVal <<= 1 ) += sStr[ n ];
return nVal;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 3ddbf4bc96ad..4845ed486497 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -291,7 +291,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
OUString sTitle( xDocProps->getTitle() );
if (!sTitle.isEmpty())
sTitle += ": ";
- sTitle += pStartNd->GetTextNode()->GetExpandText();
+ sTitle += pStartNd->GetTextNode()->GetExpandText(nullptr);
xDocProps->setTitle( sTitle );
// Replace template
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index b3c2a8336ba8..8a9a9dedb6f7 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -591,14 +591,14 @@ bool SwDoc::MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type
return MoveParagraph( aPam, nOffs, true );
}
-static SwTextNode* lcl_FindOutlineName( const SwOutlineNodes& rOutlNds, const OUString& rName,
- bool bExact )
+static SwTextNode* lcl_FindOutlineName(const SwOutlineNodes& rOutlNds,
+ SwRootFrame const*const pLayout, const OUString& rName, bool const bExact)
{
SwTextNode* pSavedNode = nullptr;
for( auto pOutlNd : rOutlNds )
{
SwTextNode* pTextNd = pOutlNd->GetTextNode();
- const OUString sText( pTextNd->GetExpandText() );
+ const OUString sText( pTextNd->GetExpandText(pLayout) );
if (sText.startsWith(rName))
{
if (sText.getLength() == rName.getLength())
@@ -730,7 +730,7 @@ bool SwDoc::GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame con
SwTextNode* pNd = ::lcl_FindOutlineNum(rOutlNds, sName, pLayout);
if ( pNd )
{
- OUString sExpandedText = pNd->GetExpandText();
+ OUString sExpandedText = pNd->GetExpandText(pLayout);
//#i4533# leading numbers followed by a dot have been remove while
//searching for the outline position
//to compensate this they must be removed from the paragraphs text content, too
@@ -746,7 +746,7 @@ bool SwDoc::GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame con
if( sExpandedText != sName )
{
- SwTextNode *pTmpNd = ::lcl_FindOutlineName( rOutlNds, sName, true );
+ SwTextNode *pTmpNd = ::lcl_FindOutlineName(rOutlNds, pLayout, sName, true);
if ( pTmpNd ) // found via the Name
{
pNd = pTmpNd;
@@ -757,7 +757,7 @@ bool SwDoc::GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame con
return true;
}
- pNd = ::lcl_FindOutlineName( rOutlNds, rName, false );
+ pNd = ::lcl_FindOutlineName(rOutlNds, pLayout, rName, false);
if ( pNd )
{
rPos.nNode = *pNd;
@@ -768,7 +768,7 @@ bool SwDoc::GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame con
// #i68289# additional search on hyperlink URL without its outline numbering part
if ( sName != rName )
{
- pNd = ::lcl_FindOutlineName( rOutlNds, sName, false );
+ pNd = ::lcl_FindOutlineName(rOutlNds, pLayout, sName, false);
if ( pNd )
{
rPos.nNode = *pNd;
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 98366e1b8f0f..0367d2a8f0f4 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -468,7 +468,7 @@ size_t SwEditShell::GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes )
OUString sText(rFootnote.GetViewNumStr(*mxDoc, GetLayout()));
if( !sText.isEmpty() )
sText += " ";
- sText += pTextNd->GetExpandText();
+ sText += pTextNd->GetExpandText(GetLayout());
SeqFieldLstElem aNew( sText, pTextFootnote->GetSeqRefNo() );
while( rList.InsertSort( aNew ) )
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index f548e2baf064..114699707eda 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -533,8 +533,8 @@ OUString SwEditShell::Calculate()
{
const SwPosition *pStart = rCurrentPaM.Start(), *pEnd = rCurrentPaM.End();
const sal_Int32 nStt = pStart->nContent.GetIndex();
- OUString aStr = pTextNd->GetExpandText( nStt, pEnd->nContent.
- GetIndex() - nStt );
+ OUString aStr = pTextNd->GetExpandText(GetLayout(),
+ nStt, pEnd->nContent.GetIndex() - nStt);
aStr = rCC.lowercase( aStr );
@@ -692,8 +692,8 @@ void SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
pTextNd->GetNodes().IsDocNodes() )
{
SwTextINetFormat& rAttr = *pFnd;
- OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
- *rAttr.GetEnd() - rAttr.GetStart() ) );
+ OUString sText( pTextNd->GetExpandText(GetLayout(),
+ rAttr.GetStart(), *rAttr.GetEnd() - rAttr.GetStart()) );
sText = sText.replaceAll(OUStringLiteral1(0x0a), "");
sText = comphelper::string::strip(sText, ' ');
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 97c415050724..3505ed94774d 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -596,7 +596,7 @@ size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList )
pNd->GetNodes().IsDocNodes() )
{
SeqFieldLstElem aNew(
- pNd->GetExpandText(),
+ pNd->GetExpandText(nullptr/*TODO*/),
static_cast<SwSetExpField*>(pF->GetField())->GetSeqNumber() );
rList.InsertSort( aNew );
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c44d2f450348..171434590ad3 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -405,7 +405,7 @@ OUString SwGetRefField::GetExpandedTextOfReferencedTextNode() const
{
const SwTextNode* pReferencedTextNode( GetReferencedTextNode() );
return pReferencedTextNode
- ? pReferencedTextNode->GetExpandText(0, -1, true, true, false)
+ ? pReferencedTextNode->GetExpandText(nullptr/*TODO*/, 0, -1, true, true, false)
: OUString();
}
@@ -607,7 +607,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
if( nStart != nEnd ) // a section?
{
- m_sText = pTextNd->GetExpandText(nStart, nEnd - nStart, false, false, false);
+ m_sText = pTextNd->GetExpandText(pLayout, nStart, nEnd - nStart, false, false, false);
if (m_nSubType == REF_OUTLINE
|| (m_nSubType == REF_SEQUENCEFLD && REF_CONTENT == GetFormat()))
{
@@ -616,7 +616,7 @@ void SwGetRefField::UpdateField( const SwTextField* pFieldTextAttr )
}
else
{
- m_sTextRLHidden = pTextNd->GetExpandText(
+ m_sTextRLHidden = pTextNd->GetExpandText(pLayoutRLHidden,
nStart, nEnd - nStart, false, false, false, ExpandMode::HideDeletions);
}
FilterText(m_sText, GetLanguage(), m_sSetReferenceLanguage);
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f7dca91d90d9..0a653db9d137 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -177,7 +177,7 @@ OUString SwTOXMark::GetText() const
if( pEndIdx )
{
const sal_Int32 nStt = m_pTextAttr->GetStart();
- return m_pTextAttr->GetpTextNd()->GetExpandText( nStt, *pEndIdx-nStt );
+ return m_pTextAttr->GetpTextNd()->GetExpandText(nullptr, nStt, *pEndIdx-nStt);
}
}
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 9b0da776fc5d..9be42b24ee79 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -373,6 +373,7 @@ void SwTOXIndex::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 )
!(GetOptions() & SwTOIOptions::KeyAsEntry))
{
aRet.sText = static_cast<const SwTextNode*>(aTOXSources[0].pNd)->GetExpandText(
+ nullptr,
pTextMark->GetStart(),
*pEnd - pTextMark->GetStart());
if(SwTOIOptions::InitialCaps & nOpt && pTOXIntl && !aRet.sText.isEmpty())
@@ -452,6 +453,7 @@ TextAndReading SwTOXContent::GetText_Impl() const
{
return TextAndReading(
static_cast<const SwTextNode*>(aTOXSources[0].pNd)->GetExpandText(
+ nullptr,
pTextMark->GetStart(),
*pEnd - pTextMark->GetStart() ),
pTextMark->GetTOXMark().GetTextReading());
@@ -503,6 +505,7 @@ TextAndReading SwTOXPara::GetText_Impl() const
case SwTOXElement::OutlineLevel:
{
return TextAndReading(static_cast<const SwTextNode*>(pNd)->GetExpandText(
+ nullptr,
nStartIndex,
nEndIndex == -1 ? -1 : nEndIndex - nStartIndex,
false, false, false),
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 4fb9dbc606c0..d1ff01703e29 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -577,7 +577,7 @@ void SwTextInputField::UpdateFieldContent()
const sal_Int32 nIdx = GetStart() + 1;
// skip CH_TXT_ATR_INPUTFIELDEND character
const sal_Int32 nLen = static_cast<sal_Int32>(std::max<sal_Int32>( 0, ( (*End()) - 1 - nIdx ) ));
- const OUString aNewFieldContent = GetTextNode().GetExpandText( nIdx, nLen );
+ const OUString aNewFieldContent = GetTextNode().GetExpandText(nullptr, nIdx, nLen);
const SwInputField* pInputField = dynamic_cast<const SwInputField*>(GetFormatField().GetField());
assert(pInputField != nullptr);
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 697019c9d128..a2b3f35b5e70 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -189,12 +189,12 @@ void SwFormatFootnote::GetFootnoteText( OUString& rStr ) const
pCNd = aIdx.GetNodes().GoNext( &aIdx );
if( pCNd->IsTextNode() ) {
- rStr = static_cast<SwTextNode*>(pCNd)->GetExpandText();
+ rStr = static_cast<SwTextNode*>(pCNd)->GetExpandText(nullptr/*TODO*/);
++aIdx;
while ( !aIdx.GetNode().IsEndNode() ) {
if ( aIdx.GetNode().IsTextNode() )
- rStr += " " + aIdx.GetNode().GetTextNode()->GetExpandText();
+ rStr += " " + aIdx.GetNode().GetTextNode()->GetExpandText(nullptr/*TODO*/);
++aIdx;
}
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 7dbacee6596d..e8718a213237 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3380,7 +3380,8 @@ static void Replace0xFF(
// Expand fields
// #i83479# - handling of new parameters
-OUString SwTextNode::GetExpandText( const sal_Int32 nIdx,
+OUString SwTextNode::GetExpandText(SwRootFrame const*const pLayout,
+ const sal_Int32 nIdx,
const sal_Int32 nLen,
const bool bWithNum,
const bool bAddSpaceAfterListLabelStr,
@@ -3390,7 +3391,7 @@ OUString SwTextNode::GetExpandText( const sal_Int32 nIdx,
{
ExpandMode eMode = ExpandMode::ExpandFields | eAdditionalMode;
- ModelToViewHelper aConversionMap(*this, nullptr/*TODO*/, eMode);
+ ModelToViewHelper aConversionMap(*this, pLayout, eMode);
const OUString aExpandText = aConversionMap.getViewText();
const sal_Int32 nExpandBegin = aConversionMap.ConvertToViewPosition( nIdx );
sal_Int32 nEnd = nLen == -1 ? GetText().getLength() : nIdx + nLen;
@@ -3403,14 +3404,14 @@ OUString SwTextNode::GetExpandText( const sal_Int32 nIdx,
if( bWithNum )
{
- if ( !GetNumString().isEmpty() )
+ if (!GetNumString(true, MAXLEVEL, pLayout).isEmpty())
{
if ( bAddSpaceAfterListLabelStr )
{
const sal_Unicode aSpace = ' ';
aText.insert(0, aSpace);
}
- aText.insert(0, GetNumString());
+ aText.insert(0, GetNumString(true, MAXLEVEL, pLayout));
}
}
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 6275e317caf9..e7bb8572fd4a 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -173,7 +173,7 @@ OUString SwXTextPortion::getString()
if ( pTextNd )
{
const sal_Int32 nStt = rUnoCursor.Start()->nContent.GetIndex();
- aText = pTextNd->GetExpandText( nStt,
+ aText = pTextNd->GetExpandText(nullptr, nStt,
rUnoCursor.End()->nContent.GetIndex() - nStt );
}
return aText;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 2b59e5ec84e2..3cc3e62c8e16 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1228,7 +1228,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt
const sal_Int32* pTextEnd = rTextTOXMark.End();
if ( pTextEnd ) // has range?
{
- sText = rNode.GetExpandText( rTextTOXMark.GetStart(),
+ sText = rNode.GetExpandText(nullptr, rTextTOXMark.GetStart(),
*pTextEnd - rTextTOXMark.GetStart() );
}
else
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index e4258ed60f50..e1b8afaef0df 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -61,6 +61,7 @@
#include <fmtfld.hxx>
#include <IDocumentMarkAccess.hxx>
+#include <txtfrm.hxx>
#include <ndtxt.hxx>
static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
@@ -198,7 +199,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
SwTextNode* pTextNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTextNode();
if ( pTextNode )
{
- sText = pTextNode->GetExpandText( 0, pTextNode->Len(), true, true );
+ sText = sw::GetExpandTextMerged(rSh.GetLayout(), *pTextNode, true, false, ExpandMode(0));
if( !sText.isEmpty() )
{
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 9324c70999af..036bcea4c706 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1081,7 +1081,7 @@ static OUString lcl_CreateOutlineString( size_t nIndex,
sEntry.append(".");
}
sEntry.append( rOutlineNodes[ nIndex ]->
- GetTextNode()->GetExpandText() );
+ GetTextNode()->GetExpandText(nullptr) );
return sEntry.makeStringAndClear();
}