[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/txtnode/ndtxt.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 5e9b84df8972a936690508402ecef6ca42a655eb
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Dec 20 15:00:41 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Dec 23 22:27:21 2018 +0100

    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 at cib.de>
    (cherry picked from commit 6a6a68738114a796e36047f41797da0cacf6dc54)
    Reviewed-on: https://gerrit.libreoffice.org/65561
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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();