diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-03 11:15:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-03 12:50:53 +0200 |
| commit | df60b2f7685e5a2b732a49cb6f9954d2dfcfce16 (patch) | |
| tree | 05169393353e5ce4226402ecc013b1df529d8b3e /writerfilter | |
| parent | 78016742c77ced30533f03e1802cd5fa939d7333 (diff) | |
StyleSheetTable::ApplyStyleSheets: stop clearing NumberingStyleName manually
This was introduced in commit 9c7ffb6b61f7c94ca5b38d11be1807f1e29ff4bc
([cbosdo03]Applied the patches to upstream, 2009-12-02), as setting the
outline level also set the NumberingStyleName to "Outline" as well,
which is not what we want.
Since then, commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a (Don't load
the default values of the styles in writerfilter, 2012-08-20) already
disabled default styles, so the previous manual clearing is no longer
necessary (testcases already fail if this later commit is reverted).
As a result, just remove this manual clearing, it's no longer necessary
and it is problematic, as it triggers copying the SvxLRSpaceItem from
the parent style with no good reason.
Change-Id: Ie17547a979a6b0feadbd2eed0f06e84fcb17fca6
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 9a419a66b1f8..44828b79b7ea 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -814,15 +814,6 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) uno::makeAny( sal_Int16( pStyleSheetProperties->GetOutlineLevel( ) + 1 ) ), beans::PropertyState_DIRECT_VALUE ); aPropValues[ aPropValues.getLength( ) - 1 ] = aLvlVal; - - if ( pStyleSheetProperties->GetOutlineLevel( ) == 0 ) - { - aPropValues.realloc( aPropValues.getLength( ) + 1 ); - beans::PropertyValue aStyleVal( rPropNameSupplier.GetName( PROP_NUMBERING_STYLE_NAME ), 0, - uno::makeAny( OUString() ), - beans::PropertyState_DIRECT_VALUE ); - aPropValues[ aPropValues.getLength( ) - 1 ] = aStyleVal; - } } uno::Reference< beans::XPropertyState >xState( xStyle, uno::UNO_QUERY_THROW ); |