60c17f3e76
* bnc-939996.diff - Fix bnc#889755 - LO-L3: PPTX: chart axis number format incorrect * bnc-889755.diff - bnc#679938 - LO-L3: saving to doc file the chapter name in the header does not change with chapters * bnc-679938.diff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=338
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 8e911fe7e14d20ea5abe2991ed93ced62385462d Mon Sep 17 00:00:00 2001
|
|
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Date: Mon, 28 Sep 2015 14:03:25 +0200
|
|
Subject: [PATCH] bnc#939996 tdf#93919 DOCX import: fix left-from-style and
|
|
first-from-direct
|
|
|
|
With this, <w:ind w:hanging="..."/> as direct paragraph formatting and
|
|
<w:ind w:left="..." w:hanging="..."/> as a numbering level formatting is
|
|
properly merged, i.e. w:left is not lost, defaulting to 0.
|
|
|
|
(cherry picked from commit 56341e5d496f576dc45fe8e6c44831d780fecb73)
|
|
|
|
Conflicts:
|
|
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
|
|
|
|
Change-Id: If5534fbd9ee6d41139b0ed3a3df9d0cc5aad3239
|
|
Reviewed-on: https://gerrit.libreoffice.org/18906
|
|
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
---
|
|
sw/qa/extras/ooxmlimport/data/tdf93919.docx | Bin 0 -> 15336 bytes
|
|
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 ++++++
|
|
writerfilter/source/dmapper/DomainMapper.cxx | 5 +++++
|
|
3 files changed, 11 insertions(+)
|
|
create mode 100644 sw/qa/extras/ooxmlimport/data/tdf93919.docx
|
|
|
|
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
|
|
index 8f13b5b..f7ef226 100644
|
|
--- a/writerfilter/source/dmapper/DomainMapper.cxx
|
|
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
|
|
@@ -482,6 +482,11 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
|
|
sal_Int32 nValue = ConversionHelper::convertTwipToMM100( nIntValue );
|
|
m_pImpl->GetTopContext()->Insert(
|
|
PROP_PARA_FIRST_LINE_INDENT, uno::makeAny( - nValue ));
|
|
+
|
|
+ // See above, need to inherit left margin from list style when first is set.
|
|
+ sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt");
|
|
+ if (nParaLeftMargin != 0)
|
|
+ m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false);
|
|
}
|
|
break;
|
|
case NS_ooxml::LN_CT_Ind_firstLine:
|
|
--
|
|
2.1.4
|
|
|