diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-06-19 09:28:06 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-19 09:30:11 +0200 |
commit | 14d6cf1f8f86027d58fe56feae3139c314fbb058 (patch) | |
tree | d74a6e4ec86f9d44cb6a0d9bb64877accabde24d /writerfilter | |
parent | Add a note about MinGW debugging TODO. (diff) | |
download | core-14d6cf1f8f86027d58fe56feae3139c314fbb058.tar.gz core-14d6cf1f8f86027d58fe56feae3139c314fbb058.zip |
n#758883 dmapper: always set list id during stylesheet import
This way the sprm handlers can be aware that a numbering is provided by
that style.
Change-Id: I5b5f1570a9e50fd8b3372f5ac7a6cd48e9751254
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 9f3d1151ac12..c3b8a10555e5 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1484,15 +1484,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType //convert the ListTable entry to a NumberingRules propery and apply it ListsManager::Pointer pListTable = m_pImpl->GetListTable(); ListDef::Pointer pList = pListTable->GetList( nIntValue ); + if( m_pImpl->IsStyleSheetImport() ) + { + //style sheets cannot have a numbering rule attached + StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() ); + pStyleSheetPropertyMap->SetListId( nIntValue ); + } if( pList.get( ) ) { - if( m_pImpl->IsStyleSheetImport() ) - { - //style sheets cannot have a numbering rule attached - StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() ); - pStyleSheetPropertyMap->SetListId( nIntValue ); - } - else + if( !m_pImpl->IsStyleSheetImport() ) { uno::Any aRules = uno::makeAny( pList->GetNumberingRules( ) ); rContext->Insert( PROP_NUMBERING_RULES, true, aRules ); |