diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 15:26:58 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-15 15:10:06 +0100 |
| commit | ad292b0ab5ec6f21d5ec710e6ef503b25b578169 (patch) | |
| tree | ff8fb2de094e2b907c208273e9c077312ba3809a /sw/source/core/txtnode | |
| parent | d9976f4d7fc678bcbf34d72339b710c656d92b97 (diff) | |
sw_redlinehide_3: adapt SwFormatFootnote::GetFootnoteText()
Change-Id: I206d7345525a4de0f9ece6bac575f82ff1f96df8
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/atrftn.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index a2b3f35b5e70..e1a849b35d2c 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -179,8 +179,9 @@ SwFormatFootnote::~SwFormatFootnote() { } -void SwFormatFootnote::GetFootnoteText( OUString& rStr ) const +OUString SwFormatFootnote::GetFootnoteText(SwRootFrame const& rLayout) const { + OUStringBuffer buf; if( m_pTextAttr->GetStartNode() ) { SwNodeIndex aIdx( *m_pTextAttr->GetStartNode(), 1 ); @@ -189,16 +190,20 @@ void SwFormatFootnote::GetFootnoteText( OUString& rStr ) const pCNd = aIdx.GetNodes().GoNext( &aIdx ); if( pCNd->IsTextNode() ) { - rStr = static_cast<SwTextNode*>(pCNd)->GetExpandText(nullptr/*TODO*/); + buf.append(static_cast<SwTextNode*>(pCNd)->GetExpandText(&rLayout)); ++aIdx; while ( !aIdx.GetNode().IsEndNode() ) { if ( aIdx.GetNode().IsTextNode() ) - rStr += " " + aIdx.GetNode().GetTextNode()->GetExpandText(nullptr/*TODO*/); + { + buf.append(" "); + buf.append(aIdx.GetNode().GetTextNode()->GetExpandText(&rLayout)); + } ++aIdx; } } } + return buf.makeStringAndClear(); } /// return the view string of the foot/endnote |