summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-07-01 19:48:28 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-02 22:07:33 +0200
commit6e5560e9f2e8fde05388e4765c3e74f7360f1fbc (patch)
treebcd34a44ec9869f54e89265a9ff4435be9ad66c0
parent49baf95bc061f917b9c56612ddc77fe4de990095 (diff)
ScRange::ParseCols/Rows pDoc parameter is unused
...ever since the code's introduction with f4e75ed9b00a4d8410fe685aae66735ec82837ec "INTEGRATION: CWS scr1c1", despite the "we may need this later" claim that also originated there Change-Id: I88e2b2a8d01fda8adf942ff78f84b6d8638dc154
-rw-r--r--sc/inc/address.hxx4
-rw-r--r--sc/source/core/tool/address.cxx8
-rw-r--r--sc/source/ui/vba/vbarange.cxx6
3 files changed, 7 insertions, 11 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 93ea9c1720be..a13f3e9ddb62 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -526,9 +526,9 @@ public:
SC_DLLPUBLIC ScRefFlags ParseAny( const OUString&, ScDocument*,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
- SC_DLLPUBLIC ScRefFlags ParseCols( const OUString&, ScDocument*,
+ SC_DLLPUBLIC ScRefFlags ParseCols( const OUString&,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
- SC_DLLPUBLIC void ParseRows( const OUString&, ScDocument*,
+ SC_DLLPUBLIC void ParseRows( const OUString&,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
/** Parse an Excel style reference up to and including the sheet name
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index c8e617dede94..de79a3d8a4df 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1774,7 +1774,7 @@ ScRefFlags ScRange::ParseAny( const OUString& rString, ScDocument* pDoc,
}
// Parse only full row references
-ScRefFlags ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
+ScRefFlags ScRange::ParseCols( const OUString& rStr,
const ScAddress::Details& rDetails )
{
if (rStr.isEmpty())
@@ -1784,8 +1784,6 @@ ScRefFlags ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
ScRefFlags nRes = ScRefFlags::ZERO;
ScRefFlags ignored = ScRefFlags::ZERO;
- (void)pDoc; // make compiler shutup we may need this later
-
switch (rDetails.eConv)
{
default :
@@ -1834,7 +1832,7 @@ ScRefFlags ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
}
// Parse only full row references
-void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
+void ScRange::ParseRows( const OUString& rStr,
const ScAddress::Details& rDetails )
{
if (rStr.isEmpty())
@@ -1843,8 +1841,6 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
const sal_Unicode* p = rStr.getStr();
ScRefFlags ignored = ScRefFlags::ZERO;
- (void)pDoc; // make compiler shutup we may need this later
-
switch (rDetails.eConv)
{
default :
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 59769264ec1a..01bd01c4ffc1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2189,7 +2189,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent,
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
- ScRefFlags flags = tmpRange.ParseCols( sCol, &getDocumentFromRange( xRange ), dDetails );
+ ScRefFlags flags = tmpRange.ParseCols( sCol, dDetails );
if ( (flags & ScRefFlags::COL_VALID) == ScRefFlags::ZERO )
throw uno::RuntimeException();
nColumn = tmpRange.aStart.Col() + 1;
@@ -2364,7 +2364,7 @@ ScVbaRange::Rows(const uno::Any& aIndex )
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
- tmpRange.ParseRows( sAddress, &getDocumentFromRange( mxRange ), dDetails );
+ tmpRange.ParseRows( sAddress, dDetails );
SCROW nStartRow = tmpRange.aStart.Row();
SCROW nEndRow = tmpRange.aEnd.Row();
@@ -2408,7 +2408,7 @@ ScVbaRange::Columns(const uno::Any& aIndex )
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
- tmpRange.ParseCols( sAddress, &getDocumentFromRange( mxRange ), dDetails );
+ tmpRange.ParseCols( sAddress, dDetails );
SCCOL nStartCol = tmpRange.aStart.Col();
SCCOL nEndCol = tmpRange.aEnd.Col();