diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-11-08 20:27:51 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-11-08 22:58:21 +0100 |
commit | f7c14f57300255bb279ccd95d6b87347b1e0aec2 (patch) | |
tree | 9ce75309a8d71925c6f289f37f14870b1fb25482 /xmloff/source | |
parent | 1535f39388223de53e4b923c6f7bb71ee32c1858 (diff) |
xmloff: remove unused parameter of SvxXMLListStyleContext::FillUnoNumRule()
Change-Id: I359f37ce778d55e6868bd1c78c0ff0d452f36088
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/draw/XMLShapePropertySetContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/XMLShapeStyleContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 20 |
3 files changed, 9 insertions, 15 deletions
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index e4599f310e3b..f4f988024dfb 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -55,7 +55,7 @@ void XMLShapePropertySetContext::EndElement() SvxXMLListStyleContext* pBulletStyle = static_cast<SvxXMLListStyleContext*>(&mxBulletStyle); xNumRule = SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() ); if( xNumRule.is() ) - pBulletStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ ); + pBulletStyle->FillUnoNumRule(xNumRule); } Any aAny; diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index f3d1d1980725..720ac4cf4883 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -175,7 +175,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet if( pListStyle ) { uno::Reference< container::XIndexReplace > xNumRule( SvxXMLListStyleContext::CreateNumRule( GetImport().GetModel() ) ); - pListStyle->FillUnoNumRule(xNumRule, NULL /* const SvI18NMap * ??? */ ); + pListStyle->FillUnoNumRule(xNumRule); property->maValue <<= xNumRule; } else diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 16a7c790131e..c88c9097257c 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -44,7 +44,6 @@ #include <xmloff/XMLBase64ImportContext.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/i18nmap.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" #include <xmloff/XMLFontStylesContext.hxx> @@ -223,8 +222,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; sal_Int32 GetLevel() const { return nLevel; } - Sequence<beans::PropertyValue> GetProperties( - const SvI18NMap *pI18NMap=0 ); + Sequence<beans::PropertyValue> GetProperties(); inline void SetPosAndSpaceMode( sal_Int16 eValue ) { @@ -402,8 +400,7 @@ SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext( return pContext; } -Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( - const SvI18NMap *pI18NMap ) +Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties() { sal_Int16 eType = NumberingType::NUMBER_NONE; @@ -496,8 +493,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( OUString sDisplayTextStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TEXT_TEXT, sTextStyleName ); OUString sStyleName = sDisplayTextStyleName; - if( !sStyleName.isEmpty() && pI18NMap ) - sStyleName = pI18NMap->Get( SFX_STYLE_FAMILY_CHAR, sStyleName ); pProps[nPos].Name = "CharStyleName"; pProps[nPos++].Value <<= sDisplayTextStyleName; @@ -1087,8 +1082,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext( } void SvxXMLListStyleContext::FillUnoNumRule( - const Reference< container::XIndexReplace > & rNumRule, - const SvI18NMap *pI18NMap ) const + const Reference<container::XIndexReplace> & rNumRule) const { try { @@ -1104,7 +1098,7 @@ void SvxXMLListStyleContext::FillUnoNumRule( if( nLevel >= 0 && nLevel < l_nLevels ) { Sequence<beans::PropertyValue> aProps = - pLevelStyle->GetProperties( pI18NMap ); + pLevelStyle->GetProperties(); Any aAny; aAny <<= aProps; rNumRule->replaceByIndex( nLevel, aAny ); @@ -1142,7 +1136,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) // We don't set xNumberingRules here, to avoid using them // as numbering rules. if( rNumRule.is() ) - FillUnoNumRule( rNumRule, 0 ); + FillUnoNumRule(rNumRule); } } else @@ -1212,7 +1206,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) nLevels = xNumRules->getCount(); if( bOverwrite || bNew ) { - FillUnoNumRule( xNumRules, 0 ); + FillUnoNumRule(xNumRules); aAny <<= xNumRules; xPropSet->setPropertyValue( sNumberingRules, aAny ); } @@ -1241,7 +1235,7 @@ void SvxXMLListStyleContext::CreateAndInsertAuto() const GetImport().GetModel() ); ((SvxXMLListStyleContext *)this)->nLevels = xNumRules->getCount(); - FillUnoNumRule( xNumRules, 0 ); + FillUnoNumRule(xNumRules); } Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule( |