summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-09-17 11:26:01 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-09-19 10:18:33 +0200
commit7e8b4756d95057f069467b34e7849f9354856578 (patch)
tree65e3065a6c5ff6e63dfc4e689b5e43a4ca04d41b
parentede29e57cd14946c8668ca7d2b84dbc3afa90fd5 (diff)
sw_redlinehide_2: disable layout-cache for now
Both reading & writing. Change-Id: I301bc80549e25c21961b8e79db420e81ab40f8f7
-rw-r--r--sw/source/filter/xml/swxml.cxx4
-rw-r--r--sw/source/filter/xml/wrtxml.cxx4
2 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 0dab7e4cedc3..08a086621031 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -852,7 +852,9 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
aFilterArgs, rName, true );
if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
- m_aOption.IsFormatsOnly() ) )
+ m_aOption.IsFormatsOnly() ||
+ // sw_redlinehide: disable layout cache for now
+ (getenv("SW_REDLINEHIDE") && !*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges)))))
{
try
{
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 4f7a8d4dc55c..26a16a31ce29 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -377,7 +377,9 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS
}
if( m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && m_pDoc->getIDocumentStatistics().GetDocStat().nPage > 1 &&
- !(m_bOrganizerMode || m_bBlock || bErr) )
+ !(m_bOrganizerMode || m_bBlock || bErr ||
+ // sw_redlinehide: disable layout cache for now
+ m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->IsHideRedlines()))
{
try
{