diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-11-26 15:56:30 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-11-27 11:47:03 +0100 |
| commit | 4115b4c461fc6f4710e24a2e2b24d99e6bbca565 (patch) | |
| tree | a7aa5334700461fa80778a780db2dd232e53c2ad /sw/source/filter/inc | |
| parent | a07f537b2b0e80021612451083338bd0e12da723 (diff) | |
sw: WW8 import: fix again asserts on fdo45983-1.doc export to ODT
The problem is that we now insert 2 dummy characters at the start of a
fieldmark instead of 1, so the checks in RedlineStack::MoveAttrs()
were off by 1 and we get the same invalid redline containing the start
but not the end of a fieldmark.
(regression from 7f2e61f884949ab27bcb7e1a02ece9a5cb4354b9)
Change-Id: I9752ca4c3a281539e37ddac4fe811e2f9d7374a6
Reviewed-on: https://gerrit.libreoffice.org/83783
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 10d72337640677e2d49b522a734728646c9b8e96)
Reviewed-on: https://gerrit.libreoffice.org/83812
Diffstat (limited to 'sw/source/filter/inc')
| -rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index b5fbfdb2e737..f05283e46c51 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -299,7 +299,8 @@ namespace sw public: explicit RedlineStack(SwDoc &rDoc) : mrDoc(rDoc) {} - void MoveAttrs(const SwPosition& rPos); + enum class MoveAttrsMode { Default, FieldmarkInserted }; + void MoveAttrs(const SwPosition& rPos, MoveAttrsMode eMode = MoveAttrsMode::Default); void open(const SwPosition& rPos, const SfxPoolItem& rAttr); bool close(const SwPosition& rPos, RedlineType eType); void close(const SwPosition& rPos, RedlineType eType, |