diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-30 18:00:19 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-07 15:36:23 +0100 |
| commit | 6ca68563244535336a9578186ca6f4d528cdaa1a (patch) | |
| tree | 6bd9ce42b87e38146cb4625a3db57dfbf74b8dd8 | |
| parent | a67261d125ba3ca3c456936c54f9bed17ed7510e (diff) | |
HACK: ODF import: always hide redlines
private/mst/sw_redlinehide_4a
Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 6 |
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; |