summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-26 14:15:47 +0200
committerNoel Grandin <noel@peralex.com>2015-11-30 10:34:38 +0200
commitd2df03574023b379ac09b1f71cae9e3ba3ac53e2 (patch)
treeca17f45377b7b506375b510f1d1733495ea9b170 /sc
parentffddd4d122433329b454f676f21a2b1ce590a1a7 (diff)
loplugin:unusedfields
Change-Id: Ife94d488ead512abc6d137a0df74298bac67185d
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/formulabuffer.hxx3
-rw-r--r--sc/source/filter/inc/worksheethelper.hxx1
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx8
-rw-r--r--sc/source/filter/oox/sheetdatacontext.cxx2
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx4
5 files changed, 7 insertions, 11 deletions
diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx
index a491b8098457..43aa58ce65c3 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -38,13 +38,11 @@ public:
struct SharedFormulaEntry
{
css::table::CellAddress maAddress;
- css::table::CellRangeAddress maRange;
OUString maTokenStr;
sal_Int32 mnSharedId;
SharedFormulaEntry(
const css::table::CellAddress& rAddress,
- const css::table::CellRangeAddress& rRange,
const OUString& rTokenStr, sal_Int32 nSharedId );
};
@@ -131,7 +129,6 @@ public:
const css::table::CellAddress& rTokenAddress,
const OUString& );
void createSharedFormulaMapEntry( const css::table::CellAddress& rAddress,
- const css::table::CellRangeAddress& rRange,
sal_Int32 nSharedId, const OUString& rTokens );
/// ensure sizes of vectors matches the number of sheets
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index b7aec9c88660..8de19efecfb1 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -303,7 +303,6 @@ public:
void createSharedFormulaMapEntry(
const css::table::CellAddress& rAddress,
- const css::table::CellRangeAddress& rRange,
sal_Int32 nSharedId, const OUString& rTokens );
void setCellFormulaValue(
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index ef6172f46a9e..4e82ea667769 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -340,9 +340,9 @@ protected:
}
FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry(
- const table::CellAddress& rAddr, const table::CellRangeAddress& rRange,
+ const table::CellAddress& rAddr,
const OUString& rTokenStr, sal_Int32 nSharedId ) :
- maAddress(rAddr), maRange(rRange), maTokenStr(rTokenStr), mnSharedId(nSharedId) {}
+ maAddress(rAddr), maTokenStr(rTokenStr), mnSharedId(nSharedId) {}
FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc(
const css::table::CellAddress& rAddr, sal_Int32 nSharedId,
@@ -457,12 +457,12 @@ FormulaBuffer::SheetItem FormulaBuffer::getSheetItem( SCTAB nTab )
}
void FormulaBuffer::createSharedFormulaMapEntry(
- const table::CellAddress& rAddress, const table::CellRangeAddress& rRange,
+ const table::CellAddress& rAddress,
sal_Int32 nSharedId, const OUString& rTokens )
{
assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maSharedFormulas.size() );
std::vector<SharedFormulaEntry>& rSharedFormulas = maSharedFormulas[ rAddress.Sheet ];
- SharedFormulaEntry aEntry(rAddress, rRange, rTokens, nSharedId);
+ SharedFormulaEntry aEntry(rAddress, rTokens, nSharedId);
rSharedFormulas.push_back( aEntry );
}
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 0cf6280ca0d1..3bc5b9800e61 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -161,7 +161,7 @@ void SheetDataContext::onEndElement()
if( maFmlaData.mnSharedId >= 0 )
{
if( mbValidRange && maFmlaData.isValidSharedRef( maCellData.maCellAddr ) )
- createSharedFormulaMapEntry(maCellData.maCellAddr, maFmlaData.maFormulaRef, maFmlaData.mnSharedId, maFormulaStr);
+ createSharedFormulaMapEntry(maCellData.maCellAddr, maFmlaData.mnSharedId, maFormulaStr);
setCellFormula(maCellData.maCellAddr, maFmlaData.mnSharedId, maCellValue, maCellData.mnCellType);
mrSheetData.setCellFormat( maCellData );
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 69fdb25a53e3..2c2dba1d0faf 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1643,9 +1643,9 @@ void WorksheetHelper::setCellArrayFormula( const css::table::CellRangeAddress& r
}
void WorksheetHelper::createSharedFormulaMapEntry(
- const table::CellAddress& rAddress, const table::CellRangeAddress& rRange, sal_Int32 nSharedId, const OUString& rTokens )
+ const table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens )
{
- getFormulaBuffer().createSharedFormulaMapEntry(rAddress, rRange, nSharedId, rTokens);
+ getFormulaBuffer().createSharedFormulaMapEntry(rAddress, nSharedId, rTokens);
}
} // namespace xls