diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 09:02:11 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-11-07 21:47:44 +0100 |
commit | 54c1066d3f98ac15b51b57645ddca767247e622b (patch) | |
tree | c31a035cc4d2a9021346960be39aff50d93d3f06 /writerfilter | |
parent | 4e5e00dad2593d677be74f96d72477a8531afcdb (diff) |
tdf#113550 RTF import: fix incorrect text indent
Left indent was set to non-zero in the style, but direct formatting set
it back to zero. Teach deduplication to remove the
NS_ooxml::LN_CT_PPrBase_ind SPRM itself in case the last attribute was
removed.
(cherry picked from commit 5f4a3e7bd77c3294ef85eebec17ed2d624dc3a2d)
Change-Id: I01b202f0241b02816b2b392326737b1150caffc2
Reviewed-on: https://gerrit.libreoffice.org/44395
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index f6301243de1a..4f2b4b02194f 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -187,6 +187,9 @@ static bool isSPRMChildrenExpected(Id nId) SAL_FALLTHROUGH; case NS_ooxml::LN_CT_PrBase_shd: // Expected children are NS_ooxml::LN_CT_Shd_*. + SAL_FALLTHROUGH; + case NS_ooxml::LN_CT_PPrBase_ind: + // Expected children are NS_ooxml::LN_CT_Ind_*. return true; default: |