diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 11:56:54 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-15 15:10:06 +0100 |
| commit | 623d1c5017bba364f6bc28c7c99b46e5cd9f8b76 (patch) | |
| tree | 34a8b1f46686886d0e68fed286d1450898d622bd /sw/source/core/tox/txmsrt.cxx | |
| parent | ae246b44da1708417aaaefe4f9186cfbbb9a9137 (diff) | |
sw_redlinehide_3: SwNodeText::GetExpandText overload is...
... apparently only used by ToX code; rename uniquely & add layout
parameter.
Change-Id: I0f94787fecd913912f122a654f183ac59b16e30a
Diffstat (limited to 'sw/source/core/tox/txmsrt.cxx')
| -rw-r--r-- | sw/source/core/tox/txmsrt.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 21897e4c8530..9b0da776fc5d 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -464,9 +464,9 @@ void SwTOXContent::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 { const sal_Int32* pEnd = pTextMark->End(); if( pEnd && !pTextMark->GetTOXMark().IsAlternativeText() ) - static_cast<const SwTextNode*>(aTOXSources[0].pNd)->GetExpandText( rNd, &rInsPos, - pTextMark->GetStart(), - *pEnd - pTextMark->GetStart() ); + static_cast<const SwTextNode*>(aTOXSources[0].pNd)->CopyExpandText( + rNd, &rInsPos, pTextMark->GetStart(), + *pEnd - pTextMark->GetStart(), nullptr ); else { rNd.InsertText( GetText().sText, rInsPos ); @@ -538,9 +538,9 @@ void SwTOXPara::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16 ) if( SwTOXElement::Template == eType || SwTOXElement::Sequence == eType || SwTOXElement::OutlineLevel == eType) { const SwTextNode* pSrc = static_cast<const SwTextNode*>(aTOXSources[0].pNd); - pSrc->GetExpandText( rNd, &rInsPos, nStartIndex, + pSrc->CopyExpandText( rNd, &rInsPos, nStartIndex, nEndIndex == -1 ? -1 : nEndIndex - nStartIndex, - false, false, true ); + nullptr, false, false, true ); } else { |