diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 15:15:43 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-14 18:42:15 +0100 |
| commit | 71aec8511c8f934619c52d151346badf00c2d169 (patch) | |
| tree | 5f1280d5c765287dbf9d1ed9e6641cfefb01f14f /sw/source/core/fields/reffld.cxx | |
| parent | 2a8fe7ad8f53abe40f190c735f88887dd192f453 (diff) | |
sw_redlinehide_3: SwGetRefField::GetExpandedTextOfReferencedTextNode
Change-Id: I98530004f2d75b10fc4cd3241b06d513ed57675b
Diffstat (limited to 'sw/source/core/fields/reffld.cxx')
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 171434590ad3..b117e21730a0 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -401,11 +401,12 @@ const SwTextNode* SwGetRefField::GetReferencedTextNode() const } // #i85090# -OUString SwGetRefField::GetExpandedTextOfReferencedTextNode() const +OUString SwGetRefField::GetExpandedTextOfReferencedTextNode( + SwRootFrame const& rLayout) const { const SwTextNode* pReferencedTextNode( GetReferencedTextNode() ); return pReferencedTextNode - ? pReferencedTextNode->GetExpandText(nullptr/*TODO*/, 0, -1, true, true, false) + ? sw::GetExpandTextMerged(&rLayout, *pReferencedTextNode, true, false, ExpandMode(0)) : OUString(); } |