diff options
| -rw-r--r-- | sc/inc/column.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/column3.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 2f4d6973205c..e4fe323b93f2 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -141,7 +141,7 @@ friend class sc::EditTextIterator; bool ParseString( ScCellValue& rCell, - SCROW nRow, SCTAB nTab, const String& rString, formula::FormulaGrammar::AddressConvention eConv, + SCROW nRow, SCTAB nTab, const OUString& rString, formula::FormulaGrammar::AddressConvention eConv, ScSetStringParam* pParam ); public: @@ -260,7 +260,7 @@ public: bool HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst); bool SetString( - SCROW nRow, SCTAB nTab, const String& rString, formula::FormulaGrammar::AddressConvention eConv, + SCROW nRow, SCTAB nTab, const OUString& rString, formula::FormulaGrammar::AddressConvention eConv, ScSetStringParam* pParam = NULL ); void SetEditText( SCROW nRow, EditTextObject* pEditText ); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index c651cca987f7..b01ff8f2df29 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1427,11 +1427,11 @@ void ScColumn::StartListeningInArea( sc::StartListeningContext& rCxt, SCROW nRow } bool ScColumn::ParseString( - ScCellValue& rCell, SCROW nRow, SCTAB nTabP, const String& rString, + ScCellValue& rCell, SCROW nRow, SCTAB nTabP, const OUString& rString, formula::FormulaGrammar::AddressConvention eConv, ScSetStringParam* pParam ) { - if (!rString.Len()) + if (rString.isEmpty()) return false; bool bNumFmtSet = false; @@ -1448,15 +1448,15 @@ bool ScColumn::ParseString( aParam.mpNumFormatter = pDocument->GetFormatTable(); nIndex = nOldIndex = GetNumberFormat( nRow ); - if ( rString.Len() > 1 + if ( rString.getLength() > 1 && aParam.mpNumFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT ) - cFirstChar = rString.GetChar(0); + cFirstChar = rString[0]; else cFirstChar = 0; // Text if ( cFirstChar == '=' ) { - if ( rString.Len() == 1 ) // = Text + if ( rString.getLength() == 1 ) // = Text rCell.set(rString); else // = Formula rCell.set( @@ -1472,7 +1472,7 @@ bool ScColumn::ParseString( { // Cell format is not 'Text', and the first char // is an apostrophe. Check if the input is considered a number. - String aTest = rString.Copy(1); + OUString aTest = rString.copy(1); double fTest; bNumeric = aParam.mpNumFormatter->IsNumberFormat(aTest, nIndex, fTest); if (bNumeric) @@ -1583,7 +1583,7 @@ bool ScColumn::ParseString( /** * Returns true if the cell format was set as well */ -bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const OUString& rString, formula::FormulaGrammar::AddressConvention eConv, ScSetStringParam* pParam ) { |