diff options
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 2 | ||||
-rw-r--r-- | xmloff/inc/xmloff/xmlaustp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/impastp4.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/style/impastpl.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlaustp.cxx | 3 |
5 files changed, 4 insertions, 6 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 55c3cd2cda4d..d2f2b892ee3b 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -4280,7 +4280,7 @@ sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) { xRowStylesPropertySetMapper = new XMLPropertySetMapper((XMLPropertyMapEntry*)aXMLScFromXLSRowStylesProperties, xScPropHdlFactory); xRowStylesExportPropertySetMapper = new ScXMLRowExportPropertyMapper(xRowStylesPropertySetMapper); - GetAutoStylePool()->SetFamilyPropSetMapper( XML_STYLE_FAMILY_TABLE_ROW, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)), + GetAutoStylePool()->SetFamilyPropSetMapper( XML_STYLE_FAMILY_TABLE_ROW, xRowStylesExportPropertySetMapper ); } } diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx index 828ff54d7d3a..595ca457b5d9 100644 --- a/xmloff/inc/xmloff/xmlaustp.hxx +++ b/xmloff/inc/xmloff/xmlaustp.hxx @@ -89,7 +89,7 @@ public: void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, const UniReference< SvXMLExportPropertyMapper >& rMapper, const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); - void SetFamilyPropSetMapper( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference< SvXMLExportPropertyMapper >& rMapper ); /// Register a name that must not be used as a generated name. diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 32cd3f8723e5..389c80b55e20 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -106,7 +106,6 @@ void SvXMLAutoStylePoolP_Impl::AddFamily( void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper( sal_Int32 nFamily, - const OUString& /* rStrName */, const UniReference < SvXMLExportPropertyMapper > & rMapper ) { diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 75420461e1a6..03b54ee26b07 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -185,7 +185,7 @@ public: void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper, const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); - void SetFamilyPropSetMapper( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + void SetFamilyPropSetMapper( sal_Int32 nFamily, const UniReference < SvXMLExportPropertyMapper > & rMapper ); void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName ); void GetRegisteredNames( diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 5e428abb01ba..469d41a47af5 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -314,10 +314,9 @@ void SvXMLAutoStylePoolP::AddFamily( void SvXMLAutoStylePoolP::SetFamilyPropSetMapper( sal_Int32 nFamily, - const OUString& rStrName, const UniReference < SvXMLExportPropertyMapper > & rMapper ) { - pImpl->SetFamilyPropSetMapper( nFamily, rStrName, rMapper ); + pImpl->SetFamilyPropSetMapper( nFamily, rMapper ); } void SvXMLAutoStylePoolP::RegisterName( sal_Int32 nFamily, |