[Libreoffice-commits] .: sc/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Jun 18 04:45:03 PDT 2012
sc/source/filter/xml/xmlexprt.cxx | 13 +++++--------
sc/source/filter/xml/xmlexprt.hxx | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit b0d2e68244c6745dc3fe145579b05f30e40793d5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 18 13:44:40 2012 +0200
-Werror=unused-parameter
Change-Id: Icb7fe93b6f21c8d34dcd263dbac07b32a5cb0432
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 56d3538..9b105d6 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -636,7 +636,7 @@ public:
}
-void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount)
+void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount)
{
if (!GetModel().is())
return;
@@ -812,7 +812,7 @@ void ScXMLExport::_ExportMeta()
sal_Int32 nTableCount(0);
sal_Int32 nShapesCount(0);
GetAutoStylePool()->ClearEntries();
- CollectSharedData(nTableCount, nShapesCount, nCellCount);
+ CollectSharedData(nTableCount, nShapesCount);
uno::Sequence<beans::NamedValue> stats(3);
stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableCount")),
@@ -1673,8 +1673,7 @@ void ScXMLExport::_ExportContent()
{
sal_Int32 nTableCount(0);
sal_Int32 nShapesCount(0);
- sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
- CollectSharedData(nTableCount, nShapesCount, nCellCount);
+ CollectSharedData(nTableCount, nShapesCount);
OSL_FAIL("no shared data setted");
}
ScXMLExportDatabaseRanges aExportDatabaseRanges(*this);
@@ -1763,8 +1762,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
{
sal_Int32 nTableCount(0);
sal_Int32 nShapesCount(0);
- sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
- CollectSharedData(nTableCount, nShapesCount, nCellCount);
+ CollectSharedData(nTableCount, nShapesCount);
}
ScXMLStyleExport aStylesExp(*this, rtl::OUString(), GetAutoStylePool().get());
if (GetModel().is())
@@ -2336,8 +2334,7 @@ void ScXMLExport::_ExportAutoStyles()
{
sal_Int32 nTableCount(0);
sal_Int32 nShapesCount(0);
- sal_Int32 nCellCount(pDoc ? pDoc->GetCellCount() : 0);
- CollectSharedData(nTableCount, nShapesCount, nCellCount);
+ CollectSharedData(nTableCount, nShapesCount);
}
sal_Int32 nTableCount(xIndex->getCount());
pCellStyles->AddNewTable(nTableCount - 1);
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 032bb18..af6c811 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -134,7 +134,7 @@ class ScXMLExport : public SvXMLExport
sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc);
- void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount);
+ void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount);
void CollectShapesAutoStyles(const sal_Int32 nTableCount);
void WriteTablesView(const com::sun::star::uno::Any& aTableView);
void WriteView(const com::sun::star::uno::Any& aView);
More information about the Libreoffice-commits
mailing list