summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-11-30 18:00:19 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-18 16:13:32 +0100
commit050fbb57be9f7d503267cad58315a7bc19b5de7a (patch)
treeb9e8d08d3e37a29291f080dfc1869dd14aaba1cd
parent273c901842386d3a26b4a215020a0da300725055 (diff)
HACK: ODF import: always hide redlines
Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df
-rw-r--r--sw/source/filter/xml/swxml.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 138dc19981c8..60c8445d59b0 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,7 +856,11 @@ 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
+#if 0
!*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges))))
+#else
+ true))
+#endif
{
try
{
@@ -889,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
// restore redline mode from import info property set
RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
if ( *o3tl::doAccess<bool>(aAny) )
nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
aAny = xInfoSet->getPropertyValue( sRecordChanges );
if ( *o3tl::doAccess<bool>(aAny) || (aKey.getLength() > 0) )
nRedlineFlags |= RedlineFlags::On;