diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-17 12:01:46 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:18:33 +0200 |
| commit | ae3150b1e1863e854224c2e41c7e50991f945dad (patch) | |
| tree | 6bb9f6d6a5e48435c5051ccfc14bb08a3d6ef17a /sw/source/filter/xml/swxml.cxx | |
| parent | 7e8b4756d95057f069467b34e7849f9354856578 (diff) | |
sw_redlinehide_2: replace SW_REDLINEHIDE with ExperimentalMode config
So we can get more testing & many bug reports.
Change-Id: I34fe456a58670baecf4fdf1a87da77aceab43891
Diffstat (limited to 'sw/source/filter/xml/swxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 08a086621031..cc4fe8616983 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <com/sun/star/xml/sax/XFastParser.hpp> +#include <officecfg/Office/Common.hxx> #include <o3tl/any.hxx> #include <vcl/errinf.hxx> #include <sfx2/docfile.hxx> @@ -854,7 +855,8 @@ 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 - (getenv("SW_REDLINEHIDE") && !*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges))))) + (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) && + !*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges))))) { try { @@ -902,7 +904,7 @@ 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 (getenv("SW_REDLINEHIDE")) + 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)); } |