[Libreoffice-commits] core.git: 60 commits - sc/inc sc/source
Noel Grandin
noel at peralex.com
Fri Oct 4 00:47:57 PDT 2013
sc/inc/filter.hxx | 14 +--
sc/inc/fmtuno.hxx | 46 +++++------
sc/inc/hints.hxx | 50 ++++++------
sc/inc/linkuno.hxx | 14 +--
sc/inc/lookupcache.hxx | 8 +-
sc/inc/nameuno.hxx | 8 +-
sc/inc/progress.hxx | 4 -
sc/inc/rangelst.hxx | 5 -
sc/inc/rangenam.hxx | 5 -
sc/inc/rangeutl.hxx | 23 ++---
sc/inc/scabstdlg.hxx | 68 ++++++++---------
sc/inc/scextopt.hxx | 6 -
sc/inc/scmod.hxx | 6 -
sc/inc/strload.hxx | 4 -
sc/inc/styleuno.hxx | 4 -
sc/inc/table.hxx | 12 +--
sc/inc/tablink.hxx | 16 +---
sc/inc/tabprotection.hxx | 12 +--
sc/inc/targuno.hxx | 4 -
sc/inc/textuno.hxx | 2
sc/inc/viewopti.hxx | 6 -
sc/inc/viewuno.hxx | 6 -
sc/source/core/data/table1.cxx | 4 -
sc/source/core/data/table2.cxx | 2
sc/source/core/data/table4.cxx | 2
sc/source/core/data/table5.cxx | 2
sc/source/core/data/tabprotection.cxx | 8 +-
sc/source/core/inc/cellkeytranslator.hxx | 2
sc/source/core/inc/ddelink.hxx | 14 +--
sc/source/core/inc/interpre.hxx | 22 ++---
sc/source/core/tool/cellkeytranslator.cxx | 2
sc/source/core/tool/ddelink.cxx | 2
sc/source/core/tool/hints.cxx | 10 +-
sc/source/core/tool/interpr1.cxx | 38 ++++-----
sc/source/core/tool/interpr4.cxx | 18 ++--
sc/source/core/tool/interpr5.cxx | 2
sc/source/core/tool/lookupcache.cxx | 2
sc/source/core/tool/progress.cxx | 2
sc/source/core/tool/rangelst.cxx | 19 ----
sc/source/core/tool/rangenam.cxx | 39 ++++-----
sc/source/core/tool/rangeutl.cxx | 53 +++++--------
sc/source/core/tool/viewopti.cxx | 2
sc/source/filter/excel/excform.cxx | 6 -
sc/source/filter/excel/excform8.cxx | 4 -
sc/source/filter/excel/exctools.cxx | 10 +-
sc/source/filter/excel/fontbuff.cxx | 2
sc/source/filter/excel/namebuff.cxx | 10 +-
sc/source/filter/excel/tokstack.cxx | 24 +++---
sc/source/filter/excel/xechart.cxx | 12 +--
sc/source/filter/excel/xecontent.cxx | 22 ++---
sc/source/filter/excel/xeescher.cxx | 8 +-
sc/source/filter/excel/xehelper.cxx | 16 ++--
sc/source/filter/excel/xelink.cxx | 14 +--
sc/source/filter/excel/xename.cxx | 28 +++----
sc/source/filter/excel/xepage.cxx | 4 -
sc/source/filter/excel/xepivot.cxx | 10 +-
sc/source/filter/excel/xeroot.cxx | 2
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/excel/xestyle.cxx | 8 +-
sc/source/filter/excel/xetable.cxx | 2
sc/source/filter/excel/xichart.cxx | 6 -
sc/source/filter/excel/xicontent.cxx | 4 -
sc/source/filter/excel/xihelper.cxx | 28 +++----
sc/source/filter/excel/xilink.cxx | 54 ++++++-------
sc/source/filter/excel/xiname.cxx | 10 +-
sc/source/filter/excel/xipage.cxx | 4 -
sc/source/filter/excel/xiroot.cxx | 2
sc/source/filter/excel/xistream.cxx | 14 +--
sc/source/filter/excel/xistring.cxx | 10 +-
sc/source/filter/excel/xistyle.cxx | 14 +--
sc/source/filter/excel/xlescher.cxx | 6 -
sc/source/filter/excel/xlformula.cxx | 22 ++---
sc/source/filter/excel/xlpage.cxx | 4 -
sc/source/filter/excel/xlroot.cxx | 10 +-
sc/source/filter/excel/xlstyle.cxx | 10 +-
sc/source/filter/excel/xltracer.cxx | 4 -
sc/source/filter/ftools/fapihelper.cxx | 8 --
sc/source/filter/ftools/fprogressbar.cxx | 6 -
sc/source/filter/ftools/ftools.cxx | 18 ++--
sc/source/filter/html/htmlexp.cxx | 12 +--
sc/source/filter/html/htmlimp.cxx | 14 +--
sc/source/filter/html/htmlpars.cxx | 6 -
sc/source/filter/inc/XclExpChangeTrack.hxx | 10 +-
sc/source/filter/inc/XclImpChangeTrack.hxx | 6 -
sc/source/filter/inc/eeimport.hxx | 2
sc/source/filter/inc/eeparser.hxx | 2
sc/source/filter/inc/excdefs.hxx | 4 -
sc/source/filter/inc/excform.hxx | 4 -
sc/source/filter/inc/excscen.hxx | 12 +--
sc/source/filter/inc/fapihelper.hxx | 9 --
sc/source/filter/inc/fprogressbar.hxx | 8 +-
sc/source/filter/inc/ftools.hxx | 20 ++---
sc/source/filter/inc/htmlexp.hxx | 8 +-
sc/source/filter/inc/htmlimp.hxx | 6 -
sc/source/filter/inc/htmlpars.hxx | 8 +-
sc/source/filter/inc/lotfntbf.hxx | 8 +-
sc/source/filter/inc/lotimpop.hxx | 2
sc/source/filter/inc/lotrange.hxx | 10 +-
sc/source/filter/inc/namebuff.hxx | 46 +++++------
sc/source/filter/inc/qpro.hxx | 2
sc/source/filter/inc/qprostyle.hxx | 4 -
sc/source/filter/inc/rtfparse.hxx | 2
sc/source/filter/inc/tokstack.hxx | 24 +++---
sc/source/filter/inc/xcl97rec.hxx | 12 +--
sc/source/filter/inc/xechart.hxx | 4 -
sc/source/filter/inc/xecontent.hxx | 16 ++--
sc/source/filter/inc/xeescher.hxx | 10 +-
sc/source/filter/inc/xehelper.hxx | 14 +--
sc/source/filter/inc/xelink.hxx | 16 ++--
sc/source/filter/inc/xename.hxx | 8 +-
sc/source/filter/inc/xepage.hxx | 4 -
sc/source/filter/inc/xepivot.hxx | 4 -
sc/source/filter/inc/xestyle.hxx | 12 +--
sc/source/filter/inc/xetable.hxx | 2
sc/source/filter/inc/xichart.hxx | 4 -
sc/source/filter/inc/xicontent.hxx | 7 +
sc/source/filter/inc/xiescher.hxx | 2
sc/source/filter/inc/xihelper.hxx | 4 -
sc/source/filter/inc/xilink.hxx | 14 +--
sc/source/filter/inc/xiname.hxx | 10 +-
sc/source/filter/inc/xipivot.hxx | 2
sc/source/filter/inc/xiroot.hxx | 2
sc/source/filter/inc/xistream.hxx | 12 +--
sc/source/filter/inc/xistring.hxx | 16 ++--
sc/source/filter/inc/xistyle.hxx | 12 +--
sc/source/filter/inc/xlconst.hxx | 12 +--
sc/source/filter/inc/xlescher.hxx | 4 -
sc/source/filter/inc/xlformula.hxx | 12 +--
sc/source/filter/inc/xlpage.hxx | 4 -
sc/source/filter/inc/xlpivot.hxx | 2
sc/source/filter/inc/xlroot.hxx | 20 ++---
sc/source/filter/inc/xlstyle.hxx | 6 -
sc/source/filter/inc/xltracer.hxx | 2
sc/source/filter/lotus/lotimpop.cxx | 8 +-
sc/source/filter/lotus/tool.cxx | 8 +-
sc/source/filter/qpro/qpro.cxx | 8 +-
sc/source/filter/rtf/eeimpars.cxx | 2
sc/source/filter/rtf/rtfimp.cxx | 2
sc/source/filter/rtf/rtfparse.cxx | 2
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 10 +-
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 12 +--
sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx | 2
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/filter/xml/xmltabi.hxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 4 -
sc/source/ui/Accessibility/AccessibleText.cxx | 14 +--
sc/source/ui/app/inputhdl.cxx | 8 +-
sc/source/ui/app/inputwin.cxx | 55 ++++++++-----
sc/source/ui/app/lnktrans.cxx | 6 -
sc/source/ui/app/rfindlst.cxx | 2
sc/source/ui/app/scmod.cxx | 6 -
sc/source/ui/attrdlg/scdlgfact.cxx | 68 ++++++++---------
sc/source/ui/attrdlg/scdlgfact.hxx | 68 ++++++++---------
sc/source/ui/condformat/condformatmgr.cxx | 6 -
sc/source/ui/dbgui/asciiopt.cxx | 32 ++++----
sc/source/ui/dbgui/consdlg.cxx | 12 +--
sc/source/ui/dbgui/csvgrid.cxx | 30 +++----
sc/source/ui/dbgui/csvtablebox.cxx | 2
sc/source/ui/dbgui/dapitype.cxx | 10 +-
sc/source/ui/dbgui/dbnamdlg.cxx | 2
sc/source/ui/dbgui/fieldwnd.cxx | 12 +--
sc/source/ui/dbgui/foptmgr.cxx | 6 -
sc/source/ui/dbgui/imoptdlg.cxx | 18 ++--
sc/source/ui/dbgui/pvfundlg.cxx | 4 -
sc/source/ui/dbgui/scuiasciiopt.cxx | 18 ++--
sc/source/ui/dbgui/scuiimoptdlg.cxx | 2
sc/source/ui/dbgui/sortdlg.cxx | 4 -
sc/source/ui/docshell/autostyl.cxx | 6 -
sc/source/ui/docshell/docfunc.cxx | 30 +++----
sc/source/ui/docshell/docsh.cxx | 34 ++++----
sc/source/ui/docshell/docsh3.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 4 -
sc/source/ui/docshell/docsh5.cxx | 6 -
sc/source/ui/docshell/docsh8.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/docshell/impex.cxx | 56 ++++++--------
sc/source/ui/docshell/servobj.cxx | 6 -
sc/source/ui/docshell/tablink.cxx | 31 ++-----
sc/source/ui/drawfunc/fuins2.cxx | 4 -
sc/source/ui/inc/AccessibleCsvControl.hxx | 6 -
sc/source/ui/inc/AccessibleText.hxx | 14 +--
sc/source/ui/inc/acredlin.hxx | 32 ++++----
sc/source/ui/inc/anyrefdg.hxx | 8 +-
sc/source/ui/inc/asciiopt.hxx | 14 +--
sc/source/ui/inc/autofmt.hxx | 16 ++--
sc/source/ui/inc/autostyl.hxx | 6 -
sc/source/ui/inc/cellsh.hxx | 4 -
sc/source/ui/inc/colrowba.hxx | 12 +--
sc/source/ui/inc/condformatmgr.hxx | 2
sc/source/ui/inc/conflictsdlg.hxx | 12 +--
sc/source/ui/inc/consdlg.hxx | 2
sc/source/ui/inc/content.hxx | 16 ++--
sc/source/ui/inc/crdlg.hxx | 4 -
sc/source/ui/inc/csvcontrol.hxx | 2
sc/source/ui/inc/csvgrid.hxx | 6 -
sc/source/ui/inc/csvtablebox.hxx | 2
sc/source/ui/inc/dapitype.hxx | 10 +-
sc/source/ui/inc/dbnamdlg.hxx | 2
sc/source/ui/inc/docfunc.hxx | 22 ++---
sc/source/ui/inc/docsh.hxx | 30 +++----
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/inc/fieldwnd.hxx | 14 +--
sc/source/ui/inc/foptmgr.hxx | 6 -
sc/source/ui/inc/funcpage.hxx | 2
sc/source/ui/inc/gridwin.hxx | 10 +-
sc/source/ui/inc/hdrcont.hxx | 4 -
sc/source/ui/inc/hintwin.hxx | 14 +--
sc/source/ui/inc/imoptdlg.hxx | 8 +-
sc/source/ui/inc/impex.hxx | 24 +++---
sc/source/ui/inc/inputhdl.hxx | 12 +--
sc/source/ui/inc/inputwin.hxx | 34 ++++----
sc/source/ui/inc/instbdlg.hxx | 6 -
sc/source/ui/inc/linkarea.hxx | 8 +-
sc/source/ui/inc/lnktrans.hxx | 6 -
sc/source/ui/inc/navipi.hxx | 34 ++++----
sc/source/ui/inc/notemark.hxx | 4 -
sc/source/ui/inc/opredlin.hxx | 2
sc/source/ui/inc/optsolver.hxx | 46 +++++------
sc/source/ui/inc/preview.hxx | 2
sc/source/ui/inc/prevwsh.hxx | 2
sc/source/ui/inc/pvfundlg.hxx | 4 -
sc/source/ui/inc/reffact.hxx | 4 -
sc/source/ui/inc/retypepassdlg.hxx | 12 +--
sc/source/ui/inc/rfindlst.hxx | 6 -
sc/source/ui/inc/scuiasciiopt.hxx | 12 +--
sc/source/ui/inc/scuiautofmt.hxx | 12 +--
sc/source/ui/inc/scuiimoptdlg.hxx | 2
sc/source/ui/inc/servobj.hxx | 4 -
sc/source/ui/inc/shtabdlg.hxx | 6 -
sc/source/ui/inc/simpref.hxx | 6 -
sc/source/ui/inc/solveroptions.hxx | 10 +-
sc/source/ui/inc/solvrdlg.hxx | 12 +--
sc/source/ui/inc/sortdlg.hxx | 2
sc/source/ui/inc/strindlg.hxx | 6 -
sc/source/ui/inc/tabbgcolordlg.hxx | 8 +-
sc/source/ui/inc/tabopdlg.hxx | 18 ++--
sc/source/ui/inc/tabvwsh.hxx | 30 +++----
sc/source/ui/inc/tphf.hxx | 2
sc/source/ui/inc/tpusrlst.hxx | 16 ++--
sc/source/ui/inc/undoblk.hxx | 56 +++++++-------
sc/source/ui/inc/undocell.hxx | 10 +-
sc/source/ui/inc/undodat.hxx | 6 -
sc/source/ui/inc/undostyl.hxx | 20 ++---
sc/source/ui/inc/undotab.hxx | 66 ++++++++--------
sc/source/ui/inc/validate.hxx | 18 ++--
sc/source/ui/inc/viewfunc.hxx | 54 ++++++-------
sc/source/ui/inc/warnbox.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 8 +-
sc/source/ui/miscdlgs/conflictsdlg.cxx | 4 -
sc/source/ui/miscdlgs/crdlg.cxx | 4 -
sc/source/ui/miscdlgs/instbdlg.cxx | 8 +-
sc/source/ui/miscdlgs/linkarea.cxx | 8 +-
sc/source/ui/miscdlgs/optsolver.cxx | 14 +--
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2
sc/source/ui/miscdlgs/scuiautofmt.cxx | 4 -
sc/source/ui/miscdlgs/shtabdlg.cxx | 6 -
sc/source/ui/miscdlgs/simpref.cxx | 4 -
sc/source/ui/miscdlgs/solveroptions.cxx | 10 +-
sc/source/ui/miscdlgs/solvrdlg.cxx | 2
sc/source/ui/miscdlgs/strindlg.cxx | 6 -
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 4 -
sc/source/ui/miscdlgs/tabopdlg.cxx | 4 -
sc/source/ui/miscdlgs/warnbox.cxx | 4 -
sc/source/ui/navipi/content.cxx | 40 +++++-----
sc/source/ui/navipi/navipi.cxx | 14 +--
sc/source/ui/navipi/scenwnd.cxx | 4 -
sc/source/ui/optdlg/tpusrlst.cxx | 28 +++----
sc/source/ui/optdlg/tpview.cxx | 4 -
sc/source/ui/pagedlg/areasdlg.cxx | 4 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 4 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 4 -
sc/source/ui/undo/undoblk.cxx | 6 -
sc/source/ui/undo/undoblk3.cxx | 16 ++--
sc/source/ui/undo/undocell.cxx | 6 -
sc/source/ui/undo/undodat.cxx | 4 -
sc/source/ui/undo/undostyl.cxx | 12 +--
sc/source/ui/undo/undotab.cxx | 20 ++---
sc/source/ui/unoobj/cellsuno.cxx | 6 -
sc/source/ui/unoobj/chartuno.cxx | 6 -
sc/source/ui/unoobj/confuno.cxx | 2
sc/source/ui/unoobj/filtuno.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 20 ++---
sc/source/ui/unoobj/linkuno.cxx | 8 +-
sc/source/ui/unoobj/nameuno.cxx | 12 +--
sc/source/ui/unoobj/styleuno.cxx | 4 -
sc/source/ui/unoobj/textuno.cxx | 6 -
sc/source/ui/unoobj/viewuno.cxx | 6 -
sc/source/ui/vba/vbapagesetup.cxx | 2
sc/source/ui/view/cellsh.cxx | 4 -
sc/source/ui/view/cellsh1.cxx | 8 +-
sc/source/ui/view/colrowba.cxx | 8 +-
sc/source/ui/view/drawview.cxx | 2
sc/source/ui/view/gridwin.cxx | 14 +--
sc/source/ui/view/gridwin2.cxx | 6 -
sc/source/ui/view/gridwin5.cxx | 2
sc/source/ui/view/hdrcont.cxx | 2
sc/source/ui/view/hintwin.cxx | 6 -
sc/source/ui/view/notemark.cxx | 2
sc/source/ui/view/preview.cxx | 2
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/reffact.cxx | 6 -
sc/source/ui/view/scextopt.cxx | 8 +-
sc/source/ui/view/tabvwsh2.cxx | 6 -
sc/source/ui/view/tabvwsh3.cxx | 10 +-
sc/source/ui/view/tabvwsh4.cxx | 10 +-
sc/source/ui/view/tabvwsh9.cxx | 2
sc/source/ui/view/tabvwsha.cxx | 2
sc/source/ui/view/tabvwshe.cxx | 4 -
sc/source/ui/view/tabvwshf.cxx | 6 -
sc/source/ui/view/tabvwshg.cxx | 8 +-
sc/source/ui/view/viewdata.cxx | 2
sc/source/ui/view/viewfun2.cxx | 40 +++++-----
sc/source/ui/view/viewfun4.cxx | 6 -
sc/source/ui/view/viewfun7.cxx | 4 -
sc/source/ui/view/viewfunc.cxx | 26 +++---
317 files changed, 1721 insertions(+), 1773 deletions(-)
New commits:
commit 26acd487845bd6c6f08036bffde1631fae56087a
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 3 14:07:33 2013 +0200
convert sc/inc/fmtuno.hxx from String to OUString
Change-Id: Ia8fccd5d062ed27bebf87a46f774fff589c1076b
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 5006bd2..9e7f525 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -52,14 +52,14 @@ class ScValidationData;
struct ScCondFormatEntryItem
{
- ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > maTokens1;
- ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > maTokens2;
- String maExpr1;
- String maExpr2;
- String maExprNmsp1;
- String maExprNmsp2;
- String maPosStr; // formula position as text
- String maStyle; // display name as stored in ScStyleSheet
+ css::uno::Sequence< css::sheet::FormulaToken > maTokens1;
+ css::uno::Sequence< css::sheet::FormulaToken > maTokens2;
+ OUString maExpr1;
+ OUString maExpr2;
+ OUString maExprNmsp1;
+ OUString maExprNmsp2;
+ OUString maPosStr; // formula position as text
+ OUString maStyle; // display name as stored in ScStyleSheet
ScAddress maPos;
formula::FormulaGrammar::Grammar meGrammar1; // grammar used with maExpr1
formula::FormulaGrammar::Grammar meGrammar2; // grammar used with maExpr2
@@ -205,27 +205,27 @@ class ScTableValidationObj : public cppu::WeakImplHelper5<
{
private:
SfxItemPropertySet aPropSet;
- sal_uInt16 nMode; // enum ScConditionMode
- String aExpr1;
- String aExpr2;
- String maExprNmsp1;
- String maExprNmsp2;
+ sal_uInt16 nMode; // enum ScConditionMode
+ OUString aExpr1;
+ OUString aExpr2;
+ OUString maExprNmsp1;
+ OUString maExprNmsp2;
formula::FormulaGrammar::Grammar meGrammar1; // grammar used with aExpr1 and aExpr2
formula::FormulaGrammar::Grammar meGrammar2; // grammar used with aExpr1 and aExpr2
::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens1;
::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2;
ScAddress aSrcPos;
- String aPosString; // formula position as text
- sal_uInt16 nValMode; // enum ScValidationMode
- sal_Bool bIgnoreBlank;
+ OUString aPosString; // formula position as text
+ sal_uInt16 nValMode; // enum ScValidationMode
+ sal_Bool bIgnoreBlank;
sal_Int16 nShowList;
- sal_Bool bShowInput;
- OUString aInputTitle;
- OUString aInputMessage;
- sal_Bool bShowError;
- sal_uInt16 nErrorStyle; // enum ScValidErrorStyle
- OUString aErrorTitle;
- OUString aErrorMessage;
+ sal_Bool bShowInput;
+ OUString aInputTitle;
+ OUString aInputMessage;
+ sal_Bool bShowError;
+ sal_uInt16 nErrorStyle; // enum ScValidErrorStyle
+ OUString aErrorTitle;
+ OUString aErrorMessage;
void ClearData_Impl();
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 8f63314..301c4b0 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -220,7 +220,7 @@ void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat,
ScCondFormatEntry* pCoreEntry = new ScCondFormatEntry( aData.meMode, aData.maExpr1, aData.maExpr2,
pDoc, aData.maPos, aData.maStyle, aData.maExprNmsp1, aData.maExprNmsp2, eGrammar1, eGrammar2 );
- if ( aData.maPosStr.Len() )
+ if ( !aData.maPosStr.isEmpty() )
pCoreEntry->SetSrcString( aData.maPosStr );
if ( aData.maTokens1.getLength() )
@@ -286,7 +286,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
aEntry.maExpr1 = aStrVal;
else if ( rProp.Value >>= aTokens )
{
- aEntry.maExpr1.Erase();
+ aEntry.maExpr1 = "";
aEntry.maTokens1 = aTokens;
}
}
@@ -298,7 +298,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
aEntry.maExpr2 = aStrVal;
else if ( rProp.Value >>= aTokens )
{
- aEntry.maExpr2.Erase();
+ aEntry.maExpr2 = "";
aEntry.maTokens2 = aTokens;
}
}
@@ -695,7 +695,7 @@ ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc,
if (!bShowError)
pRet->ResetError();
- if ( aPosString.Len() )
+ if ( !aPosString.isEmpty() )
pRet->SetSrcString( aPosString );
return pRet;
@@ -711,10 +711,10 @@ void ScTableValidationObj::ClearData_Impl()
bShowError = false;
nErrorStyle = SC_VALERR_STOP;
aSrcPos.Set(0,0,0);
- aExpr1.Erase();
- aExpr2.Erase();
- maExprNmsp1.Erase();
- maExprNmsp2.Erase();
+ aExpr1 = "";
+ aExpr2 = "";
+ maExprNmsp1 = "";
+ maExprNmsp2 = "";
meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be overriden when needed
aInputTitle = OUString();
aInputMessage = OUString();
@@ -819,12 +819,12 @@ void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequ
if (nIndex == 0)
{
aTokens1 = aTokens;
- aExpr1.Erase();
+ aExpr1 = "";
}
else if (nIndex == 1)
{
aTokens2 = aTokens;
- aExpr2.Erase();
+ aExpr2 = "";
}
}
commit 049b9cb306356f97b3bcf7474223f5bdd47f1ca2
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 3 13:50:31 2013 +0200
convert sc/inc/hints.hxx from String to OUString
Change-Id: I34c95dc8fcece06df4d7869fdfb2341052232936
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index edb2a4e..af45f86 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -95,12 +95,12 @@ public:
class ScLinkRefreshedHint : public SfxHint
{
- sal_uInt16 nLinkType; // SC_LINKREFTYPE_...
- String aUrl; // used for sheet links
- String aDdeAppl; // used for dde links:
- String aDdeTopic;
- String aDdeItem;
- sal_uInt8 nDdeMode;
+ sal_uInt16 nLinkType; // SC_LINKREFTYPE_...
+ OUString aUrl; // used for sheet links
+ OUString aDdeAppl; // used for dde links:
+ OUString aDdeTopic;
+ OUString aDdeItem;
+ sal_uInt8 nDdeMode;
ScAddress aDestPos; // used to identify area links
//! also use source data for area links?
@@ -109,16 +109,16 @@ public:
ScLinkRefreshedHint();
~ScLinkRefreshedHint();
- void SetSheetLink( const String& rSourceUrl );
- void SetDdeLink( const String& rA, const String& rT, const String& rI, sal_uInt8 nM );
+ void SetSheetLink( const OUString& rSourceUrl );
+ void SetDdeLink( const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM );
void SetAreaLink( const ScAddress& rPos );
- sal_uInt16 GetLinkType() const { return nLinkType; }
- const String& GetUrl() const { return aUrl; }
- const String& GetDdeAppl() const { return aDdeAppl; }
- const String& GetDdeTopic() const { return aDdeTopic; }
- const String& GetDdeItem() const { return aDdeItem; }
- sal_uInt8 GetDdeMode() const { return nDdeMode; }
+ sal_uInt16 GetLinkType() const { return nLinkType; }
+ const OUString& GetUrl() const { return aUrl; }
+ const OUString& GetDdeAppl() const { return aDdeAppl; }
+ const OUString& GetDdeTopic() const { return aDdeTopic; }
+ const OUString& GetDdeItem() const { return aDdeItem; }
+ sal_uInt8 GetDdeMode() const { return nDdeMode; }
const ScAddress& GetDestPos() const { return aDestPos; }
};
@@ -127,20 +127,20 @@ public:
class ScAutoStyleHint : public SfxHint
{
ScRange aRange;
- String aStyle1;
- String aStyle2;
- sal_uLong nTimeout;
+ OUString aStyle1;
+ OUString aStyle2;
+ sal_uLong nTimeout;
public:
TYPEINFO();
- ScAutoStyleHint( const ScRange& rR, const String& rSt1,
- sal_uLong nT, const String& rSt2 );
+ ScAutoStyleHint( const ScRange& rR, const OUString& rSt1,
+ sal_uLong nT, const OUString& rSt2 );
~ScAutoStyleHint();
const ScRange& GetRange() const { return aRange; }
- const String& GetStyle1() const { return aStyle1; }
- sal_uInt32 GetTimeout() const { return nTimeout; }
- const String& GetStyle2() const { return aStyle2; }
+ const OUString& GetStyle1() const { return aStyle1; }
+ sal_uInt32 GetTimeout() const { return nTimeout; }
+ const OUString& GetStyle2() const { return aStyle2; }
};
class ScDBRangeRefreshedHint : public SfxHint
@@ -157,14 +157,14 @@ public:
class ScDataPilotModifiedHint : public SfxHint
{
- String maName;
+ OUString maName;
public:
TYPEINFO();
- ScDataPilotModifiedHint( const String& rName );
+ ScDataPilotModifiedHint( const OUString& rName );
~ScDataPilotModifiedHint();
- const String& GetName() const { return maName; }
+ const OUString& GetName() const { return maName; }
};
#endif
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index dd143e5..45c9f75 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -74,14 +74,14 @@ ScLinkRefreshedHint::~ScLinkRefreshedHint()
{
}
-void ScLinkRefreshedHint::SetSheetLink( const String& rSourceUrl )
+void ScLinkRefreshedHint::SetSheetLink( const OUString& rSourceUrl )
{
nLinkType = SC_LINKREFTYPE_SHEET;
aUrl = rSourceUrl;
}
void ScLinkRefreshedHint::SetDdeLink(
- const String& rA, const String& rT, const String& rI, sal_uInt8 nM )
+ const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM )
{
nLinkType = SC_LINKREFTYPE_DDE;
aDdeAppl = rA;
@@ -98,8 +98,8 @@ void ScLinkRefreshedHint::SetAreaLink( const ScAddress& rPos )
// ScAutoStyleHint - STYLE() function has been called
-ScAutoStyleHint::ScAutoStyleHint( const ScRange& rR, const String& rSt1,
- sal_uLong nT, const String& rSt2 ) :
+ScAutoStyleHint::ScAutoStyleHint( const ScRange& rR, const OUString& rSt1,
+ sal_uLong nT, const OUString& rSt2 ) :
aRange( rR ),
aStyle1( rSt1 ),
aStyle2( rSt2 ),
@@ -119,7 +119,7 @@ ScDBRangeRefreshedHint::~ScDBRangeRefreshedHint()
{
}
-ScDataPilotModifiedHint::ScDataPilotModifiedHint( const String& rName )
+ScDataPilotModifiedHint::ScDataPilotModifiedHint( const OUString& rName )
: maName(rName)
{
}
commit 83eb6bc562b6de5b8f7c22c9f408e68d6566d739
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 3 13:13:14 2013 +0200
convert sc/inc/l*.hxx from String to OUString
Change-Id: I52f9989cead1fc84e659fe0e4180a9c85388355d
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 318a390..b5788e8 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -66,7 +66,7 @@ class ScSheetLinkObj : public cppu::WeakImplHelper4<
private:
SfxItemPropertySet aPropSet;
ScDocShell* pDocShell;
- String aFileName;
+ OUString aFileName;
XRefreshListenerArr_Impl aRefreshListeners;
ScTableLink* GetLink_Impl() const;
@@ -74,7 +74,7 @@ private:
void ModifyRefreshDelay_Impl( sal_Int32 nRefresh );
public:
- ScSheetLinkObj(ScDocShell* pDocSh, const String& rName);
+ ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName);
virtual ~ScSheetLinkObj();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -378,16 +378,16 @@ class ScDDELinkObj : public cppu::WeakImplHelper5<
{
private:
ScDocShell* pDocShell;
- String aAppl;
- String aTopic;
- String aItem;
+ OUString aAppl;
+ OUString aTopic;
+ OUString aItem;
XRefreshListenerArr_Impl aRefreshListeners;
void Refreshed_Impl();
public:
- ScDDELinkObj(ScDocShell* pDocSh, const String& rA,
- const String& rT, const String& rI);
+ ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
+ const OUString& rT, const OUString& rI);
virtual ~ScDDELinkObj();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index aa8f4f7..9bfc541 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -63,7 +63,7 @@ public:
union
{
double mfVal;
- const String * mpStr;
+ const OUString *mpStr;
};
bool mbAlloc : 1;
bool mbString : 1;
@@ -94,7 +94,7 @@ public:
mfVal = fVal;
}
- void setString( const String * pStr )
+ void setString( const OUString * pStr )
{
deleteString();
mbAlloc = false;
@@ -102,11 +102,11 @@ public:
mpStr = pStr;
}
- void setString( const String & rStr )
+ void setString( const OUString & rStr )
{
deleteString();
mbAlloc = mbString = true;
- mpStr = new String( rStr);
+ mpStr = new OUString( rStr);
}
bool operator==( const QueryCriteria & r ) const
diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx
index 235bb04..a676a72 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -56,7 +56,7 @@ ScLookupCache::QueryCriteria::QueryCriteria( const ScLookupCache::QueryCriteria
{
if (r.mbString && r.mpStr)
{
- mpStr = new String( *r.mpStr);
+ mpStr = new OUString( *r.mpStr);
mbAlloc = mbString = true;
}
}
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index eef68a1..744c1e4 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -76,7 +76,7 @@ SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.
//------------------------------------------------------------------------
-ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const String& rName) :
+ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) :
aPropSet( lcl_GetSheetLinkMap() ),
pDocShell( pDocSh ),
aFileName( rName )
@@ -1045,8 +1045,8 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException)
//------------------------------------------------------------------------
-ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const String& rA,
- const String& rT, const String& rI) :
+ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
+ const OUString& rT, const OUString& rI) :
pDocShell( pDocSh ),
aAppl( rA ),
aTopic( rT ),
commit dc2710a57eb7d65c03df40a54fafe0fb4a7e29d9
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 3 13:04:19 2013 +0200
convert sc/inc/nameuno.hxx from String to OUString
Change-Id: I99faf0c59c890a1de0e038053e2d97bf1a017270
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index 7a5c619..33def64 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -60,20 +60,20 @@ class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper6<
private:
rtl::Reference< ScNamedRangesObj > mxParent;
ScDocShell* pDocShell;
- String aName;
+ OUString aName;
com::sun::star::uno::Reference< com::sun::star::container::XNamed > mxSheet;
private:
friend class ScVbaName;
ScRangeData* GetRangeData_Impl();
- void Modify_Impl( const String* pNewName,
- const ScTokenArray* pNewTokens, const String* pNewContent,
+ void Modify_Impl( const OUString* pNewName,
+ const ScTokenArray* pNewTokens, const OUString* pNewContent,
const ScAddress* pNewPos, const sal_uInt16* pNewType,
const formula::FormulaGrammar::Grammar eGrammar );
SCTAB GetTab_Impl();
public:
- ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const String& rNm,
+ ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const OUString& rNm,
com::sun::star::uno::Reference< com::sun::star::container::XNamed > xSheet = com::sun::star::uno::Reference< com::sun::star::container::XNamed > ());
virtual ~ScNamedRangeObj();
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index a14584b..a2e706d 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -85,7 +85,7 @@ static bool lcl_UserVisibleName(const ScRangeData& rData)
return !rData.HasType(RT_DATABASE);
}
-ScNamedRangeObj::ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const String& rNm, Reference<container::XNamed> xSheet):
+ScNamedRangeObj::ScNamedRangeObj( rtl::Reference< ScNamedRangesObj > xParent, ScDocShell* pDocSh, const OUString& rNm, Reference<container::XNamed> xSheet):
mxParent(xParent),
pDocShell( pDocSh ),
aName( rNm ),
@@ -149,7 +149,7 @@ SCTAB ScNamedRangeObj::GetTab_Impl()
// sheet::XNamedRange
-void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* pNewTokens, const String* pNewContent,
+void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* pNewTokens, const OUString* pNewContent,
const ScAddress* pNewPos, const sal_uInt16* pNewType,
const formula::FormulaGrammar::Grammar eGrammar )
{
@@ -224,7 +224,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
SolarMutexGuard aGuard;
//! Formeln anpassen ?????
- String aNewStr(aNewName);
+ OUString aNewStr(aNewName);
// GRAM_PODF_A1 for API compatibility.
Modify_Impl( &aNewStr, NULL, NULL, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
@@ -247,7 +247,7 @@ void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- String aContStr(aContent);
+ OUString aContStr(aContent);
// GRAM_PODF_A1 for API compatibility.
Modify_Impl( NULL, NULL, &aContStr, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
}
commit 165b06cde6db152a4d3e781f97830c6d4ee8297a
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 3 13:00:13 2013 +0200
convert sc/inc/progress.hx from String to OUString
Change-Id: I7bf7966706f6039f9f9469647d013b77d78e4bb5
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index 4ea65bc..4d3194f 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -75,7 +75,7 @@ public:
static sal_uLong GetGlobalPercent() { return nGlobalPercent; }
ScProgress( SfxObjectShell* pObjSh,
- const String& rText,
+ const OUString& rText,
sal_uLong nRange, sal_Bool bAllDocs = false,
sal_Bool bWait = sal_True );
~ScProgress();
@@ -87,7 +87,7 @@ public:
/// might be NULL!
SfxProgress* GetSfxProgress() const { return pProgress; }
- sal_Bool SetStateText( sal_uLong nVal, const String &rVal, sal_uLong nNewRange = 0 )
+ sal_Bool SetStateText( sal_uLong nVal, const OUString &rVal, sal_uLong nNewRange = 0 )
{
if ( pProgress )
{
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 8085727..de74aab 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -72,7 +72,7 @@ static bool lcl_HasControllersLocked( SfxObjectShell& rObjSh )
return false;
}
-ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
+ScProgress::ScProgress( SfxObjectShell* pObjSh, const OUString& rText,
sal_uLong nRange, sal_Bool bAllDocs, sal_Bool bWait )
{
commit 72b9dd277bab328c4d9227439e27e8c29b43fa7d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 3 10:52:29 2013 +0200
convert sc/inc/r*.hxx from String to OUString
Change-Id: Iaae69c0914917d9d5851f227be28ff5cd098da8b
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 6ff6150..785f7f4 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -38,14 +38,11 @@ public:
ScRangeList& operator=(const ScRangeList& rList);
void Append( const ScRange& rRange );
- sal_uInt16 Parse( const String&, ScDocument* = NULL,
+ sal_uInt16 Parse( const OUString&, ScDocument* = NULL,
sal_uInt16 nMask = SCA_VALID,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 );
- void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
- formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
- sal_Unicode cDelimiter = 0 ) const;
void Format( OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
sal_Unicode cDelimiter = 0 ) const;
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 007ed70..9b61b00 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -116,7 +116,6 @@ public:
RangeType GetType() const { return eType; }
bool HasType( RangeType nType ) const;
sal_uInt32 GetUnoType() const;
- SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
SC_DLLPUBLIC void GetSymbol( OUString& rSymbol, const ScAddress& rPos, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const;
void UpdateSymbol( OUStringBuffer& rBuffer, const ScAddress&,
@@ -145,8 +144,8 @@ public:
void ValidateTabRefs();
- static void MakeValidName( String& rName );
- SC_DLLPUBLIC static bool IsNameValid( const String& rName, ScDocument* pDoc );
+ static void MakeValidName( OUString& rName );
+ SC_DLLPUBLIC static bool IsNameValid( const OUString& rName, ScDocument* pDoc );
SCROW GetMaxRow() const;
SCCOL GetMaxCol() const;
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 486dab2..26fe589 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -46,45 +46,45 @@ public:
ScRangeUtil() {}
~ScRangeUtil() {}
- sal_Bool MakeArea ( const String& rAreaStr,
+ sal_Bool MakeArea ( const OUString& rAreaStr,
ScArea& rArea,
ScDocument* pDoc,
SCTAB nTab,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
- void CutPosString ( const String& theAreaStr,
- String& thePosStr ) const;
+ void CutPosString ( const OUString& theAreaStr,
+ OUString& thePosStr ) const;
- sal_Bool IsAbsTabArea ( const String& rAreaStr,
+ sal_Bool IsAbsTabArea ( const OUString& rAreaStr,
ScDocument* pDoc,
ScArea*** pppAreas = 0,
sal_uInt16* pAreaCount = 0,
sal_Bool bAcceptCellRef = false,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
- sal_Bool IsAbsArea ( const String& rAreaStr,
+ sal_Bool IsAbsArea ( const OUString& rAreaStr,
ScDocument* pDoc,
SCTAB nTab,
- String* pCompleteStr = 0,
+ OUString* pCompleteStr = 0,
ScRefAddress* pStartPos = 0,
ScRefAddress* pEndPos = 0,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
- sal_Bool IsRefArea ( const String&,
+ sal_Bool IsRefArea ( const OUString&,
ScDocument*,
SCTAB,
- String* = 0,
+ OUString* = 0,
ScRefAddress* = 0 ) const
{ return false; }
- sal_Bool IsAbsPos ( const String& rPosStr,
+ sal_Bool IsAbsPos ( const OUString& rPosStr,
ScDocument* pDoc,
SCTAB nTab,
- String* pCompleteStr = 0,
+ OUString* pCompleteStr = 0,
ScRefAddress* pPosTripel = 0,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const;
- sal_Bool MakeRangeFromName ( const String& rName,
+ sal_Bool MakeRangeFromName ( const OUString& rName,
ScDocument* pDoc,
SCTAB nCurTab,
ScRange& rRange,
@@ -302,7 +302,6 @@ public:
~ScAreaNameIterator() {}
bool Next( OUString& rName, ScRange& rRange );
- bool Next( String& rName, ScRange& rRange );
bool WasDBName() const { return !bFirstPass; }
};
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 232b251..e1b6e54 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -179,11 +179,11 @@ ScRangeList::~ScRangeList()
RemoveAll();
}
-sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask,
+sal_uInt16 ScRangeList::Parse( const OUString& rStr, ScDocument* pDoc, sal_uInt16 nMask,
formula::FormulaGrammar::AddressConvention eConv,
SCTAB nDefaultTab, sal_Unicode cDelimiter )
{
- if ( rStr.Len() )
+ if ( !rStr.isEmpty() )
{
if (!cDelimiter)
cDelimiter = ScCompiler::GetNativeSymbolChar(ocSep);
@@ -202,7 +202,7 @@ sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16
sal_uInt16 nTCount = comphelper::string::getTokenCount(rStr, cDelimiter);
for ( sal_uInt16 i=0; i<nTCount; i++ )
{
- aOne = rStr.GetToken( i, cDelimiter );
+ aOne = rStr.getToken( i, cDelimiter );
aRange.aStart.SetTab( nTab ); // Default Tab wenn nicht angegeben
sal_uInt16 nRes = aRange.ParseAny( aOne, pDoc, eConv );
sal_uInt16 nEndRangeBits = SCA_VALID_COL2 | SCA_VALID_ROW2 | SCA_VALID_TAB2;
@@ -224,19 +224,6 @@ sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16
return 0;
}
-void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc,
- formula::FormulaGrammar::AddressConvention eConv,
- sal_Unicode cDelimiter ) const
-{
- rStr.Erase();
-
- if (!cDelimiter)
- cDelimiter = ScCompiler::GetNativeSymbolChar(ocSep);
-
- FormatString func(rStr, nFlags, pDoc, eConv, cDelimiter);
- for_each(maRanges.begin(), maRanges.end(), func);
-}
-
void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc,
formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cDelimiter ) const
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index f4668bd..b963eab 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -234,20 +234,11 @@ void ScRangeData::GuessPosition()
aPos = ScAddress( (SCCOL)(-nMinCol), (SCROW)(-nMinRow), (SCTAB)(-nMinTab) );
}
-void ScRangeData::GetSymbol( String& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
+void ScRangeData::GetSymbol( OUString& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
{
ScCompiler aComp(pDoc, aPos, *pCode);
aComp.SetGrammar(eGrammar);
- OUString aTmpSymbol (rSymbol);
- aComp.CreateStringFromTokenArray( aTmpSymbol );
- rSymbol = aTmpSymbol;
-}
-
-void ScRangeData::GetSymbol( OUString& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
-{
- String aStr;
- GetSymbol(aStr, eGrammar);
- rSymbol = aStr;
+ aComp.CreateStringFromTokenArray( rSymbol );
}
void ScRangeData::GetSymbol( OUString& rSymbol, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) const
@@ -417,27 +408,27 @@ void ScRangeData::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nLocal
rCxt.maUpdatedNames.setUpdatedName(nLocalTab, nIndex);
}
-void ScRangeData::MakeValidName( String& rName )
+void ScRangeData::MakeValidName( OUString& rName )
{
// strip leading invalid characters
xub_StrLen nPos = 0;
- xub_StrLen nLen = rName.Len();
+ xub_StrLen nLen = rName.getLength();
while ( nPos < nLen && !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME) )
++nPos;
if ( nPos>0 )
- rName.Erase(0,nPos);
+ rName = rName.copy(nPos);
// if the first character is an invalid start character, precede with '_'
- if ( rName.Len() && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) )
- rName.Insert('_',0);
+ if ( !rName.isEmpty() && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) )
+ rName = "_" + rName;
// replace invalid with '_'
- nLen = rName.Len();
+ nLen = rName.getLength();
for (nPos=0; nPos<nLen; nPos++)
{
if ( !ScCompiler::IsCharFlagAllConventions( rName, nPos, SC_COMPILER_C_NAME) )
- rName.SetChar( nPos, '_' );
+ rName = rName.replaceAt( nPos, 1, "_" );
}
// Ensure that the proposed name is not a reference under any convention,
@@ -453,21 +444,23 @@ void ScRangeData::MakeValidName( String& rName )
{
//! Range Parse is partially valid also with invalid sheet name,
//! Address Parse dito, during compile name would generate a #REF!
- if ( rName.SearchAndReplace( '.', '_' ) == STRING_NOTFOUND )
- rName.Insert('_',0);
+ if ( rName.indexOf( '.' ) == -1 )
+ rName = rName.replaceFirst( ".", "_" );
+ else
+ rName = "_" + rName;
}
}
}
-bool ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
+bool ScRangeData::IsNameValid( const OUString& rName, ScDocument* pDoc )
{
/* XXX If changed, sc/source/filter/ftools/ftools.cxx
* ScfTools::ConvertToScDefinedName needs to be changed too. */
sal_Char a('.');
- if (rName.Search(a, 0) != STRING_NOTFOUND)
+ if (rName.indexOf(a) != -1)
return false;
xub_StrLen nPos = 0;
- xub_StrLen nLen = rName.Len();
+ xub_StrLen nLen = rName.getLength();
if ( !nLen || !ScCompiler::IsCharFlagAllConventions( rName, nPos++, SC_COMPILER_C_CHAR_NAME ) )
return false;
while ( nPos < nLen )
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 9781dff..b81ce98 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -31,7 +31,7 @@
using ::formula::FormulaGrammar;
using namespace ::com::sun::star;
-sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr,
+sal_Bool ScRangeUtil::MakeArea( const OUString& rAreaStr,
ScArea& rArea,
ScDocument* pDoc,
SCTAB nTab,
@@ -43,18 +43,17 @@ sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr,
// but it is only used in the consolidate dialog. Ignore for now.
sal_Bool nSuccess = false;
- sal_uInt16 nPointPos = rAreaStr.Search('.');
- sal_uInt16 nColonPos = rAreaStr.Search(':');
+ sal_Int32 nPointPos = rAreaStr.indexOf('.');
+ sal_Int32 nColonPos = rAreaStr.indexOf(':');
String aStrArea( rAreaStr );
ScRefAddress startPos;
ScRefAddress endPos;
- if ( nColonPos == STRING_NOTFOUND )
- if ( nPointPos != STRING_NOTFOUND )
- {
- aStrArea += ':';
- aStrArea += rAreaStr.Copy( nPointPos+1 ); // do not include '.' in copy
- }
+ if ( nColonPos == -1 && nPointPos != -1 )
+ {
+ aStrArea += ':';
+ aStrArea += rAreaStr.copy( nPointPos+1 ); // do not include '.' in copy
+ }
nSuccess = ConvertDoubleRef( pDoc, aStrArea, nTab, startPos, endPos, rDetails );
@@ -66,24 +65,24 @@ sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr,
return nSuccess;
}
-void ScRangeUtil::CutPosString( const String& theAreaStr,
- String& thePosStr ) const
+void ScRangeUtil::CutPosString( const OUString& theAreaStr,
+ OUString& thePosStr ) const
{
String aPosStr;
// BROKEN BROKEN BROKEN
// but it is only used in the consolidate dialog. Ignore for now.
- sal_uInt16 nColonPos = theAreaStr.Search(':');
+ sal_Int32 nColonPos = theAreaStr.indexOf(':');
- if ( nColonPos != STRING_NOTFOUND )
- aPosStr = theAreaStr.Copy( 0, nColonPos ); // do not include ':' in copy
+ if ( nColonPos != -1 )
+ aPosStr = theAreaStr.copy( 0, nColonPos ); // do not include ':' in copy
else
aPosStr = theAreaStr;
thePosStr = aPosStr;
}
-sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
+sal_Bool ScRangeUtil::IsAbsTabArea( const OUString& rAreaStr,
ScDocument* pDoc,
ScArea*** pppAreas,
sal_uInt16* pAreaCount,
@@ -170,10 +169,10 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
return bStrOk;
}
-sal_Bool ScRangeUtil::IsAbsArea( const String& rAreaStr,
+sal_Bool ScRangeUtil::IsAbsArea( const OUString& rAreaStr,
ScDocument* pDoc,
SCTAB nTab,
- String* pCompleteStr,
+ OUString* pCompleteStr,
ScRefAddress* pStartPos,
ScRefAddress* pEndPos,
ScAddress::Details const & rDetails ) const
@@ -195,7 +194,7 @@ sal_Bool ScRangeUtil::IsAbsArea( const String& rAreaStr,
if ( pCompleteStr )
{
*pCompleteStr = startPos.GetRefString( pDoc, MAXTAB+1, rDetails );
- *pCompleteStr += ':';
+ *pCompleteStr += ":";
*pCompleteStr += endPos .GetRefString( pDoc, nTab, rDetails );
}
@@ -209,10 +208,10 @@ sal_Bool ScRangeUtil::IsAbsArea( const String& rAreaStr,
return bIsAbsArea;
}
-sal_Bool ScRangeUtil::IsAbsPos( const String& rPosStr,
+sal_Bool ScRangeUtil::IsAbsPos( const OUString& rPosStr,
ScDocument* pDoc,
SCTAB nTab,
- String* pCompleteStr,
+ OUString* pCompleteStr,
ScRefAddress* pPosTripel,
ScAddress::Details const & rDetails ) const
{
@@ -235,7 +234,7 @@ sal_Bool ScRangeUtil::IsAbsPos( const String& rPosStr,
}
sal_Bool ScRangeUtil::MakeRangeFromName (
- const String& rName,
+ const OUString& rName,
ScDocument* pDoc,
SCTAB nCurTab,
ScRange& rRange,
@@ -276,7 +275,7 @@ sal_Bool ScRangeUtil::MakeRangeFromName (
pData = pDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
if (pData)
{
- String aStrArea;
+ OUString aStrArea;
ScRefAddress aStartPos;
ScRefAddress aEndPos;
@@ -1023,16 +1022,6 @@ ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) :
bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange )
{
- // Just a wrapper for OUString for now. It should replace the method
- // below eventually.
- String aTmp;
- bool bRet = Next(aTmp, rRange);
- rName = aTmp;
- return bRet;
-}
-
-bool ScAreaNameIterator::Next( String& rName, ScRange& rRange )
-{
for (;;)
{
if ( bFirstPass ) // erst Bereichsnamen
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index a0b80b7..fc2b1d0 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -396,7 +396,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertBuiltInName( sal_Unicode cBuiltIn, XclTo
XclExpNameRef xName( new XclExpName( GetRoot(), cBuiltIn ) );
xName->SetTokenArray( xTokArr );
xName->SetLocalTab( nScTab );
- String sSymbol;
+ OUString sSymbol;
rRangeList.Format( sSymbol, SCR_ABS_3D, GetDocPtr(), ::formula::FormulaGrammar::CONV_XL_A1 );
xName->SetSymbol( sSymbol );
return Append( xName );
@@ -564,7 +564,7 @@ sal_uInt16 XclExpNameManagerImpl::CreateName( SCTAB nTab, const ScRangeData& rRa
XclTokenArrayRef xTokArr = GetFormulaCompiler().CreateFormula( EXC_FMLATYPE_NAME, *pScTokArr );
xName->SetTokenArray( xTokArr );
- String sSymbol;
+ OUString sSymbol;
rRangeData.GetSymbol( sSymbol, formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );
xName->SetSymbol( sSymbol );
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 7c67f77..f8de937 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -764,7 +764,7 @@ OString XclXmlUtils::ToOString( const ScRange& rRange )
OString XclXmlUtils::ToOString( const ScRangeList& rRangeList )
{
- String s;
+ OUString s;
rRangeList.Format(s, SCA_VALID, NULL, FormulaGrammar::CONV_XL_A1, ' ');
return ToOString( s );
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 45e2677..3805010 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4092,7 +4092,7 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName)
FormulaGrammar::CONV_OOO, ' ', false, SCA_ABS_3D);
AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sBaseCellAddress);
- String sSymbol;
+ OUString sSymbol;
it->second->GetSymbol(sSymbol, pDoc->GetStorageGrammar());
OUString sTempSymbol(sSymbol);
ScRange aRange;
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index bc608f0..364acca 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -55,9 +55,9 @@ ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent, ScDocument
OUString ScCondFormatManagerWindow::createEntryString(const ScConditionalFormat& rFormat)
{
ScRangeList aRange = rFormat.GetRange();
- String aStr;
+ OUString aStr;
aRange.Format(aStr, SCA_VALID, mpDoc, mpDoc->GetAddressConvention());
- aStr += '\t';
+ aStr += "\t";
aStr += ScCondFormatHelper::GetExpression(rFormat, aRange.GetTopLeftCorner());
return aStr;
}
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 8094c1c..569f94b 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -208,7 +208,7 @@ void ScConsolidateDlg::Init()
{
pAreaData = new ScAreaData[nAreaDataCount];
- String aStrName;
+ OUString aStrName;
sal_uInt16 nAt = 0;
ScRange aRange;
ScAreaNameIterator aIter( pDoc );
@@ -330,9 +330,9 @@ sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
((pEd != pEdDataArea) && (pEd != pEdDestArea)) )
return false;
- SCTAB nTab = pViewData->GetTabNo();
- sal_Bool bEditOk = false;
- String theCompleteStr;
+ SCTAB nTab = pViewData->GetTabNo();
+ sal_Bool bEditOk = false;
+ OUString theCompleteStr;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( pEd == pEdDataArea )
@@ -342,7 +342,7 @@ sal_Bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
}
else if ( pEd == pEdDestArea )
{
- String aPosStr;
+ OUString aPosStr;
pRangeUtil->CutPosString( pEd->GetText(), aPosStr );
bEditOk = pRangeUtil->IsAbsPos( aPosStr, pDoc,
@@ -532,7 +532,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
{
if ( static_cast<size_t>(nSelPos) <= nAreaDataCount )
{
- String aString( pAreaData[nSelPos-1].aStrArea );
+ OUString aString( pAreaData[nSelPos-1].aStrArea );
if ( pLb == pLbDestArea )
pRangeUtil->CutPosString( aString, aString );
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index f2f4e77..978e840 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -119,7 +119,7 @@ void ScFilterOptionsMgr::Init()
pLbCopyArea->InsertEntry( rStrUndefined, 0 );
ScAreaNameIterator aIter( pDoc );
- String aName;
+ OUString aName;
ScRange aRange;
while ( aIter.Next( aName, aRange ) )
{
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 44cfb2f..fe16f96 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4916,9 +4916,9 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
ScDocument* pDoc = rDocShell.GetDocument();
if (!pDoc->HasValueData( nPosX, nPosY, nTab ))
{
- String aName = pDoc->GetString(nPosX, nPosY, nTab);
+ OUString aName = pDoc->GetString(nPosX, nPosY, nTab);
ScRangeData::MakeValidName(aName);
- if (aName.Len())
+ if (!aName.isEmpty())
{
String aContent(ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format(SCR_ABS_3D, pDoc));
@@ -4926,7 +4926,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
ScRangeData* pOld = rList.findByUpperName(ScGlobal::pCharClass->uppercase(aName));
if (pOld)
{
- String aOldStr;
+ OUString aOldStr;
pOld->GetSymbol( aOldStr );
if (aOldStr != aContent)
{
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index c5dd453..6d3d4ef 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2158,7 +2158,7 @@ long ScDocShell::DdeSetData( const OUString& rItem,
// only check for valid item string - range is parsed again in ScServerObject ctor
// named range?
- String aPos = rItem;
+ OUString aPos = rItem;
ScRangeName* pRange = aDocument.GetRangeName();
if( pRange )
{
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 6ee849e..8548f06 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -446,7 +446,7 @@ void ScExternalRefCache::Table::setCachedCellRange(SCCOL nCol1, SCROW nRow1, SCC
else
maCachedRanges.Join(aRange);
- String aStr;
+ OUString aStr;
maCachedRanges.Format(aStr, SCA_VALID);
}
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 75bd6ac..40d3cba 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -145,7 +145,7 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
SCTAB nTab = ScDocShell::GetCurTab();
aRange.aStart.SetTab( nTab );
- String aPos( rPos );
+ OUString aPos( rPos );
// Benannter Bereich?
ScRangeName* pRange = pDoc->GetRangeName();
if( pRange )
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 7c5b843..1ab6671 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -149,7 +149,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
pScDoc->LimitChartIfAll( aRangeListRef ); // limit whole columns/rows to used area
// update string from modified ranges. The ranges must be in the current formula syntax.
- String aTmpStr;
+ OUString aTmpStr;
aRangeListRef->Format( aTmpStr, SCR_ABS_3D, pScDoc, pScDoc->GetAddressConvention() );
aRangeString = aTmpStr;
@@ -468,7 +468,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
ScRangeList aRanges;
aMultiMark.FillRangeListWithMarks( &aRanges, false );
- String aStr;
+ OUString aStr;
ScDocument* pDocument = pViewSh->GetViewData()->GetDocument();
aRanges.Format( aStr, SCR_ABS_3D, pDocument, pDocument->GetAddressConvention() );
aRangeString = aStr;
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 7bcb55f..1876978 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -696,10 +696,10 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
ScRefAddress theStartPos;
ScRefAddress theEndPos;
- String theAreaStr( mpEdCopyFrom->GetText() );
- sal_Bool bAreaOk = false;
+ OUString theAreaStr( mpEdCopyFrom->GetText() );
+ sal_Bool bAreaOk = false;
- if ( theAreaStr.Len() > 0 )
+ if ( !theAreaStr.isEmpty() )
{
bAreaOk = pRangeUtil->IsAbsArea( theAreaStr,
pDoc,
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index ca89a95..02f9c0b 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -432,8 +432,8 @@ void ScPrintAreasDlg::Impl_FillLists()
//------------------------------------------------------
// Selektion holen und String in PrintArea-ListBox merken
//------------------------------------------------------
- ScRange aRange;
- String aStrRange;
+ ScRange aRange;
+ OUString aStrRange;
sal_Bool bSimple = sal_True;
if ( pViewData )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 927a811..659e3a6 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2595,9 +2595,9 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
break;
case SC_WID_UNO_ABSNAME:
{
- String sRet;
+ OUString sRet;
aRanges.Format(sRet, SCR_ABS_3D, pDocShell->GetDocument());
- rAny <<= OUString(sRet);
+ rAny <<= sRet;
}
}
}
@@ -4288,7 +4288,7 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString()
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- String aString;
+ OUString aString;
ScDocShell* pDocSh = GetDocShell();
const ScRangeList& rRanges = GetRangeList();
if (pDocSh)
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index e4b485e..9869d97 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -248,14 +248,14 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
xReceiver.set( xCompSupp->getComponent(), uno::UNO_QUERY );
if( xReceiver.is())
{
- String sRangeStr;
+ OUString sRangeStr;
xNewRanges->Format(sRangeStr, SCR_ABS_3D, pDoc);
// connect
- if( sRangeStr.Len() )
+ if( !sRangeStr.isEmpty() )
xReceiver->attachDataProvider( xDataProvider );
else
- sRangeStr = OUString("all");
+ sRangeStr = "all";
uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier( pDocShell->GetModel(), uno::UNO_QUERY );
xReceiver->attachNumberFormatsSupplier( xNumberFormatsSupplier );
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index ae7a342..a14584b 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -176,7 +176,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p
if (pNewName)
aInsName = *pNewName;
- String aContent; // Content string based =>
+ OUString aContent; // Content string based =>
pOld->GetSymbol( aContent, eGrammar); // no problems with changed positions and such.
if (pNewContent)
aContent = *pNewContent;
@@ -235,7 +235,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- String aContent;
+ OUString aContent;
ScRangeData* pData = GetRangeData_Impl();
if (pData)
// GRAM_PODF_A1 for API compatibility.
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index cefd6b2..19fa2e3 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -66,7 +66,7 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException)
{
- String aPrintArea;
+ OUString aPrintArea;
uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW );
uno::Sequence< table::CellRangeAddress > aSeq = xPrintAreas->getPrintAreas();
sal_Int32 nCount = aSeq.getLength();
commit f8f90a70ab58426058556c24c64db1f5a85a5574
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 2 17:31:01 2013 +0200
convert sc/inc/s*.hxx from String to OUString
Change-Id: Ie5e439ac664e9725bad9366d31990279b411c475
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index acfa824..03bc58d 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -66,7 +66,7 @@ class AbstractScAutoFormatDlg : public VclAbstractDialog
{
public:
virtual sal_uInt16 GetIndex() const = 0 ;
- virtual String GetCurrFormatName() = 0;
+ virtual OUString GetCurrFormatName() = 0;
};
class AbstractScColRowLabelDlg : public VclAbstractDialog
@@ -103,11 +103,11 @@ public:
class AbstractScDataPilotServiceDlg : public VclAbstractDialog
{
public:
- virtual String GetServiceName() const = 0;
- virtual String GetParSource() const = 0 ;
- virtual String GetParName() const = 0 ;
- virtual String GetParUser() const = 0;
- virtual String GetParPass() const = 0;
+ virtual OUString GetServiceName() const = 0;
+ virtual OUString GetParSource() const = 0 ;
+ virtual OUString GetParName() const = 0 ;
+ virtual OUString GetParUser() const = 0;
+ virtual OUString GetParPass() const = 0;
};
class AbstractScDeleteCellDlg : public VclAbstractDialog
@@ -138,7 +138,7 @@ public:
virtual double GetStart() const = 0;
virtual double GetStep() const = 0;
virtual double GetMax() const = 0;
- virtual String GetStartStr() const = 0;
+ virtual OUString GetStartStr() const = 0;
virtual void SetEdStartValEnabled(sal_Bool bFlag=false) = 0;
};
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index 33e5a26..a4893cf 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -28,7 +28,7 @@
/** Extended settings for the document, used in import/export filters. */
struct ScExtDocSettings
{
- String maGlobCodeName; ///< Global codename (VBA module name).
+ OUString maGlobCodeName; ///< Global codename (VBA module name).
double mfTabBarWidth; ///< Width of the tabbar, relative to frame window width (0.0 ... 1.0).
sal_uInt32 mnLinkCnt; ///< Recursive counter for loading external documents.
SCTAB mnDisplTab; ///< Index of displayed sheet.
@@ -102,9 +102,9 @@ public:
/** @return the number of sheet codenames. */
SCTAB GetCodeNameCount() const;
/** @return the specified codename (empty string = no codename). */
- const String& GetCodeName( SCTAB nTab ) const;
+ const OUString& GetCodeName( SCTAB nTab ) const;
/** Appends a codename for a sheet. */
- void SetCodeName( SCTAB nTab, const String& rCodeName );
+ void SetCodeName( SCTAB nTab, const OUString& rCodeName );
private:
::std::auto_ptr< ScExtDocOptionsImpl > mxImpl;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index f15b054..a2ae5ec 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -216,9 +216,9 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO
// communication with function-autopilot
void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd );
void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd );
- void InputReplaceSelection( const String& rStr );
- String InputGetFormulaStr();
- void ActivateInputWindow( const String* pStr = NULL,
+ void InputReplaceSelection( const OUString& rStr );
+ OUString InputGetFormulaStr();
+ void ActivateInputWindow( const OUString* pStr = NULL,
sal_Bool bMatrix = false );
void InitFormEditData();
diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx
index 85273ee..9607dc8 100644
--- a/sc/inc/strload.hxx
+++ b/sc/inc/strload.hxx
@@ -32,10 +32,10 @@ public:
FreeResource();
}
- const String& GetString() const { return theStr; }
+ const OUString& GetString() const { return theStr; }
private:
- String theStr;
+ OUString theStr;
};
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 29ab960..a3c8945 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -218,13 +218,13 @@ private:
ScStyleObj(); // disabled
public:
- ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName);
+ ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName);
virtual ~ScStyleObj();
// created by getImplementation:
sal_Bool IsInserted() const { return pDocShell != NULL; }
SfxStyleFamily GetFamily() const { return eFamily; }
- void InitDoc( ScDocShell* pNewDocSh, const String& rNewName );
+ void InitDoc( ScDocShell* pNewDocSh, const OUString& rNewName );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 6c2cd27..146c4df 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1536,14 +1536,14 @@ void ScModule::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd )
pHdl->InputSetSelection( nStart, nEnd );
}
-void ScModule::InputReplaceSelection( const String& rStr )
+void ScModule::InputReplaceSelection( const OUString& rStr )
{
ScInputHandler* pHdl = GetInputHdl();
if (pHdl)
pHdl->InputReplaceSelection( rStr );
}
-String ScModule::InputGetFormulaStr()
+OUString ScModule::InputGetFormulaStr()
{
ScInputHandler* pHdl = GetInputHdl();
String aStr;
@@ -1552,7 +1552,7 @@ String ScModule::InputGetFormulaStr()
return aStr;
}
-void ScModule::ActivateInputWindow( const String* pStrFormula, sal_Bool bMatrix )
+void ScModule::ActivateInputWindow( const OUString* pStrFormula, sal_Bool bMatrix )
{
ScInputHandler* pHdl = GetInputHdl();
if ( pHdl )
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 7a4529d..4942047 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -165,7 +165,7 @@ sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const
return pDlg->GetIndex();
}
-String AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
+OUString AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
{
return pDlg->GetCurrFormatName();
}
@@ -210,27 +210,27 @@ void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rNa
pDlg->AppendNamedRange(rName);
}
-String AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetServiceName() const
{
return pDlg->GetServiceName();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParSource() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParSource() const
{
return pDlg->GetParSource();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParName() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParName() const
{
return pDlg->GetParName();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParUser() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParUser() const
{
return pDlg->GetParUser();
}
-String AbstractScDataPilotServiceDlg_Impl::GetParPass() const
+OUString AbstractScDataPilotServiceDlg_Impl::GetParPass() const
{
return pDlg->GetParPass();
}
@@ -280,7 +280,7 @@ double AbstractScFillSeriesDlg_Impl::GetMax() const
return pDlg->GetMax();
}
-String AbstractScFillSeriesDlg_Impl::GetStartStr() const
+OUString AbstractScFillSeriesDlg_Impl::GetStartStr() const
{
return pDlg->GetStartStr();
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 134ae40..49d328c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -116,7 +116,7 @@ class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg
{
DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg)
virtual sal_uInt16 GetIndex() const;
- virtual String GetCurrFormatName();
+ virtual OUString GetCurrFormatName();
};
class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg
@@ -154,11 +154,11 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy
class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg)
- virtual String GetServiceName() const;
- virtual String GetParSource() const;
- virtual String GetParName() const;
- virtual String GetParUser() const;
- virtual String GetParPass() const;
+ virtual OUString GetServiceName() const;
+ virtual OUString GetParSource() const;
+ virtual OUString GetParName() const;
+ virtual OUString GetParUser() const;
+ virtual OUString GetParPass() const;
};
class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg
@@ -189,7 +189,7 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
virtual double GetStart() const;
virtual double GetStep() const;
virtual double GetMax() const;
- virtual String GetStartStr() const;
+ virtual OUString GetStartStr() const;
virtual void SetEdStartValEnabled(sal_Bool bFlag=false);
};
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index eaf2c05..88af941 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -940,7 +940,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c
// Default-ctor wird fuer die Reflection gebraucht
-ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName) :
+ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName) :
pPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() ),
pDocShell( pDocSh ),
eFamily( eFam ),
@@ -952,7 +952,7 @@ ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rN
pDocShell->GetDocument()->AddUnoObject(*this);
}
-void ScStyleObj::InitDoc( ScDocShell* pNewDocSh, const String& rNewName )
+void ScStyleObj::InitDoc( ScDocShell* pNewDocSh, const OUString& rNewName )
{
if ( pNewDocSh && !pDocShell )
{
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 933cf6e..03f969d 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1779,7 +1779,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( pOkItem->GetValue() ) // OK
{
- String aFormula;
+ OUString aFormula;
const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING );
const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX );
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 39670ca..4390d46 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -121,7 +121,7 @@ void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap )
/** Implementation struct for ScExtDocOptions containing all members. */
struct ScExtDocOptionsImpl
{
- typedef ::std::vector< String > StringVec;
+ typedef ::std::vector< OUString > StringVec;
ScExtDocSettings maDocSett; /// Global document settings.
ScExtTabSettingsCont maTabSett; /// Settings for all sheets.
@@ -193,13 +193,13 @@ SCTAB ScExtDocOptions::GetCodeNameCount() const
return static_cast< SCTAB >( mxImpl->maCodeNames.size() );
}
-const String& ScExtDocOptions::GetCodeName( SCTAB nTab ) const
+const OUString& ScExtDocOptions::GetCodeName( SCTAB nTab ) const
{
OSL_ENSURE( (0 <= nTab) && (nTab < GetCodeNameCount()), "ScExtDocOptions::GetCodeName - invalid sheet index" );
- return ((0 <= nTab) && (nTab < GetCodeNameCount())) ? mxImpl->maCodeNames[ static_cast< size_t >( nTab ) ] : EMPTY_STRING;
+ return ((0 <= nTab) && (nTab < GetCodeNameCount())) ? mxImpl->maCodeNames[ static_cast< size_t >( nTab ) ] : EMPTY_OUSTRING;
}
-void ScExtDocOptions::SetCodeName( SCTAB nTab, const String& rCodeName )
+void ScExtDocOptions::SetCodeName( SCTAB nTab, const OUString& rCodeName )
{
OSL_ENSURE( nTab >= 0, "ScExtDocOptions::SetCodeName - invalid sheet index" );
if( nTab >= 0 )
commit f1503007a8daaa3dcd561248740d285804313d9d
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 2 16:36:28 2013 +0200
convert sc/inc/t*.hxx from String to OUString
Change-Id: I23838bc08a625ebf438f0c6352a1bf86c728713b
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fc8ae3a..7ae03f2 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -283,8 +283,8 @@ public:
const OUString& GetLinkTab() const { return aLinkTab; }
sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; }
- void SetLink( sal_uInt8 nMode, const String& rDoc, const String& rFlt,
- const String& rOpt, const String& rTab, sal_uLong nRefreshDelay );
+ void SetLink( sal_uInt8 nMode, const OUString& rDoc, const OUString& rFlt,
+ const OUString& rOpt, const OUString& rTab, sal_uLong nRefreshDelay );
void GetName( OUString& rName ) const;
void SetName( const OUString& rNewName );
@@ -299,7 +299,7 @@ public:
const OUString& GetPageStyle() const { return aPageStyle; }
void SetPageStyle( const OUString& rName );
- void PageStyleModified( const String& rNewName );
+ void PageStyleModified( const OUString& rNewName );
bool IsProtected() const;
void SetProtection(const ScTableProtection* pProtect);
@@ -322,7 +322,7 @@ public:
bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const;
- bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
+ bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString,
ScSetStringParam* pParam = NULL );
void SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
@@ -532,7 +532,7 @@ public:
void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
double nStepValue, double nMaxValue, ScProgress* pProgress);
- String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY );
+ OUString GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY );
void UpdateSelectionFunction( ScFunctionData& rData,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
@@ -541,7 +541,7 @@ public:
void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
sal_uInt16 nFormatNo );
void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData);
- void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // from sw
+ void ScReplaceTabsStr( OUString& rStr, const OUString& rSrch, const OUString& rRepl ); // from sw
bool SearchAndReplace(
const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark,
ScRangeList& rMatchedRanges, OUString& rUndoStr, ScDocument* pUndoDoc);
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index a0e1720..aabb2e2 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -43,10 +43,10 @@ private:
public:
TYPEINFO();
- ScTableLink( ScDocShell* pDocSh, const String& rFile,
- const String& rFilter, const String& rOpt, sal_uLong nRefresh );
- ScTableLink( SfxObjectShell* pShell, const String& rFile,
- const String& rFilter, const String& rOpt, sal_uLong nRefresh );
+ ScTableLink( ScDocShell* pDocSh, const OUString& rFile,
+ const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh );
+ ScTableLink( SfxObjectShell* pShell, const OUString& rFile,
+ const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh );
virtual ~ScTableLink();
virtual void Closed();
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
@@ -54,8 +54,8 @@ public:
virtual void Edit( Window*, const Link& rEndEditHdl );
- sal_Bool Refresh(const String& rNewFile, const String& rNewFilter,
- const String* pNewOptions /* = NULL */, sal_uLong nNewRefresh );
+ sal_Bool Refresh(const OUString& rNewFile, const OUString& rNewFilter,
+ const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh );
void SetInCreate(bool bSet) { bInCreate = bSet; }
void SetAddUndo(bool bSet) { bAddUndo = bSet; }
void SetPaint(bool bSet) { bDoPaint = bSet; }
@@ -80,10 +80,6 @@ private:
SfxObjectShellRef aRef;
SfxMedium* pMedium;
- static bool GetFilterName( const String& rFileName,
- String& rFilter, String& rOptions,
- bool bWithContent, bool bWithInteraction );
-
public:
ScDocumentLoader( const OUString& rFileName,
OUString& rFilterName, OUString& rOptions,
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index c0b0e3a..7703ffb 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -65,13 +65,13 @@ public:
virtual bool isPasswordEmpty() const = 0;
virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const = 0;
- virtual void setPassword(const String& aPassText) = 0;
+ virtual void setPassword(const OUString& aPassText) = 0;
virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
ScPasswordHash eHash, ScPasswordHash eHas2 = PASSHASH_UNSPECIFIED) const = 0;
virtual void setPasswordHash(
const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) = 0;
- virtual bool verifyPassword(const String& aPassText) const = 0;
+ virtual bool verifyPassword(const OUString& aPassText) const = 0;
};
class SC_DLLPUBLIC ScDocProtection : public ScPassHashProtectable
@@ -95,13 +95,13 @@ public:
virtual bool isPasswordEmpty() const;
virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
- virtual void setPassword(const String& aPassText);
+ virtual void setPassword(const OUString& aPassText);
virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
virtual void setPasswordHash(
const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
- virtual bool verifyPassword(const String& aPassText) const;
+ virtual bool verifyPassword(const OUString& aPassText) const;
bool isOptionEnabled(Option eOption) const;
void setOption(Option eOption, bool bEnabled);
@@ -152,13 +152,13 @@ public:
virtual bool isPasswordEmpty() const;
virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
- virtual void setPassword(const String& aPassText);
+ virtual void setPassword(const OUString& aPassText);
virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(
ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const;
virtual void setPasswordHash(
const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword,
ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED);
- virtual bool verifyPassword(const String& aPassText) const;
+ virtual bool verifyPassword(const OUString& aPassText) const;
bool isOptionEnabled(Option eOption) const;
void setOption(Option eOption, bool bEnabled);
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 9ef1c94..f18ee62 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -74,7 +74,7 @@ class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2<
{
private:
ScDocShell* pDocShell;
- String aNames[SC_LINKTARGETTYPE_COUNT];
+ OUString aNames[SC_LINKTARGETTYPE_COUNT];
public:
ScLinkTargetTypesObj(ScDocShell* pDocSh);
@@ -110,7 +110,7 @@ class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3<
private:
ScDocShell* pDocShell;
sal_uInt16 nType;
- String aName;
+ OUString aName;
public:
ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT);
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f827cc9..0c985fd 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -414,8 +414,8 @@ void ScTable::SetScenario( bool bFlag )
}
void ScTable::SetLink( sal_uInt8 nMode,
- const String& rDoc, const String& rFlt, const String& rOpt,
- const String& rTab, sal_uLong nRefreshDelay )
+ const OUString& rDoc, const OUString& rFlt, const OUString& rOpt,
+ const OUString& rTab, sal_uLong nRefreshDelay )
{
nLinkMode = nMode;
aLinkDoc = rDoc; // Datei
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 7bd7ac6..24fc92b 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1431,7 +1431,7 @@ bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
return bOk;
}
-bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString,
+bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const OUString& rString,
ScSetStringParam* pParam )
{
if (ValidColRow(nCol,nRow))
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 3a84fcb..0e5d7cd 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -921,7 +921,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
}
-String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY )
+OUString ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY )
{
OUString aValue;
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 7c667e0..0392b21 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1153,7 +1153,7 @@ void ScTable::SetPageStyle( const OUString& rName )
}
}
-void ScTable::PageStyleModified( const String& rNewName )
+void ScTable::PageStyleModified( const OUString& rNewName )
{
aPageStyle = rNewName;
InvalidateTextWidth(NULL, NULL, false, false); // don't know what was in the style before
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 9794540..2f3d4a3 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -399,7 +399,7 @@ bool ScDocProtection::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash
return mpImpl->hasPasswordHash(eHash, eHash2);
}
-void ScDocProtection::setPassword(const String& aPassText)
+void ScDocProtection::setPassword(const OUString& aPassText)
{
mpImpl->setPassword(aPassText);
}
@@ -415,7 +415,7 @@ void ScDocProtection::setPasswordHash(
mpImpl->setPasswordHash(aPassword, eHash, eHash2);
}
-bool ScDocProtection::verifyPassword(const String& aPassText) const
+bool ScDocProtection::verifyPassword(const OUString& aPassText) const
{
return mpImpl->verifyPassword(aPassText);
}
@@ -475,7 +475,7 @@ bool ScTableProtection::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHa
return mpImpl->hasPasswordHash(eHash, eHash2);
}
-void ScTableProtection::setPassword(const String& aPassText)
+void ScTableProtection::setPassword(const OUString& aPassText)
{
mpImpl->setPassword(aPassText);
}
@@ -491,7 +491,7 @@ void ScTableProtection::setPasswordHash(
mpImpl->setPasswordHash(aPassword, eHash, eHash2);
}
-bool ScTableProtection::verifyPassword(const String& aPassText) const
+bool ScTableProtection::verifyPassword(const OUString& aPassText) const
{
return mpImpl->verifyPassword(aPassText);
}
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 7dd32ea..92adbfa 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -58,8 +58,8 @@ TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink);
//------------------------------------------------------------------------
-ScTableLink::ScTableLink(ScDocShell* pDocSh, const String& rFile,
- const String& rFilter, const String& rOpt,
+ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile,
+ const OUString& rFilter, const OUString& rOpt,
sal_uLong nRefresh ):
::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
ScRefreshTimer( nRefresh ),
@@ -75,8 +75,8 @@ ScTableLink::ScTableLink(ScDocShell* pDocSh, const String& rFile,
pImpl->m_pDocSh = pDocSh;
}
-ScTableLink::ScTableLink(SfxObjectShell* pShell, const String& rFile,
- const String& rFilter, const String& rOpt,
+ScTableLink::ScTableLink(SfxObjectShell* pShell, const OUString& rFile,
+ const OUString& rFilter, const OUString& rOpt,
sal_uLong nRefresh ):
::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
ScRefreshTimer( nRefresh ),
@@ -165,12 +165,12 @@ sal_Bool ScTableLink::IsUsed() const
return pImpl->m_pDocSh->GetDocument()->HasLink( aFileName, aFilterName, aOptions );
}
-sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
- const String* pNewOptions, sal_uLong nNewRefresh )
+sal_Bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter,
+ const OUString* pNewOptions, sal_uLong nNewRefresh )
{
// Dokument laden
- if (!rNewFile.Len() || !rNewFilter.Len())
+ if (rNewFile.isEmpty() || rNewFilter.isEmpty())
return false;
OUString aNewUrl = ScGlobal::GetAbsDocName(rNewFile, pImpl->m_pDocSh);
@@ -443,8 +443,8 @@ OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium )
return EMPTY_STRING;
}
-bool ScDocumentLoader::GetFilterName( const String& rFileName,
- String& rFilter, String& rOptions,
+bool ScDocumentLoader::GetFilterName( const OUString& rFileName,
+ OUString& rFilter, OUString& rOptions,
bool bWithContent, bool bWithInteraction )
{
TypeId aScType = TYPE(ScDocShell);
@@ -492,24 +492,13 @@ bool ScDocumentLoader::GetFilterName( const String& rFileName,
rFilter = pSfxFilter->GetFilterName();
else
rFilter = ScDocShell::GetOwnFilterName(); // sonst Calc-Datei
- bOK = (rFilter.Len()>0);
+ bOK = !rFilter.isEmpty();
}
delete pMedium;
return bOK;
}
-bool ScDocumentLoader::GetFilterName(
- const OUString& rFilterName, OUString& rFilter, OUString& rOptions,
- bool bWithContent, bool bWithInteraction)
-{
- String aTmp1, aTmp2;
- bool bRet = GetFilterName(rFilterName, aTmp1, aTmp2, bWithContent, bWithInteraction);
- rFilter = aTmp1;
- rOptions = aTmp2;
- return bRet;
-}
-
void ScDocumentLoader::RemoveAppPrefix( OUString& rFilterName )
{
OUStringBuffer aAppPrefix;
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index f2f16b7..eef68a1 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -353,7 +353,7 @@ void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions)
ScTableLink* pLink = GetLink_Impl();
if (pLink)
{
- String aOptStr(FilterOptions);
+ OUString aOptStr(FilterOptions);
pLink->Refresh( aFileName, pLink->GetFilterName(), &aOptStr, pLink->GetRefreshDelay() );
}
}
commit 89c749db5ad927a1283f7d58d842e097902429a8
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 2 16:17:29 2013 +0200
convert sc/inc/view*.hxx from String to OUString
Change-Id: I15930932205fc39322a9e88b1739a741781a0e96
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index ebf4783..c5db568 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -91,8 +91,8 @@ public:
void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; }
ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; }
- void SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;}
- Color GetGridColor( String* pStrName = NULL ) const;
+ void SetGridColor( const Color& rCol, const OUString& rName ) { aGridCol = rCol; aGridColName = rName;}
+ Color GetGridColor( OUString* pStrName = NULL ) const;
const ScGridOptions& GetGridOptions() const { return aGridOpt; }
void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
@@ -106,7 +106,7 @@ private:
bool aOptArr [MAX_OPT];
ScVObjMode aModeArr [MAX_TYPE];
Color aGridCol;
- String aGridColName;
+ OUString aGridColName;
ScGridOptions aGridOpt;
};
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 1b70ef0..eddaed3 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -226,9 +226,9 @@ public:
sal_Bool MousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
sal_Bool MouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
- void RangeSelDone( const String& rText );
- void RangeSelAborted( const String& rText );
- void RangeSelChanged( const String& rText );
+ void RangeSelDone( const OUString& rText );
+ void RangeSelAborted( const OUString& rText );
+ void RangeSelChanged( const OUString& rText );
// XSelectionSupplier
virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection )
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index cd266a5..4f60f39 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -137,7 +137,7 @@ void ScViewOptions::SetDefaults()
aGridOpt.SetDefaults();
}
-Color ScViewOptions::GetGridColor( String* pStrName ) const
+Color ScViewOptions::GetGridColor( OUString* pStrName ) const
{
if ( pStrName )
*pStrName = aGridColName;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index e6486f9..12b8363 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -336,8 +336,8 @@ void ScTpContentOptions::InitGridOpt()
// also select grid color entry on subsequent calls
- String aName;
- Color aCol = pLocalOptions->GetGridColor( &aName );
+ OUString aName;
+ Color aCol = pLocalOptions->GetGridColor( &aName );
nSelPos = pColorLB->GetEntryPos( aCol );
if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index a6f79e3..741d795 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -357,7 +357,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_GRID ) );
else if ( aPropertyName.compareToAscii( SC_UNO_GRIDCOLOR ) == 0 )
{
- String aColorName;
+ OUString aColorName;
Color aColor = aViewOpt.GetGridColor(&aColorName);
aRet <<= static_cast<sal_Int64>(aColor.GetColor());
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 8df28ad..b718006 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2159,7 +2159,7 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionChangeListener(
}
}
-void ScTabViewObj::RangeSelDone( const String& rText )
+void ScTabViewObj::RangeSelDone( const OUString& rText )
{
sheet::RangeSelectionEvent aEvent;
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
@@ -2172,7 +2172,7 @@ void ScTabViewObj::RangeSelDone( const String& rText )
rListener->done( aEvent );
}
-void ScTabViewObj::RangeSelAborted( const String& rText )
+void ScTabViewObj::RangeSelAborted( const OUString& rText )
{
sheet::RangeSelectionEvent aEvent;
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
@@ -2185,7 +2185,7 @@ void ScTabViewObj::RangeSelAborted( const String& rText )
rListener->aborted( aEvent );
}
-void ScTabViewObj::RangeSelChanged( const String& rText )
+void ScTabViewObj::RangeSelChanged( const OUString& rText )
{
sheet::RangeSelectionEvent aEvent;
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 61be5da..199eaf1 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2673,7 +2673,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
pSettings[SC_SHOWGRID].Name = OUString(SC_UNO_SHOWGRID);
ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWGRID].Value, pOptions->GetOption( VOPT_GRID ) );
pSettings[SC_GRIDCOLOR].Name = OUString(SC_UNO_GRIDCOLOR);
- String aColorName;
+ OUString aColorName;
Color aColor = pOptions->GetGridColor(&aColorName);
pSettings[SC_GRIDCOLOR].Value <<= static_cast<sal_Int64>(aColor.GetColor());
pSettings[SC_SHOWPAGEBR].Name = OUString(SC_UNO_SHOWPAGEBR);
commit f49ed16f7b5fac08714f276acbe1d0c80661385b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 2 15:45:15 2013 +0200
convert sc/source/core/inc/*.hxx from String to OUString
Change-Id: I09e8386b5ed0a96829bc8d844905c0c021b6b1a7
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index d1ac330..b687e0e 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -71,7 +71,7 @@ private:
ScCellKeywordTranslator();
void init();
- void addToMap(const String& rKey, const sal_Char* pName,
+ void addToMap(const OUString& rKey, const sal_Char* pName,
const ::com::sun::star::lang::Locale& rLocale,
OpCode eOpCode = ocNone);
void addToMap(const TransItem* pItems, const ::com::sun::star::lang::Locale& rLocale);
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 309bac8..46072a4 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -37,9 +37,9 @@ static bool bIsInUpdate;
ScDocument* pDoc;
- String aAppl; // connection/ link data
- String aTopic;
- String aItem;
+ OUString aAppl; // connection/ link data
+ OUString aTopic;
+ OUString aItem;
sal_uInt8 nMode; // number format mode
bool bNeedUpdate; // is set, if update was not possible
@@ -50,7 +50,7 @@ public:
TYPEINFO();
ScDdeLink( ScDocument* pD,
- const String& rA, const String& rT, const String& rI,
+ const OUString& rA, const OUString& rT, const OUString& rI,
sal_uInt8 nM );
ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& rHdr );
ScDdeLink( ScDocument* pD, const ScDdeLink& rOther );
@@ -70,9 +70,9 @@ public:
const ScMatrix* GetResult() const;
void SetResult( const ScMatrixRef& pRes );
- const String& GetAppl() const { return aAppl; }
- const String& GetTopic() const { return aTopic; }
- const String& GetItem() const { return aItem; }
+ const OUString& GetAppl() const { return aAppl; }
+ const OUString& GetTopic() const { return aTopic; }
+ const OUString& GetItem() const { return aItem; }
sal_uInt8 GetMode() const { return nMode; }
void TryUpdate();
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 1ab3186..367a355 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -286,14 +286,14 @@ ScDBRangeBase* PopDBDoubleRef();
void PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1,
SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2,
bool bDontCheckForTableOp = false );
-void PopExternalSingleRef(sal_uInt16& rFileId, String& rTabName, ScSingleRefData& rRef);
+void PopExternalSingleRef(sal_uInt16& rFileId, OUString& rTabName, ScSingleRefData& rRef);
void PopExternalSingleRef(ScExternalRefCache::TokenRef& rToken, ScExternalRefCache::CellFormat* pFmt = NULL);
-void PopExternalSingleRef(sal_uInt16& rFileId, String& rTabName, ScSingleRefData& rRef,
+void PopExternalSingleRef(sal_uInt16& rFileId, OUString& rTabName, ScSingleRefData& rRef,
ScExternalRefCache::TokenRef& rToken, ScExternalRefCache::CellFormat* pFmt = NULL);
-void PopExternalDoubleRef(sal_uInt16& rFileId, String& rTabName, ScComplexRefData& rRef);
+void PopExternalDoubleRef(sal_uInt16& rFileId, OUString& rTabName, ScComplexRefData& rRef);
void PopExternalDoubleRef(ScExternalRefCache::TokenArrayRef& rArray);
void PopExternalDoubleRef(ScMatrixRef& rMat);
-void GetExternalDoubleRef(sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& aData, ScExternalRefCache::TokenArrayRef& rArray);
+void GetExternalDoubleRef(sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& aData, ScExternalRefCache::TokenArrayRef& rArray);
bool PopDoubleRefOrSingleRef( ScAddress& rAdr );
void PopDoubleRefPushMatrix();
// If MatrixFormula: convert formula::svDoubleRef to svMatrix, create JumpMatrix.
@@ -310,13 +310,13 @@ void QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_uLong& rRetInde
void PushDouble(double nVal);
void PushInt( int nVal );
void PushStringBuffer( const sal_Unicode* pString );
-void PushString( const String& rString );
+void PushString( const OUString& rString );
void PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab);
void PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2);
-void PushExternalSingleRef(sal_uInt16 nFileId, const String& rTabName,
+void PushExternalSingleRef(sal_uInt16 nFileId, const OUString& rTabName,
SCCOL nCol, SCROW nRow, SCTAB nTab);
-void PushExternalDoubleRef(sal_uInt16 nFileId, const String& rTabName,
+void PushExternalDoubleRef(sal_uInt16 nFileId, const OUString& rTabName,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2);
void PushMatrix( const sc::RangeMatrix& rMat );
@@ -359,7 +359,7 @@ inline void CurFmtToFuncFmt()
{ nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; }
// Check for String overflow of rResult+rAdd and set error and erase rResult
// if so. Return true if ok, false if overflow
-inline bool CheckStringResultLen( String& rResult, const String& rAdd );
+inline bool CheckStringResultLen( OUString& rResult, const OUString& rAdd );
// Set error according to rVal, and set rVal to 0.0 if there was an error.
inline void TreatDoubleError( double& rVal );
// Lookup using ScLookupCache, @returns true if found and result address
@@ -886,12 +886,12 @@ inline bool ScInterpreter::MustHaveParamCountMin( short nAct, short nMin )
return false;
}
-inline bool ScInterpreter::CheckStringResultLen( String& rResult, const String& rAdd )
+inline bool ScInterpreter::CheckStringResultLen( OUString& rResult, const OUString& rAdd )
{
- if ( (sal_uLong) rResult.Len() + rAdd.Len() > STRING_MAXLEN )
+ if ( (sal_uLong) rResult.getLength() + rAdd.getLength() > STRING_MAXLEN )
{
SetError( errStringOverflow );
- rResult.Erase();
+ rResult = "";
return false;
}
return true;
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index cb1ab07..e7f8ba0 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -212,7 +212,7 @@ void ScCellKeywordTranslator::init()
#include "cellkeywords.inl"
}
-void ScCellKeywordTranslator::addToMap(const String& rKey, const sal_Char* pName, const Locale& rLocale, OpCode eOpCode)
+void ScCellKeywordTranslator::addToMap(const OUString& rKey, const sal_Char* pName, const Locale& rLocale, OpCode eOpCode)
{
ScCellKeyword aKeyItem( pName, eOpCode, rLocale );
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 51ffac1..96a9a25 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -38,7 +38,7 @@ TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster);
bool ScDdeLink::bIsInUpdate = false;
-ScDdeLink::ScDdeLink( ScDocument* pD, const String& rA, const String& rT, const String& rI,
+ScDdeLink::ScDdeLink( ScDocument* pD, const OUString& rA, const OUString& rT, const OUString& rI,
sal_uInt8 nM ) :
::sfx2::SvBaseLink(sfx2::LINKUPDATE_ALWAYS,FORMAT_STRING),
pDoc( pD ),
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 54ce21d..7025b00 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2562,7 +2562,7 @@ void ScInterpreter::ScCell()
void ScInterpreter::ScCellExternal()
{
sal_uInt16 nFileId;
- String aTabName;
+ OUString aTabName;
ScSingleRefData aRef;
ScExternalRefCache::TokenRef pToken;
ScExternalRefCache::CellFormat aFmt;
@@ -3992,7 +3992,7 @@ void ScInterpreter::ScColumns()
case svExternalDoubleRef:
{
sal_uInt16 nFileId;
- String aTabName;
+ OUString aTabName;
ScComplexRefData aRef;
PopExternalDoubleRef( nFileId, aTabName, aRef);
ScRange aAbs = aRef.toAbs(aPos);
@@ -4050,7 +4050,7 @@ void ScInterpreter::ScRows()
case svExternalDoubleRef:
{
sal_uInt16 nFileId;
- String aTabName;
+ OUString aTabName;
ScComplexRefData aRef;
PopExternalDoubleRef( nFileId, aTabName, aRef);
ScRange aAbs = aRef.toAbs(aPos);
@@ -4104,7 +4104,7 @@ void ScInterpreter::ScTables()
case svExternalDoubleRef:
{
sal_uInt16 nFileId;
- String aTabName;
+ OUString aTabName;
ScComplexRefData aRef;
PopExternalDoubleRef( nFileId, aTabName, aRef);
ScRange aAbs = aRef.toAbs(aPos);
@@ -7450,7 +7450,7 @@ void ScInterpreter::ScOffset()
case svExternalSingleRef:
{
sal_uInt16 nFileId;
- String aTabName;
+ OUString aTabName;
ScSingleRefData aRef;
PopExternalSingleRef(nFileId, aTabName, aRef);
ScAddress aAbsRef = aRef.toAbs(aPos);
@@ -7507,7 +7507,7 @@ void ScInterpreter::ScOffset()
case svExternalDoubleRef:
{
sal_uInt16 nFileId;
- String aTabName;
+ OUString aTabName;
ScComplexRefData aRef;
PopExternalDoubleRef(nFileId, aTabName, aRef);
ScRange aAbs = aRef.toAbs(aPos);
@@ -7861,10 +7861,10 @@ void ScInterpreter::ScReplace()
{
if ( MustHaveParamCount( GetByte(), 4 ) )
{
- String aNewStr( GetString() );
+ OUString aNewStr( GetString() );
double fCount = ::rtl::math::approxFloor( GetDouble());
double fPos = ::rtl::math::approxFloor( GetDouble());
- String aOldStr( GetString() );
+ OUString aOldStr( GetString() );
if (fPos < 1.0 || fPos > static_cast<double>(STRING_MAXLEN)
|| fCount < 0.0 || fCount > static_cast<double>(STRING_MAXLEN))
PushIllegalArgument();
@@ -7872,14 +7872,14 @@ void ScInterpreter::ScReplace()
{
xub_StrLen nCount = static_cast<xub_StrLen>(fCount);
xub_StrLen nPos = static_cast<xub_StrLen>(fPos);
- xub_StrLen nLen = aOldStr.Len();
+ xub_StrLen nLen = aOldStr.getLength();
if (nPos > nLen + 1)
nPos = nLen + 1;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list