[Libreoffice-commits] .: sc/source xmloff/inc xmloff/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Tue May 22 04:34:08 PDT 2012
sc/source/filter/xml/xmlexprt.cxx | 2 +-
xmloff/inc/xmloff/xmlaustp.hxx | 2 +-
xmloff/source/style/impastp4.cxx | 1 -
xmloff/source/style/impastpl.hxx | 2 +-
xmloff/source/style/xmlaustp.cxx | 3 +--
5 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit c452fcfb32d9265d8f2ab1cafe8d5765106ca718
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue May 22 13:28:21 2012 +0200
-Werror=unused-parameter
Change-Id: I06dc09d57821ac729182764882558fa079b5ed37
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 55c3cd2..d2f2b89 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 828ff54..595ca45 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 32cd3f8..389c80b 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 7542046..03b54ee 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 5e428ab..469d41a 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,
More information about the Libreoffice-commits
mailing list