diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 14:42:11 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-10 19:49:27 +0100 |
| commit | 2a8fe7ad8f53abe40f190c735f88887dd192f453 (patch) | |
| tree | 42f0294756bb7b2c416eae531c72d9dda22882f0 /sw/source/uibase | |
| parent | 1cfe06a6ac01d8b16659938be460a1ced78ff870 (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
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/docvw/edtwin2.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
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(); } |