diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-05-15 18:36:08 +0300 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-10 15:20:18 +0200 |
commit | 3124b2c5746a81225dc122d53c5f06f8a9967129 (patch) | |
tree | a07add722f747a2f8de11e5b504e18a71b139fdd | |
parent | c69e90598457b159fdb9f6d9cced5e28ef53bf50 (diff) |
tdf#120394: docx import: support for w:styleLink
Previous implementation for w:numStyleLink was referring
just ordinal styles, but there can be another abstract
list marked with w:styleLink which should be used in
given context.
Change-Id: Ic5d4fe8bfd41b19e2f65d74defb6961e38ec9a9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94332
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95892
-rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 38 | ||||
-rw-r--r-- | writerfilter/source/dmapper/NumberingManager.hxx | 6 |
2 files changed, 28 insertions, 16 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 764fe2a387a7..322c99200230 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -1036,6 +1036,12 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) m_pCurrentDefinition->SetNumStyleLink(sStyleName); } break; + case NS_ooxml::LN_CT_AbstractNum_styleLink: + { + OUString sStyleName = rSprm.getValue()->getString(); + m_pCurrentDefinition->SetStyleLink(sStyleName); + } + break; case NS_ooxml::LN_EG_RPrBase_rFonts: //contains font properties case NS_ooxml::LN_EG_RPrBase_color: case NS_ooxml::LN_EG_RPrBase_u: @@ -1074,21 +1080,17 @@ void ListsManager::lcl_entry(writerfilter::Reference<Properties>::Pointer_t ref AbstractListDef::Pointer ListsManager::GetAbstractList( sal_Int32 nId ) { - AbstractListDef::Pointer pAbstractList; - - int nLen = m_aAbstractLists.size( ); - int i = 0; - while ( !pAbstractList.get( ) && i < nLen ) + for (const auto& listDef : m_aAbstractLists) { - if ( m_aAbstractLists[i]->GetId( ) == nId ) + if (listDef->GetId( ) == nId) { - if ( m_aAbstractLists[i]->GetNumStyleLink().getLength() > 0 ) + if (listDef->GetNumStyleLink().getLength() > 0) { // If the abstract num has a style linked, check the linked style's number id. StyleSheetTablePtr pStylesTable = m_rDMapper.GetStyleSheetTable( ); const StyleSheetEntryPtr pStyleSheetEntry = - pStylesTable->FindStyleSheetByISTD( m_aAbstractLists[i]->GetNumStyleLink() ); + pStylesTable->FindStyleSheetByISTD(listDef->GetNumStyleLink() ); const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_cast<const StyleSheetPropertyMap*>(pStyleSheetEntry ? pStyleSheetEntry->pProperties.get() : nullptr); @@ -1098,20 +1100,24 @@ AbstractListDef::Pointer ListsManager::GetAbstractList( sal_Int32 nId ) ListDef::Pointer pList = GetList( pStyleSheetProperties->GetNumId() ); if ( pList!=nullptr ) return pList->GetAbstractDefinition(); - else - pAbstractList = m_aAbstractLists[i]; } + // In stylesheet we did not found anything useful. Try to find base abstractnum having this stylelink + for (const auto & baseListDef : m_aAbstractLists) + { + if (baseListDef->GetStyleLink() == listDef->GetNumStyleLink()) + { + return baseListDef; + } + } } - else - { - pAbstractList = m_aAbstractLists[i]; - } + + // Standalone abstract list + return listDef; } - i++; } - return pAbstractList; + return nullptr; } ListDef::Pointer ListsManager::GetList( sal_Int32 nId ) diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 3949c3bf7dcd..110262f5cfa2 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -130,6 +130,9 @@ private: // The style name linked to. OUString m_sNumStyleLink; + // This absract numbering is a base definition for this style + OUString m_sStyleLink; + /// list id to use for all derived numbering definitions boost::optional<OUString> m_oListId; @@ -157,6 +160,9 @@ public: void SetNumStyleLink(const OUString& sValue) { m_sNumStyleLink = sValue; }; const OUString& GetNumStyleLink() const { return m_sNumStyleLink; }; + void SetStyleLink(const OUString& sValue) { m_sStyleLink = sValue; }; + const OUString& GetStyleLink() const { return m_sStyleLink; }; + const OUString& MapListId(OUString const& rId); }; |