diff options
author | László Németh <nemeth@numbertext.org> | 2019-05-08 19:00:18 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-05-15 08:18:17 +0200 |
commit | 8acc15b5113c798ecdbeed91456a92e7b0c1334e (patch) | |
tree | ec85163bd491d187e2c8182359ddf22ed40377f1 /sw/source/core/inc/DocumentRedlineManager.hxx | |
parent | 051f0dca87745bef19adee20393b3b45991f60a2 (diff) |
tdf#118699 DOCX import: don't add numbering
after a tracked deletion of a numbered list to the
next not numbered paragraph.
Note: we remove the numbering of the first item of
the deleted numbered list to import the actual text
content correctly, giving correct numbering after
accepting the changes or in the Hide Changes mode.
Change-Id: I98767937bc783cb5e8ecb05558a5ad05a57ff281
Reviewed-on: https://gerrit.libreoffice.org/72001
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/core/inc/DocumentRedlineManager.hxx')
-rw-r--r-- | sw/source/core/inc/DocumentRedlineManager.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx index f962d4fb6a70..56ff92942de9 100644 --- a/sw/source/core/inc/DocumentRedlineManager.hxx +++ b/sw/source/core/inc/DocumentRedlineManager.hxx @@ -127,6 +127,7 @@ public: bool IsHideRedlines() const { return m_bHideRedlines; } void SetHideRedlines(bool const bHideRedlines) { m_bHideRedlines = bHideRedlines; } + void FinalizeImport(); virtual ~DocumentRedlineManager() override; private: @@ -148,6 +149,8 @@ private: /// this flag is necessary for file import because the ViewShell/layout is /// created "too late" and the ShowRedlineChanges item is not below "Views" bool m_bHideRedlines = false; + /// need post-processing, eg. for OOXML import + bool m_bFinalizeImport = false; }; } |