mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "remove unused parameter"

Browse Source 
This reverts commit 7c63d52506.
actually it is used, it's used in vba
This commit is contained in:
Noel Power
2013-05-01 16:29:47 +01:00
parent df62945861
commit dff7cc0d62
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sc/inc/rangelst.hxx
View File

@@ -41,7 +41,7 @@ public:
sal_uInt16 Parse( const String&, ScDocument* = NULL, sal_uInt16 Parse( const String&, ScDocument* = NULL,
sal_uInt16 nMask = SCA_VALID, sal_uInt16 nMask = SCA_VALID,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, 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, void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,

5
sc/source/core/tool/rangelst.cxx
View File

@@ -183,11 +183,12 @@ ScRangeList::~ScRangeList()
sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask, sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask,
formula::FormulaGrammar::AddressConvention eConv, formula::FormulaGrammar::AddressConvention eConv,
SCTAB nDefaultTab ) SCTAB nDefaultTab, sal_Unicode cDelimiter )
{ {
if ( rStr.Len() ) 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 nMask |= SCA_VALID; // falls das jemand vergessen sollte
sal_uInt16 nResult = (sal_uInt16)~0; // alle Bits setzen sal_uInt16 nResult = (sal_uInt16)~0; // alle Bits setzen