diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-30 17:54:41 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-18 17:55:30 +0100 |
| commit | 32902f66e7749b2d06d13f50416be5323a0c0ea9 (patch) | |
| tree | 901ab6577d25102c0a855d2a63964dfef67b34c4 /sw/source/filter/xml/wrtxml.cxx | |
| parent | b310378e874bc8fa7005352fcd85fa64eb075f54 (diff) | |
sw_redlinehide: make layout based Show/Hide mode the default
remove ExperimentalMode checks
Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 34e51e8f2ed9..495cd765aaa3 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -165,7 +165,6 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS xInfoSet->setPropertyValue( "TargetStorage", Any( xStg ) ); - uno::Any aAny; if (m_bShowProgress) { // set progress range and start status indicator @@ -188,15 +187,9 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS 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... - SwRootFrame const*const pLayout(m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()); - isShowChanges = pLayout == nullptr || !pLayout->IsHideRedlines(); - } - else - { - isShowChanges = IDocumentRedlineAccess::IsShowChanges(nRedlineFlags); - } + // TODO: ideally this would be stored per-view... + SwRootFrame const*const pLayout(m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()); + isShowChanges = pLayout == nullptr || !pLayout->IsHideRedlines(); xInfoSet->setPropertyValue(sShowChanges, makeAny(isShowChanges)); // ... and hide redlines for export nRedlineFlags &= ~RedlineFlags::ShowMask; @@ -415,19 +408,10 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS xObjectResolver = nullptr; // restore redline mode - aAny = xInfoSet->getPropertyValue( sShowChanges ); nRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); nRedlineFlags &= ~RedlineFlags::ShowMask; nRedlineFlags |= RedlineFlags::ShowInsert; - if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) - { - nRedlineFlags |= nOrigRedlineFlags & RedlineFlags::ShowMask; - } - else - { - if (*o3tl::doAccess<bool>(aAny)) - nRedlineFlags |= RedlineFlags::ShowDelete; - } + nRedlineFlags |= nOrigRedlineFlags & RedlineFlags::ShowMask; m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); if (xStatusIndicator.is()) |