diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-08 17:43:16 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-15 15:10:07 +0100 |
| commit | f8cab2f422895ebad8be9b8b3bb76600e6eaf1d0 (patch) | |
| tree | 249822021bef752aaef710e1fa7574234221cd20 /sw/source/core/txtnode/ndtxt.cxx | |
| parent | ad292b0ab5ec6f21d5ec710e6ef503b25b578169 (diff) | |
sw_redlinehide_3: add layout parameter to SwField::ExpandField()
If the bCached=true, it shouldn't matter what the layout is, because the
field won't be expanded properly anyway.
Except for the SwInputField which disables caching, but that one often
has a different code path anyway.
For most fields it doesn't matter anyway, e.g. database fields.
Change-Id: I628195f43c5d26feba94af0a832386791c072ba1
Diffstat (limited to 'sw/source/core/txtnode/ndtxt.cxx')
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index e8718a213237..d4e30e17c05c 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3499,7 +3499,7 @@ bool SwTextNode::CopyExpandText(SwTextNode& rDestNd, const SwIndex* pDestIdx, case RES_TXTATR_ANNOTATION: { OUString const aExpand( - static_txtattr_cast<SwTextField const*>(pHt)->GetFormatField().GetField()->ExpandField(true)); + static_txtattr_cast<SwTextField const*>(pHt)->GetFormatField().GetField()->ExpandField(true, pLayout)); if (!aExpand.isEmpty()) { ++aDestIdx; // insert behind |