summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-12-17 22:37:32 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-18 16:13:32 +0100
commit086539add06c6ee29a53f63705a0f2382d4878ef (patch)
tree666b263e6942556ab15515d3159dd4627c438f0d
parent050fbb57be9f7d503267cad58315a7bc19b5de7a (diff)
Revert "HACK: ODF import: always hide redlines"
-rw-r--r--sw/source/filter/xml/swxml.cxx6
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 60c8445d59b0..138dc19981c8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,11 +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
-#if 0
!*o3tl::doAccess<bool>(xInfoSet->getPropertyValue(sShowChanges))))
-#else
- true))
-#endif
{
try
{
@@ -893,10 +889,8 @@ 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;