diff options
| author | Noel Power <noel.power@suse.com> | 2013-05-01 16:29:47 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-05-07 09:56:22 +0100 |
| commit | 3d0d53645f658957e4b3a5707fd9bceb3db09993 (patch) | |
| tree | ddec83daae52b0808eff6531ee5b6aece890d0f1 | |
| parent | e0051cb23f2a33340f5eab6ef69992e33d77ca96 (diff) | |
Revert "remove unused parameter"
This reverts commit 7c63d52506b66563eefcf29c803b23bb9b812491.
actually it is used, it's used in vba
| -rw-r--r-- | sc/inc/rangelst.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/rangelst.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 2a20f45108e9..9902eab2e448 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -41,7 +41,7 @@ public: sal_uInt16 Parse( const String&, ScDocument* = NULL, sal_uInt16 nMask = SCA_VALID, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, - SCTAB nDefaultTab = 0 ); + SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 ); void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 8f37c136af74..4027d6febfe8 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -183,11 +183,12 @@ ScRangeList::~ScRangeList() sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask, formula::FormulaGrammar::AddressConvention eConv, - SCTAB nDefaultTab ) + SCTAB nDefaultTab, sal_Unicode cDelimiter ) { if ( rStr.Len() ) { - sal_Unicode cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); + if (!cDelimiter) + cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); nMask |= SCA_VALID; // falls das jemand vergessen sollte sal_uInt16 nResult = (sal_uInt16)~0; // alle Bits setzen |