diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/xml/swxml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index c3d9c50556da..7893321829c6 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -56,6 +56,7 @@ #include <docfunc.hxx> #include <IDocumentSettingAccess.hxx> #include <IDocumentDrawModelAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <IDocumentRedlineAccess.hxx> #include <DocumentRedlineManager.hxx> #include <docary.hxx> @@ -954,6 +955,9 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con } } + // tdf#115815 restore annotation ranges stored in temporary bookmarks + rDoc.getIDocumentMarkAccess()->restoreAnnotationMarks(); + if (xStatusIndicator.is()) { xStatusIndicator->end(); diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 71445d932f4e..4ae5964a7d2e 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -45,6 +45,7 @@ #include <doc.hxx> #include <docfunc.hxx> #include <IDocumentRedlineAccess.hxx> +#include <IDocumentMarkAccess.hxx> #include <IDocumentStatistics.hxx> #include <IDocumentLayoutAccess.hxx> #include <rootfrm.hxx> @@ -409,6 +410,9 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS nRedlineFlags |= nOrigRedlineFlags & RedlineFlags::ShowMask; m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); + // tdf#115815 restore annotation ranges collapsed by hide redlines + m_pDoc->getIDocumentMarkAccess()->restoreAnnotationMarks(); + if (xStatusIndicator.is()) { xStatusIndicator->end(); |