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-01 08:43:01 +0100 |
| commit | a67261d125ba3ca3c456936c54f9bed17ed7510e (patch) | |
| tree | 0fe743f2f2510873392661ba25190698709fe6df /sw/source/filter/xml/swxml.cxx | |
| parent | 799cd4c200139b15f104e6f3250000b68d23619a (diff) | |
sw_redlinehide: make layout based Show/Hide mode the default
remove ExperimentalMode checks
Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc
Diffstat (limited to 'sw/source/filter/xml/swxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index f36ffb47a147..138dc19981c8 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -856,8 +856,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode || m_aOption.IsFormatsOnly() || // sw_redlinehide: disable layout cache for now - (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) && - !*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges))))) + !*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges)))) { try { @@ -905,14 +904,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con // tdf#83260 ensure that the first call of CompressRedlines after loading // the document is a no-op by calling it now rDoc.getIDocumentRedlineAccess().CompressRedlines(); - if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) - { // can't set it on the layout or view shell because it doesn't exist yet - rDoc.GetDocumentRedlineManager().SetHideRedlines(!(nRedlineFlags & RedlineFlags::ShowDelete)); - } - else - { - rDoc.getIDocumentRedlineAccess().SetRedlineFlags(nRedlineFlags); - } + // can't set it on the layout or view shell because it doesn't exist yet + rDoc.GetDocumentRedlineManager().SetHideRedlines(!(nRedlineFlags & RedlineFlags::ShowDelete)); lcl_EnsureValidPam( rPaM ); // move Pam into valid content |