diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-28 14:20:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-28 16:47:17 +0100 |
| commit | 521586b328305c4466603438a9931993b92873c6 (patch) | |
| tree | 9bfa4d43b9c7fc5b6b5d8803a00104125dd41938 /writerfilter | |
| parent | f2e706d87399911e300c0101c876e44f2819c505 (diff) | |
Related: fdo#59638 DOCX import of w:lvlOverride
Change-Id: I23fca674e2436b09eeea3337b4d3eeb7a33ccf09
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 38b1f07a1c9d..456cfaae281d 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -495,7 +495,7 @@ uno::Sequence< uno::Sequence< beans::PropertyValue > > ListDef::GetPropertyValue for ( sal_Int32 i = 0; i < nThisCount; i++ ) { uno::Sequence< beans::PropertyValue > level = aThis[i]; - if ( level.getLength( ) == 0 ) + if ( level.hasElements() ) { // If the element contains something, merge it lcl_mergeProperties( level, aAbstract[i] ); @@ -955,6 +955,13 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) pLevel->SetParaStyle( pStyle ); } break; + case NS_ooxml::LN_CT_Num_lvlOverride: + { + writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); + if (pProperties.get()) + pProperties->resolve(*this); + } + 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: |