diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-23 22:09:23 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-15 10:14:31 +0200 |
| commit | 5fe46c18dc98d893b8e2ff479e59a8ec37402c78 (patch) | |
| tree | 77501fe43f0c572d1791bbf5f2fc51770346246b /writerfilter | |
| parent | 8be163e686cf548e5ace5de010487619ccfac1ef (diff) | |
tdf#116841 RTF import: fix default value of left para margin from numbering
The left mragin value is usually spelled out in RTF and DOCX, but this
bugdoc used the WW6 RTF markup to declare the numbering rules and there
the margin value was missing.
This also allows me to partially revert the changes to testTdf106953
from commit 56a695fddb915bcba13b088b5b2b4e0841d4acbc (tdf#112211 RTF
import: fix unwanted direct formatting for left indents, 2017-09-26).
(cherry picked from commit 810364653b8e5ef8578ae7c9fc2e3b9196e7cdc4)
Conflicts:
sw/qa/extras/rtfexport/rtfexport3.cxx
Reviewed-on: https://gerrit.libreoffice.org/53433
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 03b987372b680a8ecfac61d976c69f7443acba11)
Change-Id: I9902f2f9ada4080cb4d873624ae9824342c6ee77
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index b51a743f9d77..d9dfeb3d8efe 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -306,6 +306,11 @@ uno::Sequence<beans::PropertyValue> ListLevel::GetLevelProperties(bool bDefaults else if (rReadId == PROP_FIRST_LINE_INDENT && bDefaults) // Writer default is -360 twips, Word default seems to be 0. aNumberingProperties.emplace_back("FirstLineIndent", 0, uno::makeAny(static_cast<sal_Int32>(0)), beans::PropertyState_DIRECT_VALUE); + else if (rReadId == PROP_INDENT_AT && bDefaults) + // Writer default is 720 twips, Word default seems to be 0. + aNumberingProperties.emplace_back("IndentAt", 0, + uno::makeAny(static_cast<sal_Int32>(0)), + beans::PropertyState_DIRECT_VALUE); } boost::optional<PropertyMap::Property> aPropFont = getProperty(PROP_CHAR_FONT_NAME); |