diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-17 21:46:13 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-18 12:49:51 +0100 |
| commit | a0930ee52fc9ac1f351dd706cbff9c8e0ecf52be (patch) | |
| tree | cb55f0b50e820a204bdd6e4fd109d8a21330849c | |
| parent | a9cf7b30b88225c64bc065a9b0a3203316333ddc (diff) | |
sw_redlinehide_4b: ODF export: restore previous redline show flags
There's a test for that, testRedlineFlags() in sw_globalfilter
Change-Id: I9c821732910298d74271d95f0bfd0e902af84dbd
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 0d5e53d4c319..34e51e8f2ed9 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -185,7 +185,8 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS // save show redline mode ... const OUString sShowChanges("ShowChanges"); - RedlineFlags nRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + RedlineFlags const nOrigRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + RedlineFlags nRedlineFlags(nOrigRedlineFlags); bool isShowChanges; if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) { // TODO: ideally this would be stored per-view... @@ -420,7 +421,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS nRedlineFlags |= RedlineFlags::ShowInsert; if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) { - nRedlineFlags |= RedlineFlags::ShowDelete; + nRedlineFlags |= nOrigRedlineFlags & RedlineFlags::ShowMask; } else { |