diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-05-09 22:31:48 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-05-11 10:40:36 +0200 |
| commit | 628cde6409eb471024a6aca5a8262b00f448c8cf (patch) | |
| tree | 00c3a20c900e0921e1a75192a12be1ecdb07ef52 /writerfilter | |
| parent | f8211e84a5239de25fe6dc45a4bb6b6f8673a1ee (diff) | |
tdf#95189: docx import: apply list ovverride only once
List overrides should be applied only once on first list with
override appearance in document. Next reference to this list
should not override again and reset list numbering.
Change-Id: I7a24398d5980ca97a74fa8ad09d91ac9adff15ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93894
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 3b68ff3f582b..9ff009f0d4d1 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1717,11 +1717,17 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con if (pList->GetCurrentLevel()) { sal_Int16 nOverrideLevel = pList->GetCurrentLevel()->GetStartOverride(); - if (nOverrideLevel != -1) + if (nOverrideLevel != -1 && m_aListOverrideApplied.find(nListId2) == m_aListOverrideApplied.end()) { - // Restart list, it is overridden + // Apply override: we have override instruction for this level + // And this was not done for this list before: we can do this only once on first occurrence + // of list with override + // TODO: Not tested variant with differen levels override in diffent lists. + // Probably m_aListOverrideApplied as a set of overriden listids is not sufficient + // and we need to register level overrides separately. m_xPreviousParagraph->setPropertyValue("ParaIsNumberingRestart", uno::makeAny(true)); m_xPreviousParagraph->setPropertyValue("NumberingStartValue", uno::makeAny(nOverrideLevel)); + m_aListOverrideApplied.insert(nListId2); } } } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 889dff41c855..8f46234a44ba 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <queue> #include <stack> +#include <set> #include <unordered_map> #include <vector> #include <optional> @@ -484,6 +485,8 @@ private: // TableManagers are stacked: one for each stream to avoid any confusion std::stack< tools::SvRef< DomainMapperTableManager > > m_aTableManagers; tools::SvRef<DomainMapperTableHandler> m_pTableHandler; + // List of document lists overrides. They are applied only once on first occurrence in document + std::set<sal_Int32> m_aListOverrideApplied; //each context needs a stack of currently used attributes std::stack<PropertyMapPtr> m_aPropertyStacks[NUMBER_OF_CONTEXTS]; |