summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-12-20 15:00:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-12-23 22:27:21 +0100
commit5e9b84df8972a936690508402ecef6ca42a655eb (patch)
tree8d239df4a4cbe16178c6a75b9e99d23b2c6ca585 /sw/source
parentdb5a8b6668be02325098d96d9e5351eaa06be24f (diff)
sw_redlinehide: SwTextNode::GetExpandText() HideDeletions
Always enable this when the layout hides redlines (not sure why it wasn't done like this before...). Change-Id: Icddf8a23352565c0091a79eb64628054d0028928 Reviewed-on: https://gerrit.libreoffice.org/65526 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 6a6a68738114a796e36047f41797da0cacf6dc54) Reviewed-on: https://gerrit.libreoffice.org/65561 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 88c0c2df3c64..e8e26348ec85 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3398,6 +3398,10 @@ OUString SwTextNode::GetExpandText(SwRootFrame const*const pLayout,
{
ExpandMode eMode = ExpandMode::ExpandFields | eAdditionalMode;
+ if (pLayout && pLayout->IsHideRedlines())
+ {
+ eMode |= ExpandMode::HideDeletions;
+ }
ModelToViewHelper aConversionMap(*this, pLayout, eMode);
const OUString aExpandText = aConversionMap.getViewText();