diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-21 09:04:44 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-21 09:08:46 +0200 |
commit | fc7c1a07d0d5e21a4e1533a0e5b0ac256763f973 (patch) | |
tree | b3c97f19a5722c2e274547265e6c97da7584517c /writerfilter | |
parent | Make PyUNO objects hashable (diff) | |
download | core-fc7c1a07d0d5e21a4e1533a0e5b0ac256763f973.tar.gz core-fc7c1a07d0d5e21a4e1533a0e5b0ac256763f973.zip |
tdf#89702 DOCX import: fix too large bullet character
Commit c1f8437dbed0e8b989e41a345ef7e658a6e8a4cd (fdo#83465 RTF import:
handle font of numbering, 2014-09-25), changed the "get the me character
style of the current numbering's current level" member function to be
successfull even in case we're inside a DOCX run, not when we're inside
a DOCX paragraph, but outside runs.
While this is necessary for RTF, the side effect of this was that
unwanted run properties started to affect the above mentioned character
style in case of DOCX.
Fix the problem by enabling the "in paragraph and run" looking for RTF
only.
Change-Id: I610bfce6cec15b918fe547402360f5a894401f7e
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index cfa1b833582d..473e47dd876d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5014,12 +5014,16 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::GetCurrentNumberingCharSt uno::Reference<container::XIndexAccess> xLevels = GetCurrentNumberingRules(&nListLevel); if (!xLevels.is()) { - // Looking up the paragraph context explicitly (and not just taking - // the top context) is necessary for RTF, where formatting of a run - // and of the paragraph mark is not separated. - PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_PARAGRAPH); - if (!pContext) - return xRet; + PropertyMapPtr pContext = m_pTopContext; + if (IsRTFImport()) + { + // Looking up the paragraph context explicitly (and not just taking + // the top context) is necessary for RTF, where formatting of a run + // and of the paragraph mark is not separated. + pContext = GetTopContextOfType(CONTEXT_PARAGRAPH); + if (!pContext) + return xRet; + } // In case numbering rules is not found via a style, try the direct formatting instead. boost::optional<PropertyMap::Property> oProp = pContext->getProperty(PROP_NUMBERING_RULES); |