summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-12-17 19:39:22 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-18 12:49:51 +0100
commita9cf7b30b88225c64bc065a9b0a3203316333ddc (patch)
tree3bf4eca6285e5fb309b9a69cb6a06ea80d7eba3f
parente3ca24ec88978519599f0143256f8eb0cce2766a (diff)
sw_redlinehide_4b: export flag to flat-ODF
Change-Id: Ief227f3f5b03ec186178f4d68c3a415969d65507
-rw-r--r--sw/source/filter/xml/xmlexp.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 4887e14075fb..0fd2296e97e8 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/xforms/XFormsSupplier.hpp>
#include <o3tl/any.hxx>
+#include <officecfg/Office/Common.hxx>
#include <sax/tools/converter.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
@@ -46,6 +47,7 @@
#include <swmodule.hxx>
#include <docsh.hxx>
#include <viewsh.hxx>
+#include <rootfrm.hxx>
#include <docstat.hxx>
#include <swerror.h>
#include <unotext.hxx>
@@ -276,7 +278,15 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
}
}
RedlineFlags nRedlineFlags = RedlineFlags::NONE;
- m_bSavedShowChanges = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() );
+ if (officecfg::Office::Common::Misc::ExperimentalMode::get(getComponentContext()))
+ {
+ SwRootFrame const*const pLayout(m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
+ m_bSavedShowChanges = pLayout == nullptr || !pLayout->IsHideRedlines();
+ }
+ else
+ {
+ m_bSavedShowChanges = IDocumentRedlineAccess::IsShowChanges( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() );
+ }
if( bSaveRedline )
{
// now save and switch redline mode