From 6ca68563244535336a9578186ca6f4d528cdaa1a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Nov 2018 18:00:19 +0100 Subject: HACK: ODF import: always hide redlines Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df --- sw/source/filter/xml/swxml.cxx | 6 ++++++ 1 file changed, 6 insertions(+) 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(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(aAny) ) nRedlineFlags |= RedlineFlags::ShowDelete; +#endif aAny = xInfoSet->getPropertyValue( sRecordChanges ); if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) ) nRedlineFlags |= RedlineFlags::On; -- cgit v1.2.3