diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-07-02 16:26:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-02 18:40:27 +0200 |
| commit | 7fa96a3e4bdd384ad411e0bdc4e7c3f2ab920279 (patch) | |
| tree | b6b288df0995b3e1a7fece67f29cbf7f3b9c66ec /sw/source/filter/ww8/docxexport.hxx | |
| parent | c28d92d157f7ee7edb4a151ec92f5284b4f3d45e (diff) | |
sw comments on frames: fix DOCX handling
We used to ignore annotation marks which just cover the comment anchor
since commit fff019debf14a0bf8cd358591a686191347f1542 (MSWordExportBase:
ignore empty annotation marks, 2014-09-17), but this means comments on
images are lost.
Pass around SwWW8AttrIter, so we can decide if we have a relevant
at-char anchored frame in MSWordExportBase::GetAnnotationMarks(),
without iterating over all frames in the document, which would be slow
for large documents.
Regarding the import side, the only problem was that the empty comment
range resulted in a loss of annotation marks; fix that by using a marker
while inserting.
Change-Id: I385677d74423bc05824dac4a12d1a991bb3983c4
Reviewed-on: https://gerrit.libreoffice.org/74996
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source/filter/ww8/docxexport.hxx')
| -rw-r--r-- | sw/source/filter/ww8/docxexport.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 0424f2619e75..fb04593aea9c 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -147,7 +147,7 @@ public: virtual void AppendBookmark( const OUString& rName ) override; - virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nCurrentPos, sal_Int32 nLen ) override; + virtual void AppendAnnotationMarks( const SwWW8AttrIter& rAttrs, sal_Int32 nCurrentPos, sal_Int32 nLen ) override; virtual void ExportGrfBullet(const SwTextNode&) override; |