diff options
| author | László Németh <nemeth@numbertext.org> | 2020-10-09 13:05:55 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-10-09 17:37:43 +0200 |
| commit | 9b4bda5361f7ed06b07ab8dd59aeb77278c73195 (patch) | |
| tree | 7fceb03e8e971618366a29a7a8b5f6623c84e2bf /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | 6d680b67632b14ce14e761558c07652b7e6782ea (diff) | |
tdf#136955 DOCX import: fix shape paragraph margins
based on bad style inheritance, in the case of not
first paragraphs of shapes.
Regression from commit dc0300eac3b755bc207cd1fe87217f4ebaeb9f58
(tdf#118521 DOCX import: fix paragraph margin from paragraph style),
revealing the problematic m_sCurrentParaStyleName, see also
commit 8920d865ee148518bf71f71ce1866b24cc17c07e for more information.
Follow-up of commit c04ee66c7cfeb725d637b0f9ec3e3b1f8776bfe9
(tdf#134784 DOCX import: fix shape paragraph margins).
Change-Id: I4feab19fc58653d829d7a1ae8da3e3ce4fb3e2c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104116
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f16d5fa794d5..f6ede7c143b4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -785,7 +785,7 @@ OUString DomainMapper_Impl::GetCurrentParaStyleName() // use saved currParaStyleName as a fallback, in case no particular para style name applied. // tdf#134784 except in the case of first paragraph of shapes to avoid bad fallback. // TODO fix this "highly inaccurate" m_sCurrentParaStyleName - if ( !m_bIsFirstParaInShape ) + if ( !IsInShape() ) sName = m_sCurrentParaStyleName; PropertyMapPtr pParaContext = GetTopContextOfType(CONTEXT_PARAGRAPH); |