From 6a6a68738114a796e36047f41797da0cacf6dc54 Mon Sep 17 00:00:00 2001
From: Michael Stahl <Michael.Stahl@cib.de>
Date: Thu, 20 Dec 2018 15:00:41 +0100
Subject: 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>
---
 sw/source/core/txtnode/ndtxt.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sw')

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 7c2f143a080f..3b15a3318180 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3399,6 +3399,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();
-- 
cgit