diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-28 09:06:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-03-30 10:48:04 +0000 |
| commit | 4370a2f96dd117f4e87291e5a8493f3413dc191a (patch) | |
| tree | 8b21d177b0414ec7625ae7cfea9868a3fe84b6c0 /writerfilter | |
| parent | b688a226c5e346e7fb27cdfc22190ed516afc0f4 (diff) | |
tdf#106694 RTF import: fix missing paragraph tab position
The problem here was that while in general paragraph style / direct
formatting deduplication is supposed to happen in the tokenizer,
paragraph tab positions is an exception, and dmapper expects to see the
duplicated tokens.
Fix the problem by introducing a blacklist that contains tokens not to
deduplicate.
(cherry picked from commit fea174753b1c6b0882aebb044bf1a1eef6fa50e0)
Change-Id: I1cca53e99cfdb082df389ff295f3447cc8f9d3b8
Reviewed-on: https://gerrit.libreoffice.org/35833
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index da7bc815c6ca..7afee14a4189 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -153,6 +153,23 @@ static RTFValue::Pointer_t getDefaultSPRM(Id const id) } } +/// Is it problematic to deduplicate this SPRM? +static bool isSPRMDeduplicateBlacklist(Id nId) +{ + switch (nId) + { + case NS_ooxml::LN_CT_TabStop_val: + case NS_ooxml::LN_CT_TabStop_leader: + case NS_ooxml::LN_CT_TabStop_pos: + // See the NS_ooxml::LN_CT_PPrBase_tabs handler in DomainMapper, + // deduplication is explicitly not wanted for these tokens. + return true; + + default: + return false; + } +} + /// Does the clone / deduplication of a single sprm. static void cloneAndDeduplicateSprm(std::pair<Id, RTFValue::Pointer_t>& rSprm, RTFSprms& ret) { @@ -161,7 +178,8 @@ static void cloneAndDeduplicateSprm(std::pair<Id, RTFValue::Pointer_t>& rSprm, R { if (rSprm.second->equals(*pValue)) { - ret.erase(rSprm.first); // duplicate to style + if (!isSPRMDeduplicateBlacklist(rSprm.first)) + ret.erase(rSprm.first); // duplicate to style } else if (!rSprm.second->getSprms().empty() || !rSprm.second->getAttributes().empty()) { |