[Libreoffice-commits] core.git: 19 commits - reportdesign/inc reportdesign/source sc/inc sc/qa scripting/source sc/source sd/source slideshow/source starmath/qa starmath/source sw/inc sw/qa sw/source
Noel Grandin
noel at peralex.com
Fri Oct 18 01:00:32 PDT 2013
reportdesign/inc/UndoActions.hxx | 4
reportdesign/source/core/api/ReportEngineJFree.cxx | 4
reportdesign/source/core/sdr/RptObject.cxx | 2
reportdesign/source/core/sdr/UndoActions.cxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 2
reportdesign/source/ui/dlg/Condition.cxx | 6
reportdesign/source/ui/dlg/DateTime.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.cxx | 26
reportdesign/source/ui/dlg/Navigator.cxx | 4
reportdesign/source/ui/dlg/dlgpage.cxx | 2
reportdesign/source/ui/inc/Formula.hxx | 2
reportdesign/source/ui/inc/metadata.hxx | 8
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 6
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 64 -
reportdesign/source/ui/inspection/metadata.cxx | 28
reportdesign/source/ui/misc/UITools.cxx | 10
reportdesign/source/ui/misc/statusbarcontroller.cxx | 2
reportdesign/source/ui/misc/toolboxcontroller.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 40
reportdesign/source/ui/report/ReportSection.cxx | 4
reportdesign/source/ui/report/SectionWindow.cxx | 8
reportdesign/source/ui/report/ViewsWindow.cxx | 2
reportdesign/source/ui/report/propbrw.cxx | 10
sc/inc/conditio.hxx | 4
sc/inc/document.hxx | 1
sc/inc/global.hxx | 3
sc/inc/scabstdlg.hxx | 2
sc/qa/unit/subsequent_filters-test.cxx | 4
sc/source/core/data/documen8.cxx | 4
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/global.cxx | 8
sc/source/core/data/stlpool.cxx | 2
sc/source/core/data/validat.cxx | 2
sc/source/core/tool/address.cxx | 2
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/detfunc.cxx | 4
sc/source/core/tool/formulaopt.cxx | 10
sc/source/core/tool/interpr1.cxx | 6
sc/source/core/tool/viewopti.cxx | 2
sc/source/filter/excel/excform8.cxx | 2
sc/source/filter/excel/fontbuff.cxx | 2
sc/source/filter/excel/xehelper.cxx | 8
sc/source/filter/excel/xepivot.cxx | 2
sc/source/filter/excel/xicontent.cxx | 4
sc/source/filter/excel/xiescher.cxx | 26
sc/source/filter/excel/xihelper.cxx | 6
sc/source/filter/excel/xistyle.cxx | 2
sc/source/filter/excel/xlstyle.cxx | 2
sc/source/filter/html/htmlpars.cxx | 4
sc/source/filter/inc/tool.h | 2
sc/source/filter/inc/xiescher.hxx | 6
sc/source/filter/lotus/lotform.cxx | 10
sc/source/filter/lotus/lotimpop.cxx | 2
sc/source/filter/lotus/op.cxx | 8
sc/source/filter/lotus/tool.cxx | 9
sc/source/filter/oox/drawingmanager.cxx | 2
sc/source/filter/qpro/qprostyle.cxx | 2
sc/source/filter/starcalc/scflt.cxx | 6
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 2
sc/source/ui/app/inputhdl.cxx | 14
sc/source/ui/app/inputwin.cxx | 4
sc/source/ui/app/scmod.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 2
sc/source/ui/attrdlg/scdlgfact.hxx | 2
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 10
sc/source/ui/dbgui/fieldwnd.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/foptmgr.cxx | 10
sc/source/ui/dbgui/pfiltdlg.cxx | 6
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 4
sc/source/ui/dbgui/validate.cxx | 12
sc/source/ui/docshell/docfunc.cxx | 10
sc/source/ui/docshell/docsh3.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/docshell/impex.cxx | 4
sc/source/ui/docshell/tablink.cxx | 4
sc/source/ui/drawfunc/drtxtob1.cxx | 4
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/inc/lbseldlg.hxx | 2
sc/source/ui/inc/redcom.hxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 22
sc/source/ui/miscdlgs/datafdlg.cxx | 2
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/miscdlgs/lbseldlg.cxx | 4
sc/source/ui/miscdlgs/linkarea.cxx | 6
sc/source/ui/miscdlgs/mvtabdlg.cxx | 2
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/navipi/scenwnd.cxx | 4
sc/source/ui/optdlg/tpusrlst.cxx | 6
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/pagedlg/scuitphfedit.cxx | 24
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/scdetect.cxx | 11
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/view/cellsh2.cxx | 6
sc/source/ui/view/drawattr.cxx | 2
sc/source/ui/view/editsh.cxx | 4
sc/source/ui/view/gridwin.cxx | 6
sc/source/ui/view/hdrcont.cxx | 2
sc/source/ui/view/output2.cxx | 2
sc/source/ui/view/spelldialog.cxx | 2
sc/source/ui/view/viewdata.cxx | 12
sc/source/ui/view/viewfun4.cxx | 6
sc/source/ui/view/viewfun5.cxx | 2
sc/source/ui/view/viewfun7.cxx | 2
sc/source/ui/view/viewfunc.cxx | 2
scripting/source/dlgprov/dlgevtatt.cxx | 2
sd/source/ui/inc/MasterPageObserver.hxx | 2
sd/source/ui/inc/unoaprms.hxx | 4
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 4
sd/source/ui/sidebar/MasterPageObserver.cxx | 8
slideshow/source/engine/rehearsetimingsactivity.cxx | 3
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 6
starmath/source/cfgitem.cxx | 2
sw/inc/crsrsh.hxx | 2
sw/inc/paratr.hxx | 2
sw/inc/swtypes.hxx | 4
sw/qa/core/macros-test.cxx | 2
sw/qa/core/uwriter.cxx | 2
sw/source/core/access/accnotextframe.cxx | 2
sw/source/core/access/accportions.cxx | 4
sw/source/core/access/acctextframe.cxx | 6
sw/source/core/attr/swatrset.cxx | 6
sw/source/core/bastyp/calc.cxx | 68 -
sw/source/core/bastyp/init.cxx | 14
sw/source/core/bastyp/swtypes.cxx | 3
sw/source/core/crsr/crsrsh.cxx | 4
sw/source/core/crsr/crstrvl.cxx | 4
sw/source/core/crsr/findattr.cxx | 4
sw/source/core/crsr/findtxt.cxx | 14
sw/source/core/crsr/swcrsr.cxx | 20
sw/source/core/crsr/trvltbl.cxx | 2
sw/source/core/doc/acmplwrd.cxx | 12
sw/source/core/doc/dbgoutsw.cxx | 612 ++++++--------
sw/source/core/doc/doc.cxx | 16
sw/source/core/doc/docchart.cxx | 24
sw/source/core/doc/doccomp.cxx | 24
sw/source/core/doc/docdde.cxx | 32
sw/source/core/doc/docfld.cxx | 85 -
sw/source/core/doc/docfmt.cxx | 12
sw/source/core/doc/docglbl.cxx | 10
sw/source/core/doc/doclay.cxx | 68 -
sw/source/core/doc/docnum.cxx | 52 -
sw/source/core/doc/docredln.cxx | 18
sw/source/core/doc/docsort.cxx | 16
sw/source/core/doc/doctxm.cxx | 104 +-
sw/source/core/doc/fmtcol.cxx | 10
sw/source/core/doc/list.cxx | 16
sw/source/core/doc/notxtfrm.cxx | 4
sw/source/core/doc/number.cxx | 2
sw/source/core/doc/poolfmt.cxx | 16
sw/source/core/doc/swserv.cxx | 4
sw/source/core/doc/tblafmt.cxx | 4
sw/source/core/doc/visiturl.cxx | 6
sw/source/core/docnode/ndcopy.cxx | 4
sw/source/core/docnode/ndsect.cxx | 3
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/nodes.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/draw/drawdoc.cxx | 2
sw/source/core/edit/autofmt.cxx | 156 +--
sw/source/core/edit/edattr.cxx | 8
sw/source/core/edit/edfld.cxx | 4
sw/source/core/edit/edglss.cxx | 6
sw/source/core/edit/editsh.cxx | 34
sw/source/core/edit/edlingu.cxx | 2
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/edit/edtab.cxx | 4
sw/source/core/edit/edtox.cxx | 30
sw/source/core/fields/dbfld.cxx | 2
sw/source/core/fields/ddefld.cxx | 14
sw/source/core/fields/ddetbl.cxx | 6
sw/source/core/fields/reffld.cxx | 2
sw/source/core/fields/tblcalc.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 6
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 16
sw/source/core/inc/unofldmid.h | 3
sw/source/core/layout/colfrm.cxx | 2
sw/source/core/layout/paintfrm.cxx | 6
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/swg/swblocks.cxx | 2
sw/source/core/table/swtable.cxx | 54 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 36
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/guess.cxx | 4
sw/source/core/text/inftxt.cxx | 4
sw/source/core/text/noteurl.cxx | 4
sw/source/core/text/porexp.cxx | 2
sw/source/core/text/porlay.cxx | 26
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/pormulti.cxx | 2
sw/source/core/text/porref.cxx | 2
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/portox.cxx | 2
sw/source/core/text/txtftn.cxx | 2
sw/source/core/tox/txmsrt.cxx | 20
sw/source/core/txtnode/fmtatr2.cxx | 2
sw/source/core/txtnode/swfont.cxx | 2
sw/source/core/txtnode/txtedt.cxx | 4
sw/source/core/undo/SwUndoField.cxx | 2
sw/source/core/undo/docundo.cxx | 12
sw/source/core/undo/undel.cxx | 18
sw/source/core/undo/undobj.cxx | 6
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/undraw.cxx | 2
sw/source/core/undo/unins.cxx | 40
sw/source/core/undo/unovwr.cxx | 12
sw/source/core/undo/unsort.cxx | 4
sw/source/core/unocore/swunohelper.cxx | 6
sw/source/core/unocore/unochart.cxx | 216 ++--
sw/source/core/unocore/unocoll.cxx | 8
sw/source/core/unocore/unocrsrhelper.cxx | 4
sw/source/core/unocore/unofield.cxx | 25
sw/source/core/unocore/unoframe.cxx | 8
sw/source/core/unocore/unoftn.cxx | 2
sw/source/core/unocore/unoidx.cxx | 18
sw/source/core/unocore/unoobj.cxx | 4
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unoport.cxx | 2
sw/source/core/unocore/unosect.cxx | 11
sw/source/core/unocore/unosett.cxx | 8
sw/source/core/unocore/unosrch.cxx | 4
sw/source/core/unocore/unostyle.cxx | 2
sw/source/core/unocore/unotbl.cxx | 85 -
sw/source/core/unocore/unotext.cxx | 2
sw/source/core/view/viewsh.cxx | 2
sw/source/filter/ascii/ascatr.cxx | 12
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 16
sw/source/filter/html/htmldraw.cxx | 10
sw/source/filter/html/htmlfld.cxx | 30
sw/source/filter/html/htmlfly.cxx | 18
sw/source/filter/html/htmlform.cxx | 61 -
sw/source/filter/html/htmlforw.cxx | 6
sw/source/filter/html/htmlftn.cxx | 10
sw/source/filter/html/htmlgrin.cxx | 50 -
sw/source/filter/html/htmlnum.cxx | 4
sw/source/filter/html/htmlplug.cxx | 26
sw/source/filter/html/htmlsect.cxx | 4
sw/source/filter/html/htmltab.cxx | 12
sw/source/filter/html/swhtml.cxx | 74 -
sw/source/filter/html/wrthtml.cxx | 23
sw/source/filter/inc/msfilter.hxx | 1
sw/source/filter/ww1/fltshell.cxx | 12
sw/source/filter/ww1/w1filter.cxx | 34
sw/source/filter/ww8/writerhelper.cxx | 4
sw/source/filter/ww8/wrtw8esh.cxx | 12
sw/source/filter/ww8/wrtw8nds.cxx | 6
sw/source/filter/ww8/wrtw8sty.cxx | 16
sw/source/filter/ww8/wrtww8.hxx | 2
sw/source/filter/ww8/wrtww8gr.cxx | 8
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 20
sw/source/filter/ww8/ww8graf2.cxx | 8
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8par.hxx | 2
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par4.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 20
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/ww8/ww8scan.hxx | 4
sw/source/filter/xml/xmltbli.cxx | 6
sw/source/filter/xml/xmltbli.hxx | 2
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/app/applab.cxx | 2
sw/source/ui/app/docsh.cxx | 8
sw/source/ui/app/docsh2.cxx | 6
sw/source/ui/app/docshini.cxx | 12
sw/source/ui/app/docst.cxx | 6
sw/source/ui/app/docstyle.cxx | 18
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/chrdlg/pardlg.cxx | 4
sw/source/ui/config/optload.cxx | 6
sw/source/ui/config/optpage.cxx | 4
sw/source/ui/dbui/addresslistdialog.cxx | 4
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dbui/dbmgr.cxx | 4
sw/source/ui/dbui/mailmergechildwindow.cxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 14
sw/source/ui/dialog/uiregionsw.cxx | 52 -
sw/source/ui/dochdl/gloshdl.cxx | 8
sw/source/ui/dochdl/swdtflvr.cxx | 84 -
sw/source/ui/docvw/PostItMgr.cxx | 2
sw/source/ui/docvw/edtwin.cxx | 4
sw/source/ui/envelp/envimg.cxx | 18
sw/source/ui/envelp/labelexp.cxx | 2
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/fldui/flddb.cxx | 8
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddok.cxx | 6
sw/source/ui/fldui/fldfunc.cxx | 4
sw/source/ui/fldui/fldmgr.cxx | 4
sw/source/ui/fldui/fldref.cxx | 4
sw/source/ui/fldui/fldvar.cxx | 20
sw/source/ui/fldui/javaedit.cxx | 4
sw/source/ui/fmtui/tmpdlg.cxx | 4
sw/source/ui/frmdlg/column.cxx | 14
sw/source/ui/frmdlg/cption.cxx | 8
sw/source/ui/frmdlg/frmpage.cxx | 2
sw/source/ui/index/cnttab.cxx | 20
sw/source/ui/index/swuiidxmrk.cxx | 30
sw/source/ui/index/toxmgr.cxx | 20
sw/source/ui/lingu/olmenu.cxx | 4
sw/source/ui/misc/bookmark.cxx | 4
sw/source/ui/misc/docfnote.cxx | 2
sw/source/ui/misc/glosbib.cxx | 4
sw/source/ui/misc/glossary.cxx | 6
sw/source/ui/misc/glshell.cxx | 4
sw/source/ui/misc/num.cxx | 18
sw/source/ui/misc/outline.cxx | 16
sw/source/ui/misc/redlndlg.cxx | 4
sw/source/ui/ribbar/inputwin.cxx | 2
sw/source/ui/shells/annotsh.cxx | 4
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/grfsh.cxx | 8
sw/source/ui/shells/textfld.cxx | 6
sw/source/ui/shells/textsh1.cxx | 12
sw/source/ui/shells/textsh2.cxx | 2
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/uiview/pview.cxx | 2
sw/source/ui/uiview/view.cxx | 2
sw/source/ui/uiview/view2.cxx | 6
sw/source/ui/uiview/viewling.cxx | 4
sw/source/ui/uiview/viewport.cxx | 2
sw/source/ui/uiview/viewsrch.cxx | 4
sw/source/ui/uno/unoatxt.cxx | 6
sw/source/ui/utlui/attrdesc.cxx | 2
sw/source/ui/utlui/content.cxx | 8
sw/source/ui/utlui/glbltree.cxx | 5
sw/source/ui/utlui/gloslst.cxx | 6
sw/source/ui/utlui/initui.cxx | 2
sw/source/ui/utlui/navipi.cxx | 2
sw/source/ui/utlui/uitool.cxx | 2
sw/source/ui/utlui/zoomctrl.cxx | 2
sw/source/ui/wrtsh/wrtsh2.cxx | 2
351 files changed, 2037 insertions(+), 2091 deletions(-)
New commits:
commit d08ef4d26594f7bd2711615d90796e1613e82f9f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 16 15:43:54 2013 +0200
random OUString to String conversions
Change-Id: I9cfb8e7183b9cce7c690f3a43a64b61a2aa8c754
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 0826a30..f6393cf 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -633,7 +633,7 @@ namespace dlgprov
ResMgr* pResMgr = SFX_APP()->GetSfxResManager();
if( pResMgr )
{
- String aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) );
+ OUString aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) );
OUString aQuoteChar( "\"" );
OUString aOURes = aRes;
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 44e0305..99a0061 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -163,8 +163,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
blackHole.SetMapMode( MAP_PIXEL );
Rectangle rect;
const FontMetric metric( blackHole.GetFontMetric() );
- blackHole.GetTextBoundRect(
- rect, String("XX:XX:XX") );
+ blackHole.GetTextBoundRect( rect, OUString("XX:XX:XX") );
maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 );
mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20));
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e1d10b1..e2da017 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -20,14 +20,14 @@
namespace CppUnit {
template<>
-struct assertion_traits<String>
+struct assertion_traits<OUString>
{
- static bool equal(const String& x, const String& y)
+ static bool equal(const OUString& x, const OUString& y)
{
return x == y;
}
- static std::string toString(const String& x)
+ static std::string toString(const OUString& x)
{
OStringStream ost;
ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr();
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index df339af..57886b7 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -819,7 +819,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
SmFontFormatList &rFntFmtList = GetFontFormatList();
size_t nCnt = rFntFmtList.GetCount();
SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ];
- String *pId = new String [ nCnt ];
+ OUString *pId = new OUString [ nCnt ];
size_t k;
for (k = 0; k < nCnt; ++k)
{
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 3ac4145..f99885b 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -135,7 +135,7 @@ void SwMacrosTest::testVba()
sMsg.append ( aFileName );
CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
- String sUrl = testInfo[i].sMacroUrl;
+ OUString sUrl = testInfo[i].sMacroUrl;
Any aRet;
Sequence< sal_Int16 > aOutParamIndex;
Sequence< Any > aOutParam;
commit 218775e19cee88cdf7dae1ead787cb4274f52cd4
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 16 15:30:04 2013 +0200
convert String to OUString in reportdesign module
Change-Id: I6c154dff7c613c8975136f2934df3b0f385dade4
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 4f8a1d8..ad7f4ce 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -116,7 +116,7 @@ namespace rptui
UndoContext( SfxUndoManager& i_undoManager, const OUString& i_undoTitle )
:m_rUndoManager( i_undoManager )
{
- m_rUndoManager.EnterListAction( i_undoTitle, String() );
+ m_rUndoManager.EnterListAction( i_undoTitle, OUString() );
}
~UndoContext()
@@ -155,7 +155,7 @@ namespace rptui
class REPORTDESIGN_DLLPUBLIC OCommentUndoAction : public SdrUndoAction
{
protected:
- String m_strComment; // undo, redo comment
+ OUString m_strComment; // undo, redo comment
::dbaui::IController* m_pController;
public:
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index ca0c8eb..709a1c9 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -194,8 +194,8 @@ OUString OReportEngineJFree::getNewOutputName()
aConvertedProperties[nPos].Name = OUString("OutputStorage");
OUString sFileURL;
- String sName = m_xReport->getCaption();
- if ( !sName.Len() )
+ OUString sName = m_xReport->getCaption();
+ if ( sName.isEmpty() )
sName = m_xReport->getName();
{
::utl::TempFile aTestFile(sName, false, &sExt);
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 37f61dd..dbb11c1 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -855,7 +855,7 @@ OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
}
if (nResId)
- aDefaultName = OUString( String(ModuleRes(nResId)) );
+ aDefaultName = ModuleRes(nResId);
return aDefaultName;
}
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index b430337..ec39535 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -91,7 +91,7 @@ OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID)
DBG_CTOR(rpt_OCommentUndoAction,NULL);
m_pController = static_cast< OReportModel& >( _rMod ).getController();
if ( nCommentID )
- m_strComment = String(ModuleRes(nCommentID));
+ m_strComment = ModuleRes(nCommentID);
}
OCommentUndoAction::~OCommentUndoAction()
{
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index cf3686e..5b4212f 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -184,7 +184,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
m_pListBox->SetDeselectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) );
m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
m_pListBox->Show();
- const String sTitle(ModuleRes(RID_STR_INSERT));
+ const OUString sTitle(ModuleRes(RID_STR_INSERT));
m_aInsertButton.SetText(sTitle);
m_aInsertButton.SetClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
m_aInsertButton.Show();
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 5839248..3b6d97d 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -449,7 +449,7 @@ namespace rptui
short nRet = ModalDialog::Execute();
if ( nRet == RET_OK )
{
- const String sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) );
+ const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) );
const UndoContext aUndoContext( m_rController.getUndoManager(), sUndoAction );
try
{
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 854ec4d..5b152c8 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -144,7 +144,7 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
long nCount = pColorList->Count();
XColorEntry* pEntry = NULL;
Color aColWhite( COL_WHITE );
- String aStrWhite( ModuleRes(STR_COLOR_WHITE) );
+ OUString aStrWhite( ModuleRes(STR_COLOR_WHITE) );
if ( nCount > PALETTE_SIZE )
// Show scrollbar if more than PALLETTE_SIZE colors are available
@@ -199,7 +199,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
if ( SID_ATTR_CHAR_COLOR_BACKGROUND == _nSlotId || SID_BACKGROUND_COLOR == _nSlotId )
{
m_aColorSet.SetStyle( m_aColorSet.GetStyle() | WB_NONEFIELD );
- m_aColorSet.SetText( String(ModuleRes( STR_TRANSPARENT )) );
+ m_aColorSet.SetText( OUString(ModuleRes( STR_TRANSPARENT )) );
}
}
// -----------------------------------------------------------------------------
@@ -333,7 +333,7 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
break;
}
if ( nTextId )
- m_pColorFloat->SetText(String(ModuleRes(nTextId)));
+ m_pColorFloat->SetText(OUString(ModuleRes(nTextId)));
m_pColorFloat->SetSlotId(nId);
m_pColorFloat->SetPosPixel(m_aActions.GetItemPopupPosition(nId,m_pColorFloat->GetSizePixel()));
m_pColorFloat->StartPopupMode(&m_aActions);
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 43b4198..ea2f473 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -146,12 +146,12 @@ short ODateTimeDialog::Execute()
sal_Int32 nWidth = 0;
if ( m_pDate->IsChecked() )
{
- String sDateFormat = m_pDateListBox->GetEntry( m_pDateListBox->GetSelectEntryPos() );
+ OUString sDateFormat = m_pDateListBox->GetEntry( m_pDateListBox->GetSelectEntryPos() );
nWidth = LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MAP_100TH_MM);
}
if ( m_pTime->IsChecked() )
{
- String sDateFormat = m_pTimeListBox->GetEntry( m_pTimeListBox->GetSelectEntryPos() );
+ OUString sDateFormat = m_pTimeListBox->GetEntry( m_pTimeListBox->GetSelectEntryPos() );
nWidth = ::std::max<sal_Int32>(LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MAP_100TH_MM),nWidth);
}
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 5a09d58..0bfdd46 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -297,7 +297,7 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups
m_bIgnoreEvent = true;
{
sal_Int32 nRow = _nRow;
- const String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP));
+ const OUString sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP));
const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction );
uno::Reference< report::XGroups> xGroups = m_pParent->getGroups();
@@ -358,7 +358,7 @@ void OFieldExpressionControl::lateInit()
SetFont(aFont);
InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */);
- InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100);
+ InsertDataColumn( FIELD_EXPRESSION, OUString(ModuleRes(STR_RPT_EXPRESSION)), 100);
m_pComboCell = new ComboBoxControl( &GetDataWindow() );
m_pComboCell->SetSelectHdl(LINK(this,OFieldExpressionControl,CBChangeHdl));
@@ -422,8 +422,8 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
if ( m_aGroupPositions[nRow] == NO_GROUP )
{
bAppend = sal_True;
- String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
- m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, String() );
+ OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
+ m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() );
xGroup = m_pParent->getGroups()->createGroup();
xGroup->setHeaderOn(sal_True);
@@ -566,7 +566,7 @@ sal_Bool OFieldExpressionControl::SeekRow( long _nRow )
void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
- String aText =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId );
+ OUString aText =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId );
Point aPos( rRect.TopLeft() );
Size aTextSize( GetDataWindow().GetTextHeight(),GetDataWindow().GetTextWidth( aText ));
@@ -778,8 +778,8 @@ void OFieldExpressionControl::DeleteRows()
if ( bFirstTime )
{
bFirstTime = false;
- String sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION));
- m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, String() );
+ OUString sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION));
+ m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() );
}
sal_Int32 nGroupPos = m_aGroupPositions[nIndex];
@@ -885,7 +885,7 @@ void OFieldExpressionControl::InsertRows( long nRow )
{
m_bIgnoreEvent = false;
{
- const String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
+ const OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction );
uno::Reference<report::XGroups> xGroups = m_pParent->getGroups();
@@ -984,7 +984,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
for (size_t i = 0; i < sizeof (pControlsLst) / sizeof (pControlsLst[0]); ++i)
{
pControls[i]->Show(sal_True);
- String sText = pControls[i]->GetText();
+ OUString sText = pControls[i]->GetText();
OUString sNewText = aMnemonicGenerator.CreateMnemonic(sText);
if ( sText != sNewText )
pControls[i]->SetText(sNewText);
@@ -1253,7 +1253,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
// -----------------------------------------------------------------------------
void OGroupsSortingDialog::showHelpText(sal_uInt16 _nResId)
{
- m_aHelpWindow.SetText(String(ModuleRes(_nResId)));
+ m_aHelpWindow.SetText(OUString(ModuleRes(_nResId)));
}
// -----------------------------------------------------------------------------
void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
@@ -1288,7 +1288,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
case sdbc::DataType::LONGVARCHAR:
case sdbc::DataType::VARCHAR:
case sdbc::DataType::CHAR:
- m_aGroupOnLst.InsertEntry(String(ModuleRes(STR_RPT_PREFIXCHARS)));
+ m_aGroupOnLst.InsertEntry(OUString(ModuleRes(STR_RPT_PREFIXCHARS)));
m_aGroupOnLst.SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::PREFIX_CHARACTERS));
break;
case sdbc::DataType::DATE:
@@ -1298,13 +1298,13 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
sal_uInt16 nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE };
for (sal_uInt16 i = 0; i < sizeof (nIds) / sizeof (nIds[0]); ++i)
{
- m_aGroupOnLst.InsertEntry(String(ModuleRes(nIds[i])));
+ m_aGroupOnLst.InsertEntry(OUString(ModuleRes(nIds[i])));
m_aGroupOnLst.SetEntryData(i+1,reinterpret_cast<void*>(i+2));
}
}
break;
default:
- m_aGroupOnLst.InsertEntry(String(ModuleRes(STR_RPT_INTERVAL)));
+ m_aGroupOnLst.InsertEntry(OUString(ModuleRes(STR_RPT_INTERVAL)));
m_aGroupOnLst.SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL));
break;
}
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index b37468c..3be8f7a 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -534,7 +534,7 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS
// -----------------------------------------------------------------------------
void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent)
{
- SvTreeListEntry* pFunctions = insertEntry(String(ModuleRes(RID_STR_FUNCTIONS)),_pParent,SID_RPT_NEW_FUNCTION,LIST_APPEND,new UserData(this,_xFunctions));
+ SvTreeListEntry* pFunctions = insertEntry(OUString(ModuleRes(RID_STR_FUNCTIONS)), _pParent, SID_RPT_NEW_FUNCTION, LIST_APPEND, new UserData(this,_xFunctions));
const sal_Int32 nCount = _xFunctions->getCount();
for (sal_Int32 i = 0; i< nCount; ++i)
{
@@ -604,7 +604,7 @@ void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>&
void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups)
{
SvTreeListEntry* pReport = find(_xGroups->getReportDefinition());
- insertEntry(String(ModuleRes(RID_STR_GROUPS)),pReport,SID_SORTINGANDGROUPING,LIST_APPEND,new UserData(this,_xGroups));
+ insertEntry(OUString(ModuleRes(RID_STR_GROUPS)), pReport, SID_SORTINGANDGROUPING, LIST_APPEND, new UserData(this,_xGroups));
}
// -----------------------------------------------------------------------------
void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup)
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 25fad29..97fff04 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -46,7 +46,7 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ),
switch( _nPageId )
{
case RID_PAGEDIALOG_BACKGROUND:
- AddTabPage( RID_SVXPAGE_BACKGROUND,String(ModuleRes(1)));
+ AddTabPage( RID_SVXPAGE_BACKGROUND, OUString(ModuleRes(1)));
break;
case RID_PAGEDIALOG_PAGE:
AddTabPage(RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 );
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index cc52754..a341094 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -93,7 +93,7 @@ public:
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
protected:
- void HighlightFunctionParas(const String& aFormula);
+ void HighlightFunctionParas(const OUString& aFormula);
};
// =============================================================================
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 876d3e8..f990d97 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -49,9 +49,9 @@ namespace rptui
OPropertyInfoService(){}
virtual ~OPropertyInfoService(){}
// IPropertyInfoService
- sal_Int32 getPropertyId(const String& _rName) const;
- String getPropertyTranslation(sal_Int32 _nId) const;
- OString getPropertyHelpId(sal_Int32 _nId) const;
+ sal_Int32 getPropertyId(const OUString& _rName) const;
+ OUString getPropertyTranslation(sal_Int32 _nId) const;
+ OString getPropertyHelpId(sal_Int32 _nId) const;
sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const;
static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler);
@@ -63,7 +63,7 @@ namespace rptui
protected:
static const OPropertyInfoImpl* getPropertyInfo();
- static const OPropertyInfoImpl* getPropertyInfo(const String& _rName);
+ static const OPropertyInfoImpl* getPropertyInfo(const OUString& _rName);
static const OPropertyInfoImpl* getPropertyInfo(sal_Int32 _nId);
};
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index de062e8..31cdab6 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -506,13 +506,13 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex
aSeq[2] <<= aParam;
aParam.Name = OUString("Explanation");
- aParam.Value <<= OUString(String(ModuleRes(RID_STR_EXPLANATION)));
+ aParam.Value <<= OUString(ModuleRes(RID_STR_EXPLANATION));
aSeq[3] <<= aParam;
aParam.Name = OUString("DetailLabel");
- aParam.Value <<= OUString(String(ModuleRes(RID_STR_DETAILLABEL)));
+ aParam.Value <<= OUString(ModuleRes(RID_STR_DETAILLABEL));
aSeq[4] <<= aParam;
aParam.Name = OUString("MasterLabel");
- aParam.Value <<= OUString(String(ModuleRes(RID_STR_MASTERLABEL)));
+ aParam.Value <<= OUString(ModuleRes(RID_STR_MASTERLABEL));
aSeq[5] <<= aParam;
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 0fb1546..860bf6e 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -233,7 +233,7 @@ namespace rptui
for ( size_t i=0; i<nCategories; ++i, ++pReturn )
{
pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName );
- pReturn->UIName = String( ModuleRes( aCategories[i].uiNameResId ) );
+ pReturn->UIName = ModuleRes( aCategories[i].uiNameResId );
pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId );
}
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 892e217..754c6c6 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1588,7 +1588,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
// create the dialog
uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow);
- const String aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER));
+ const OUString aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER));
const OUString sPropertyUIName( aGcc3WorkaroundTemporary );
// initialize the dialog
xDialog->setTitle( sPropertyUIName );
@@ -1622,7 +1622,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos,
::Point aPos(VCLPoint(_aNewPos));
if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()->
- throw beans::PropertyVetoException(String(ModuleRes(RID_STR_ILLEGAL_POSITION)),xSourceReportComponent);
+ throw beans::PropertyVetoException(OUString(ModuleRes(RID_STR_ILLEGAL_POSITION)),xSourceReportComponent);
::Rectangle aSourceRect(aPos,VCLSize(_aSize));
@@ -1635,7 +1635,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos,
const ::Rectangle aBoundRect(VCLPoint(xReportComponent->getPosition()),VCLSize(xReportComponent->getSize()));
const ::Rectangle aRect = aSourceRect.GetIntersection(aBoundRect);
if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() && aRect.Top() != aRect.Bottom() ) )
- throw beans::PropertyVetoException(String(ModuleRes( RID_STR_OVERLAP_OTHER_CONTROL)),xSourceReportComponent);
+ throw beans::PropertyVetoException(OUString(ModuleRes( RID_STR_OVERLAP_OTHER_CONTROL)),xSourceReportComponent);
}
}
}
@@ -1758,7 +1758,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
if ( nCount )
{
const uno::Reference< report::XGroup> xGroup2(xGroups->getByIndex(nCount - 1),uno::UNO_QUERY_THROW);
- OUString sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP));
+ OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
_rsNamePostFix = xGroup2->getExpression();
m_sScope = sGroupName.replaceFirst("%1",_rsNamePostFix);
xReturn = xGroup2.get();
@@ -1783,7 +1783,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
for (sal_Int32 i = 0 ; i < nCount; ++i)
{
const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW);
- OUString sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP));
+ OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
if ( m_sScope == sGroupName.replaceFirst("%1",xGroup->getExpression()) )
{
_rsNamePostFix = xGroup->getExpression();
@@ -1829,7 +1829,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
uno::Reference< report::XGroup> xGroup(aFind.first->second.second,uno::UNO_QUERY);
if ( xGroup.is() )
{
- OUString sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP));
+ OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
m_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression());
}
else
@@ -1856,7 +1856,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
sal_Bool bDefaultFunction = sal_False;
try
{
- const String sFormula( _xFunction->getFormula() );
+ const OUString sFormula( _xFunction->getFormula() );
util::SearchOptions aSearchOptions;
aSearchOptions.algorithmType = util::SearchAlgorithms_REGEXP;
aSearchOptions.searchFlag = 0x00000100;
@@ -1867,14 +1867,14 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
aSearchOptions.searchString = aIter->m_sSearchString;
utl::TextSearch aTextSearch(aSearchOptions);
sal_Int32 start = 0;
- sal_Int32 end = sFormula.Len();
- if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 && end == sFormula.Len()) // default function found
+ sal_Int32 end = sFormula.getLength();
+ if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 && end == sFormula.getLength()) // default function found
{
- aSearchOptions.searchString = OUString("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]");
+ aSearchOptions.searchString = "\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]";
utl::TextSearch aDataSearch(aSearchOptions);
aDataSearch.SearchForward(sFormula,&start,&end );
++start;
- _rDataField = sFormula.Copy(start,end-start-1);
+ _rDataField = sFormula.copy(start,end-start-1);
_rsDefaultFunctionName = aIter->m_sName;
break;
}
@@ -1895,9 +1895,9 @@ void GeometryHandler::loadDefaultFunctions()
{
m_aCounterFunction.m_bPreEvaluated = sal_False;
m_aCounterFunction.m_bDeepTraversing = sal_False;
- m_aCounterFunction.m_sName = String(ModuleRes(RID_STR_F_COUNTER));
- m_aCounterFunction.m_sFormula = OUString("rpt:[%FunctionName] + 1");
- m_aCounterFunction.m_sSearchString = OUString("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*");
+ m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER);
+ m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1";
+ m_aCounterFunction.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*";
m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True;
m_aCounterFunction.m_sInitialFormula.Value = OUString("rpt:1");
@@ -1906,25 +1906,25 @@ void GeometryHandler::loadDefaultFunctions()
aDefault.m_bPreEvaluated = sal_True;
- aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION));
- aDefault.m_sFormula = OUString("rpt:[%Column] + [%FunctionName]");
- aDefault.m_sSearchString = OUString("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]");
+ aDefault.m_sName = ModuleRes(RID_STR_F_ACCUMULATION);
+ aDefault.m_sFormula = "rpt:[%Column] + [%FunctionName]";
+ aDefault.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]";
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
+ aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
m_aDefaultFunctions.push_back(aDefault);
- aDefault.m_sName = String(ModuleRes(RID_STR_F_MINIMUM));
- aDefault.m_sFormula = OUString("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])");
- aDefault.m_sSearchString = OUString("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)");
+ aDefault.m_sName = ModuleRes(RID_STR_F_MINIMUM);
+ aDefault.m_sFormula = "rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])";
+ aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)";
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
+ aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
m_aDefaultFunctions.push_back(aDefault);
- aDefault.m_sName = String(ModuleRes(RID_STR_F_MAXIMUM));
- aDefault.m_sFormula = OUString("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])");
- aDefault.m_sSearchString = OUString("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)");
+ aDefault.m_sName = ModuleRes(RID_STR_F_MAXIMUM);
+ aDefault.m_sFormula = "rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])";
+ aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)";
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = OUString("rpt:[%Column]");
+ aDefault.m_sInitialFormula.Value = "rpt:[%Column]";
m_aDefaultFunctions.push_back(aDefault);
}
}
@@ -2077,20 +2077,20 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct
const beans::Optional< OUString> aInitalFormula = aFind.first->second.first->getInitialFormula();
if ( aInitalFormula.IsPresent )
{
- const String sFormula( aFind.first->second.first->getFormula() );
+ const OUString sFormula( aFind.first->second.first->getFormula() );
util::SearchOptions aSearchOptions;
aSearchOptions.algorithmType = util::SearchAlgorithms_REGEXP;
aSearchOptions.searchFlag = 0x00000100;
aSearchOptions.searchString = m_aCounterFunction.m_sSearchString;
utl::TextSearch aTextSearch(aSearchOptions);
sal_Int32 start = 0;
- sal_Int32 end = sFormula.Len();
- if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 && end == sFormula.Len()) // counter function found
+ sal_Int32 end = sFormula.getLength();
+ if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 && end == sFormula.getLength()) // counter function found
{
const uno::Reference< report::XGroup > xGroup(aFind.first->second.second,uno::UNO_QUERY);
if ( xGroup.is() )
{
- OUString sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP));
+ OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
_Out_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression());
}
else
@@ -2112,8 +2112,8 @@ void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const O
m_xFunction.set(report::Function::create(m_xContext));
m_xFunction->setName( _sFunctionName );
- const String sPlaceHolder1(RTL_CONSTASCII_USTRINGPARAM("%Column"));
- const String sPlaceHolder2(RTL_CONSTASCII_USTRINGPARAM("%FunctionName"));
+ const OUString sPlaceHolder1("%Column");
+ const OUString sPlaceHolder2("%FunctionName");
OUString sFormula(_aFunction.m_sFormula);
sFormula = sFormula.replaceAll(sPlaceHolder1,_sDataField);
sFormula = sFormula.replaceAll(sPlaceHolder2,_sFunctionName);
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 20cb41c..eeb786d 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -40,23 +40,23 @@ namespace rptui
//========================================================================
struct OPropertyInfoImpl
{
- String sName;
- String sTranslation;
- OString sHelpId;
+ OUString sName;
+ OUString sTranslation;
+ OString sHelpId;
sal_Int32 nId;
sal_uInt32 nUIFlags;
OPropertyInfoImpl(
- const OUString& rName,
- sal_Int32 _nId,
- const String& aTranslation,
+ const OUString& rName,
+ sal_Int32 _nId,
+ const OUString& aTranslation,
const OString& _sHelpId,
- sal_uInt32 _nUIFlags);
+ sal_uInt32 _nUIFlags);
};
//------------------------------------------------------------------------
OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId,
- const String& aString, const OString& sHid, sal_uInt32 _nUIFlags)
+ const OUString& aString, const OString& sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
@@ -80,7 +80,7 @@ namespace rptui
//========================================================================
#define DEF_INFO( ident, uinameres, helpid, flags ) \
OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
- String( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags )
+ OUString( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags )
#define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -156,17 +156,17 @@ namespace rptui
}
//------------------------------------------------------------------------
- sal_Int32 OPropertyInfoService::getPropertyId(const String& _rName) const
+ sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName);
return pInfo ? pInfo->nId : -1;
}
//------------------------------------------------------------------------
- String OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
+ OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
- return (pInfo) ? pInfo->sTranslation : String();
+ return (pInfo) ? pInfo->sTranslation : OUString();
}
//------------------------------------------------------------------------
@@ -184,12 +184,12 @@ namespace rptui
}
//------------------------------------------------------------------------
- const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const String& _rName)
+ const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const OUString& _rName)
{
// intialisierung
if(!s_pPropertyInfos)
getPropertyInfo();
- OPropertyInfoImpl aSearch(_rName, 0L, String(), "", 0);
+ OPropertyInfoImpl aSearch(_rName, 0L, OUString(), "", 0);
const OPropertyInfoImpl* pPropInfo = ::std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() );
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 683b55f..3431008b 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -161,14 +161,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF");
if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() )
{
- OUString sName = String(ModuleRes(RID_STR_GROUPHEADER));
+ OUString sName = ModuleRes(RID_STR_GROUPHEADER);
sName += OUString::number(_nPos);
_xGroup->getHeader()->setName(sName);
}
if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() )
{
- OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER));
+ OUString sName = ModuleRes(RID_STR_GROUPFOOTER);
sName += OUString::number(_nPos);
_xGroup->getFooter()->setName(sName);
}
@@ -1032,11 +1032,11 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
bSuccess = aDlg.Execute() == RET_OK;
if ( bSuccess )
{
- String sFormula = aDlg.getCurrentFormula();
+ OUString sFormula = aDlg.getCurrentFormula();
xub_StrLen nIndex = 0;
- if ( sFormula.GetChar(0) == '=' )
+ if ( sFormula[0] == '=' )
nIndex = 1;
- _in_out_rFormula = OUString("rpt:") + sFormula.Copy(nIndex);
+ _in_out_rFormula = "rpt:" + sFormula.copy(nIndex);
}
}
}
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index 4294d5b..e86169a 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -93,7 +93,7 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen
for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
{
const sal_uInt16 nItemId = pStatusBar->GetItemId(nPos);
- if ( pStatusBar->GetItemCommand(nItemId) == String(m_aCommandURL) )
+ if ( pStatusBar->GetItemCommand(nItemId) == m_aCommandURL )
{
m_nId = nItemId;
break;
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index ebfea20..bfc6c65 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -139,7 +139,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
{
const sal_uInt16 nItemId = pToolBox->GetItemId(nPos);
- if ( pToolBox->GetItemCommand(nItemId) == String(m_aCommandURL) )
+ if ( pToolBox->GetItemCommand(nItemId) == m_aCommandURL )
{
m_nToolBoxId = nItemId;
break;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 146e01f..dbeceb9 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -424,7 +424,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
case SID_REPORTHEADERFOOTER:
{
aReturn.bEnabled = isEditable();
- OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT));
+ OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT);
aReturn.sTitle = sText;
}
break;
@@ -433,7 +433,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
case SID_PAGEHEADERFOOTER:
{
aReturn.bEnabled = isEditable();
- OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT));
+ OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT);
aReturn.sTitle = sText;
}
break;
@@ -586,7 +586,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = !pSectionWindow->getReportSection().isUiActive();
}
{
- OUString sText = String(ModuleRes(RID_STR_DELETE));
+ OUString sText = ModuleRes(RID_STR_DELETE);
aReturn.sTitle = sText;
}
break;
@@ -1172,7 +1172,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
{
uno::Reference< report::XFunctions> xFunctions(xFunction->getParent(),uno::UNO_QUERY_THROW);
sal_Int32 nIndex = getPositionInIndexAccess(xFunctions.get(),xFunction);
- const String sUndoAction = String((ModuleRes(RID_STR_UNDO_REMOVE_FUNCTION)));
+ const OUString sUndoAction = ModuleRes(RID_STR_UNDO_REMOVE_FUNCTION);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
xFunctions->removeByIndex(nIndex);
select(uno::makeAny(xFunctions->getParent()));
@@ -1455,7 +1455,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
::std::vector< uno::Reference< uno::XInterface > > aControlsFormats;
lcl_getReportControlFormat( aArgs, getDesignView(), xWindow, aControlsFormats );
- const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
+ const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT));
UndoContext aUndoContext( getUndoManager(), sUndoAction );
::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin();
@@ -1531,7 +1531,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
if ( !aControlsFormats.empty() )
{
- const String sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) );
+ const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) );
UndoContext aUndoContext( getUndoManager(), sUndoAction );
::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aControlsFormats.begin();
@@ -2461,7 +2461,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
else
{
uno::Reference< beans::XPropertySet> xProp(getUsedStyle(m_xReportDefinition),uno::UNO_QUERY_THROW);
- const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE));
+ const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE));
UndoContext aUndoContext( getUndoManager(), sUndoAction );
const SfxPoolItem* pItem = NULL;
if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_SIZE,sal_True,&pItem))
@@ -2588,7 +2588,7 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi
// -----------------------------------------------------------------------------
void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun)
{
- const String sUndoAction = String((ModuleRes(_nUndoStrId)));
+ const OUString sUndoAction = ModuleRes(_nUndoStrId);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
_pMemfun( getDesignView() );
InvalidateFeature( SID_SAVEDOC );
@@ -2597,7 +2597,7 @@ void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std
// -----------------------------------------------------------------------------
void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection)
{
- const String sUndoAction = String((ModuleRes(_nUndoStrId)));
+ const OUString sUndoAction = ModuleRes(_nUndoStrId);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
getDesignView()->alignMarkedObjects(_nControlModification,_bAlignAtSection);
InvalidateFeature( SID_SAVEDOC );
@@ -2676,7 +2676,7 @@ void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, uno::Reference<rep
{
if ( _xSection.is() )
{
- const String sUndoAction = String((ModuleRes(_nUndoStrId)));
+ const OUString sUndoAction = ModuleRes(_nUndoStrId);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
if (_nSid == SID_SECTION_SHRINK)
@@ -2876,7 +2876,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
if ( !bEnabled )
{
sdb::SQLContext aFirstMessage;
- String sInfo = String( ModuleRes( nErrorId ) );
+ OUString sInfo = ModuleRes( nErrorId );
aFirstMessage.Message = sInfo;
aInfo = aFirstMessage;
if ( isEditable() )
@@ -2951,7 +2951,7 @@ uno::Reference<frame::XModel> OReportController::executeReport()
}
if (aInfo.isValid())
{
- const String suSQLContext = String( ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT ) );
+ const OUString suSQLContext = ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT );
aInfo.prepend(suSQLContext);
}
m_bInGeneratePreview = false;
@@ -3007,7 +3007,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet()
// -----------------------------------------------------------------------------
void OReportController::insertGraphic()
{
- const String sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC));
+ const OUString sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC));
// build some arguments for the upcoming dialog
try
{
@@ -3109,7 +3109,7 @@ void SAL_CALL OReportController::removeSelectionChangeListener( const Reference<
void OReportController::createNewFunction(const uno::Any& _aValue)
{
uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW);
- const OUString sNewName = String(ModuleRes(RID_STR_FUNCTION));
+ const OUString sNewName = ModuleRes(RID_STR_FUNCTION);
uno::Reference< report::XFunction> xFunction(report::Function::create(m_xContext));
xFunction->setName(sNewName);
// the call below will also create an undo action -> listener
@@ -3241,7 +3241,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
{
getDesignView()->unmarkAllObjects(NULL);
- const String sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
+ const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
UndoContext aUndoContext( getUndoManager(), sUndoAction );
SequenceAsHashMap aMap(_aArgs);
@@ -3269,7 +3269,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
{
getDesignView()->unmarkAllObjects(NULL);
- const String sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
+ const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL));
UndoContext aUndoContext( getUndoManager(), sUndoAction );
if ( !m_xReportDefinition->getPageHeaderOn() )
@@ -3312,7 +3312,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
}
uno::Reference<report::XSection> xCurrentSection = getDesignView()->getCurrentSection();
- UndoContext aUndoContext( getUndoManager(), String( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) );
+ UndoContext aUndoContext( getUndoManager(), OUString( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) );
try
{
@@ -3766,7 +3766,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId)
::boost::scoped_ptr< UndoContext > pUndoContext;
if ( SID_REPORTHEADERFOOTER == _nId )
{
- const String sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
+ const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) );
addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO
@@ -3815,7 +3815,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId)
::boost::scoped_ptr< UndoContext > pUndoContext;
if ( SID_PAGEHEADERFOOTER == _nId )
{
- const String sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
+ const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER));
pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) );
addUndoAction(new OReportSectionUndo(*m_aReportModel
@@ -4166,7 +4166,7 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo
lcl_getReportControlFormat( _aArgs, getDesignView(), xWindow, aSelection );
::std::vector< uno::Reference< uno::XInterface > >::iterator aIter = aSelection.begin();
- const String sUndoAction = String( ModuleRes( _nUndoResId ) );
+ const OUString sUndoAction = ModuleRes( _nUndoResId );
UndoContext aUndoContext( getUndoManager(), sUndoAction );
for(; aIter != aSelection.end();++aIter)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index f489319..430478a 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -454,12 +454,12 @@ void lcl_insertMenuItemImages(
rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,sal_False));
if ( nId == SID_PAGEHEADERFOOTER )
{
- String sText = String(ModuleRes((_xReportDefinition.is() && _xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT));
+ OUString sText = ModuleRes((_xReportDefinition.is() && _xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT);
rContextMenu.SetItemText(nId,sText);
}
else if ( nId == SID_REPORTHEADERFOOTER )
{
- String sText = String(ModuleRes((_xReportDefinition.is() && _xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT));
+ OUString sText = ModuleRes((_xReportDefinition.is() && _xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT);
rContextMenu.SetItemText(nId,sText);
}
}
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 96e03c3..a521fa3 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -142,7 +142,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
else
{
- String sTitle = String(ModuleRes(RID_STR_DETAIL));
+ OUString sTitle = ModuleRes(RID_STR_DETAIL);
m_aStartMarker.setTitle(sTitle);
m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
}
@@ -164,7 +164,7 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport
const bool bRet = _pIsSectionOn(&aReportHelper) && _pGetSection(&aReportHelper) == m_aReportSection.getSection();
if ( bRet )
{
- String sTitle = String(ModuleRes(_nResId));
+ OUString sTitle = ModuleRes(_nResId);
m_aStartMarker.setTitle(sTitle);
m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
}
@@ -313,8 +313,8 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
//-----------------------------------------------------------------------------
IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*, )
{
- const String sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) );
- getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, String() );
+ const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) );
+ getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString() );
return 0L;
}
//------------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index d7015c6..d601d7b 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1238,7 +1238,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects()
// -----------------------------------------------------------------------------
void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt)
{
- const String sUndoAction = String((ModuleRes(RID_STR_UNDO_CHANGEPOSITION)));
+ const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION);
const UndoContext aUndoContext( getView()->getReportView()->getController().getUndoManager(), sUndoAction );
Point aNewPos = _aPnt;
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index bd8a5a3..947be02 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -337,11 +337,11 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
OUString aName;
if ( !_aObjects.getLength() )
{
- aName = String(ModuleRes(RID_STR_BRWTITLE_NO_PROPERTIES));
+ aName = ModuleRes(RID_STR_BRWTITLE_NO_PROPERTIES);
}
else if ( _aObjects.getLength() == 1 ) // single selection
{
- aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES));
+ aName = ModuleRes(RID_STR_BRWTITLE_PROPERTIES);
uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY);
Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY );
@@ -392,14 +392,14 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
if (nResId)
{
- aName += String(ModuleRes(nResId));
+ aName += ModuleRes(nResId);
}
}
}
else // multiselection
{
- aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES));
- aName += String(ModuleRes(RID_STR_BRWTITLE_MULTISELECT));
+ aName = ModuleRes(RID_STR_BRWTITLE_PROPERTIES);
+ aName += ModuleRes(RID_STR_BRWTITLE_MULTISELECT);
}
return aName;
commit cc10a8a4672d85a38164cac3735a830bf75638be
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 16 15:02:23 2013 +0200
convert remnants of String in SD to OUString
Change-Id: Ia09dab36376e0169cddb5e8b0aa096d5327a8213
diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx
index f890c01..19112e33 100644
--- a/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/sd/source/ui/inc/MasterPageObserver.hxx
@@ -39,7 +39,7 @@ class MasterPageObserver
: public SdGlobalResource
{
public:
- typedef ::std::set<String> MasterPageNameSet;
+ typedef ::std::set<OUString> MasterPageNameSet;
/** Return the single instance of this class.
*/
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index 2509901..1bcceac 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -104,7 +104,7 @@ public:
{ bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; }
void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn)
{ bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; }
- void SetSound(String aTheOldSound, OUString aTheNewSound)
+ void SetSound(OUString aTheOldSound, OUString aTheNewSound)
{ aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; }
void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen)
{ aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; }
@@ -114,7 +114,7 @@ public:
{ pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; }
void SetClickAction(::com::sun::star::presentation::ClickAction eTheOldAction, ::com::sun::star::presentation::ClickAction eTheNewAction)
{ eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; }
- void SetBookmark(String aTheOldBookmark, OUString aTheNewBookmark)
+ void SetBookmark(OUString aTheOldBookmark, OUString aTheNewBookmark)
{ aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; }
void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres)
{ bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; }
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 2295bc9..9fc151d 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -137,7 +137,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
SdPage* pMasterPage;
// Remember the names of the master pages that have been inserted to
// avoid double insertion.
- ::std::set<String> aMasterPageNames;
+ ::std::set<OUString> aMasterPageNames;
for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++)
{
pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD);
@@ -188,7 +188,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
// their master page into a set.
sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
SdPage* pPage;
- ::std::set<String> aNames;
+ ::std::set<OUString> aNames;
sal_uInt16 nIndex;
bool bLoop (true);
for (nIndex=0; nIndex<nPageCount && bLoop; nIndex++)
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 7aa47d7..99aa6c1 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -229,7 +229,7 @@ void MasterPageObserver::Implementation::AddEventListener (
aDocumentIterator!=maUsedMasterPages.end();
++aDocumentIterator)
{
- ::std::set<String>::reverse_iterator aNameIterator;
+ ::std::set<OUString>::reverse_iterator aNameIterator;
for (aNameIterator=aDocumentIterator->second.rbegin();
aNameIterator!=aDocumentIterator->second.rend();
++aNameIterator)
@@ -317,7 +317,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
{
// Create a set of names of the master pages used by the given document.
sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
- ::std::set<String> aCurrentMasterPages;
+ ::std::set<OUString> aCurrentMasterPages;
for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
{
SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PK_STANDARD);
@@ -329,7 +329,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
RTL_TEXTENCODING_UTF8).getStr());
}
- typedef ::std::vector<String> StringList;
+ typedef ::std::vector<OUString> StringList;
StringList aNewMasterPages;
StringList aRemovedMasterPages;
MasterPageContainer::iterator aOldMasterPagesDescriptor (
@@ -338,7 +338,7 @@ void MasterPageObserver::Implementation::AnalyzeUsedMasterPages (
{
StringList::iterator I;
- ::std::set<String>::iterator J;
+ ::std::set<OUString>::iterator J;
int i=0;
for (J=aOldMasterPagesDescriptor->second.begin();
J!=aOldMasterPagesDescriptor->second.end();
commit bc3b7ca3c7bfc231aff489cdb49e9cd1bc767247
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 16 14:27:58 2013 +0200
convert remaining String in SC to OUString
Change-Id: I3ee8c3b59bf9d6ef6516f1da64cbe5f0b35af2d0
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 040f237..5de4827 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -296,8 +296,8 @@ public:
const OUString& rExpr1, const OUString& rExpr2,
ScDocument* pDocument, const ScAddress& rPos,
const OUString& rStyle,
- const OUString& rExprNmsp1 = EMPTY_STRING,
- const OUString& rExprNmsp2 = EMPTY_STRING,
+ const OUString& rExprNmsp1 = EMPTY_OUSTRING,
+ const OUString& rExprNmsp2 = EMPTY_OUSTRING,
formula::FormulaGrammar::Grammar eGrammar1 = formula::FormulaGrammar::GRAM_DEFAULT,
formula::FormulaGrammar::Grammar eGrammar2 = formula::FormulaGrammar::GRAM_DEFAULT );
ScCondFormatEntry( ScConditionMode eOper,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c378a26..f7df5f61 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -858,7 +858,6 @@ public:
svl::SharedString GetSharedString( const ScAddress& rPos ) const;
- SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rString );
sal_uInt16 GetStringForFormula( const ScAddress& rPos, OUString& rString );
SC_DLLPUBLIC double GetValue( const ScAddress& rPos ) const;
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a67b1d6..4db7beb 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -218,7 +218,6 @@ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
#define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL )
-#define EMPTY_STRING ScGlobal::GetEmptyString()
#define EMPTY_OUSTRING ScGlobal::GetEmptyOUString()
// layer id's for drawing
@@ -496,7 +495,6 @@ class ScGlobal
static ScUserList* pUserList;
static OUString** ppRscString;
static OUString* pStrScDoc;
- static String* pEmptyString;
static OUString* pEmptyOUString;
static OUString* pStrClipDocName;
static SvxBrushItem* pEmptyBrushItem;
@@ -589,7 +587,6 @@ public:
static SvxBrushItem* GetButtonBrushItem();
static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; }
static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; }
- SC_DLLPUBLIC static const String& GetEmptyString();
SC_DLLPUBLIC static const OUString& GetEmptyOUString();
static const OUString& GetScDocString();
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 03bc58d..fe3cf06 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -398,7 +398,7 @@ public:
SCTAB nTabCount, bool bFromFile) = 0;
virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent,
- const std::vector<String> &rEntryList ) = 0;
+ const std::vector<OUString> &rEntryList ) = 0;
virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0;
virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent,
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 5c0fb54..5743b20 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1072,8 +1072,8 @@ void checkValiditationEntries( const ValDataTestParams& rVDTParams )
//create expected data validation entry
ScValidationData aValData(
rVDTParams.eValMode, rVDTParams.eCondOp, rVDTParams.aStrVal1,
- rVDTParams.aStrVal2, pDoc, rVDTParams.aPosition, EMPTY_STRING,
- EMPTY_STRING, pDoc->GetStorageGrammar(), pDoc->GetStorageGrammar()
+ rVDTParams.aStrVal2, pDoc, rVDTParams.aPosition, EMPTY_OUSTRING,
+ EMPTY_OUSTRING, pDoc->GetStorageGrammar(), pDoc->GetStorageGrammar()
);
aValData.SetIgnoreBlank( true );
aValData.SetListType( 1 );
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index c7e6a99..980866d 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -886,7 +886,7 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin)
aFile = aUrl.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS);
OUStringBuffer aBuf;
- aBuf.append(String(ScResId(SCSTR_EXTDOC_NOT_LOADED)));
+ aBuf.append(OUString(ScResId(SCSTR_EXTDOC_NOT_LOADED)));
aBuf.appendAscii("\n\n");
aBuf.append(aFile);
ErrorBox aBox(pWin, WB_OK, aBuf.makeStringAndClear());
@@ -940,7 +940,7 @@ void ScDocument::UpdateDdeLinks(Window* pWin)
OUString aType = pDdeLink->GetAppl();
OUStringBuffer aBuf;
- aBuf.append(String(ScResId(SCSTR_DDEDOC_NOT_LOADED)));
+ aBuf.append(OUString(ScResId(SCSTR_DDEDOC_NOT_LOADED)));
aBuf.appendAscii("\n\n");
aBuf.appendAscii("Source : ");
aBuf.append(aFile);
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 6e5d243..9f98b32 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2040,7 +2040,7 @@ ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) :
nHier( nH ),
nLev( nL ),
pMembers( NULL ),
- aSortInfo( EMPTY_STRING, sal_True, sheet::DataPilotFieldSortMode::NAME ), // default: sort by name
+ aSortInfo( EMPTY_OUSTRING, sal_True, sheet::DataPilotFieldSortMode::NAME ), // default: sort by name
nSortMeasure( 0 ),
nAutoMeasure( 0 ),
bShowEmpty( false ),
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 7b2b5b3..6a99807 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -102,7 +102,6 @@ CollatorWrapper* ScGlobal::pCaseCollator = NULL;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = NULL;
IntlWrapper* ScGlobal::pScIntlWrapper = NULL;
sal_Unicode ScGlobal::cListDelimiter = ',';
-String* ScGlobal::pEmptyString = NULL;
OUString* ScGlobal::pEmptyOUString = NULL;
OUString* ScGlobal::pStrClipDocName = NULL;
@@ -514,11 +513,6 @@ SvxBrushItem* ScGlobal::GetButtonBrushItem()
return pButtonBrushItem;
}
-const String& ScGlobal::GetEmptyString()
-{
- return *pEmptyString;
-}
-
const OUString& ScGlobal::GetEmptyOUString()
{
return *pEmptyOUString;
@@ -534,7 +528,6 @@ ImageList* ScGlobal::GetOutlineSymbols()
void ScGlobal::Init()
{
- pEmptyString = new String;
pEmptyOUString = new OUString;
// Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge)
@@ -690,7 +683,6 @@ void ScGlobal::Clear()
ScDocumentPool::DeleteVersionMaps();
- DELETEZ(pEmptyString);
DELETEZ(pEmptyOUString);
}
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 04b923a..4a37c3d 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -374,7 +374,7 @@ void ScStyleSheetPool::CreateStandardStyles()
// Kopfzeile:
// [leer][\TABELLE\][leer]
//----------------------------------------
- pEdEngine->SetText(EMPTY_STRING);
+ pEdEngine->SetText(EMPTY_OUSTRING);
pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() );
pTxtObj = pEdEngine->CreateTextObject();
pHeaderItem->SetLeftArea ( *pEmptyTxtObj );
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 9cbf6cb..5a12649 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -366,7 +366,7 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput,
void ScValidationData::DoCalcError( ScFormulaCell* pCell ) const
{
if ( eErrorStyle == SC_VALERR_MACRO )
- DoMacro( pCell->aPos, EMPTY_STRING, pCell, NULL );
+ DoMacro( pCell->aPos, EMPTY_OUSTRING, pCell, NULL );
}
// true -> Abbruch
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index cd24430..c4fab07 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1988,7 +1988,7 @@ OUString ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab,
const ScAddress::Details& rDetails ) const
{
if ( !pDoc )
- return EMPTY_STRING;
+ return EMPTY_OUSTRING;
if ( Tab()+1 > pDoc->GetTableCount() )
return ScGlobal::GetRscString( STR_NOREF_STR );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 2ba6ffc..a77f0ec 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1674,7 +1674,7 @@ void ScCompiler::CheckTabQuotes( OUString& rString,
sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::ASC_UNDERSCORE;
sal_Int32 nContFlags = nStartFlags;
ParseResult aRes = ScGlobal::pCharClass->parsePredefinedToken(
- KParseType::IDENTNAME, rString, 0, nStartFlags, EMPTY_STRING, nContFlags, EMPTY_STRING);
+ KParseType::IDENTNAME, rString, 0, nStartFlags, EMPTY_OUSTRING, nContFlags, EMPTY_OUSTRING);
bool bNeedsQuote = !((aRes.TokenType & KParseType::IDENTNAME) && aRes.EndPos == rString.getLength());
switch ( eConv )
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index fa2c809..0ddd765 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -75,7 +75,7 @@ using ::std::vector;
// line ends are now created with an empty name.
// The checkForUniqueItem method then finds a unique name for the item's value.
-#define SC_LINEEND_NAME EMPTY_STRING
+#define SC_LINEEND_NAME EMPTY_OUSTRING
enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
DET_INS_CONTINUE,
@@ -139,7 +139,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
{
nMaxLevel = 0;
- aBoxSet.Put( XLineColorItem( EMPTY_STRING, Color( ScDetectiveFunc::GetArrowColor() ) ) );
+ aBoxSet.Put( XLineColorItem( EMPTY_OUSTRING, Color( ScDetectiveFunc::GetArrowColor() ) ) );
aBoxSet.Put( XFillStyleItem( XFILL_NONE ) );
// Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln,
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx
index 1ce5e09..5580c23 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -193,7 +193,7 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const
#define SCFORMULAOPT_SEP_ARRAY_ROW 3
#define SCFORMULAOPT_SEP_ARRAY_COL 4
#define SCFORMULAOPT_STRING_REF_SYNTAX 5
-#define SCFORMULAOPT_EMPTY_STRING_AS_ZERO 6
+#define SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO 6
#define SCFORMULAOPT_OOXML_RECALC 7
#define SCFORMULAOPT_ODF_RECALC 8
#define SCFORMULAOPT_OPENCL_ENABLED 9
@@ -211,7 +211,7 @@ Sequence<OUString> ScFormulaCfg::GetPropertyNames()
"Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW
"Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL
"Syntax/StringRefAddressSyntax", // SCFORMULAOPT_STRING_REF_SYNTAX
- "Syntax/EmptyStringAsZero", // SCFORMULAOPT_EMPTY_STRING_AS_ZERO
+ "Syntax/EmptyStringAsZero", // SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO
"Load/OOXMLRecalcMode", // SCFORMULAOPT_OOXML_RECALC
"Load/ODFRecalcMode", // SCFORMULAOPT_ODF_RECALC
"Calculation/OpenCL", // SCFORMULAOPT_OPENCL_ENABLED
@@ -229,7 +229,7 @@ Sequence<OUString> ScFormulaCfg::GetPropertyNames()
ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId()
{
Sequence<OUString> aPropNames = GetPropertyNames();
- static sal_uInt16 aVals[] = { SCFORMULAOPT_GRAMMAR, SCFORMULAOPT_ENGLISH_FUNCNAME, SCFORMULAOPT_SEP_ARG, SCFORMULAOPT_SEP_ARRAY_ROW, SCFORMULAOPT_SEP_ARRAY_COL, SCFORMULAOPT_STRING_REF_SYNTAX, SCFORMULAOPT_EMPTY_STRING_AS_ZERO, SCFORMULAOPT_OOXML_RECALC, SCFORMULAOPT_ODF_RECALC, SCFORMULAOPT_OPENCL_ENABLED, SCFORMULAOPT_OPENCL_AUTOSELECT, SCFORMULAOPT_OPENCL_DEVICE };
+ static sal_uInt16 aVals[] = { SCFORMULAOPT_GRAMMAR, SCFORMULAOPT_ENGLISH_FUNCNAME, SCFORMULAOPT_SEP_ARG, SCFORMULAOPT_SEP_ARRAY_ROW, SCFORMULAOPT_SEP_ARRAY_COL, SCFORMULAOPT_STRING_REF_SYNTAX, SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO, SCFORMULAOPT_OOXML_RECALC, SCFORMULAOPT_ODF_RECALC, SCFORMULAOPT_OPENCL_ENABLED, SCFORMULAOPT_OPENCL_AUTOSELECT, SCFORMULAOPT_OPENCL_DEVICE };
OSL_ENSURE( SAL_N_ELEMENTS(aVals) == aPropNames.getLength(), "Properties and ids are out of Sync");
PropsToIds aPropIdMap;
for ( sal_uInt16 i=0; i<aPropNames.getLength(); ++i )
@@ -353,7 +353,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames )
GetCalcConfig().meStringRefAddressSyntax = eConv;
}
break;
- case SCFORMULAOPT_EMPTY_STRING_AS_ZERO:
+ case SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO:
{
sal_Bool bVal = GetCalcConfig().mbEmptyStringAsZero;
pValues[nProp] >>= bVal;
@@ -487,7 +487,7 @@ void ScFormulaCfg::Commit()
pValues[nProp] <<= nVal;
}
break;
- case SCFORMULAOPT_EMPTY_STRING_AS_ZERO:
+ case SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO:
{
sal_Bool bVal = GetCalcConfig().mbEmptyStringAsZero;
pValues[nProp] <<= bVal;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 748d044..f8b31f2 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2654,7 +2654,7 @@ void ScInterpreter::ScCellExternal()
PushString(ScGlobal::GetErrorString(pToken->GetError()));
break;
default:
- PushString(ScGlobal::GetEmptyString());
+ PushString(ScGlobal::GetEmptyOUString());
}
}
else if ( aInfoType == "TYPE" )
@@ -3251,7 +3251,7 @@ void ScInterpreter::ScT()
case svDouble :
{
PopError();
- PushString( EMPTY_STRING );
+ PushString( EMPTY_OUSTRING );
}
break;
case svString :
@@ -8418,7 +8418,7 @@ void ScInterpreter::ScRept()
PushError( errStringOverflow );
}
else if ( fAnz == 0.0 )
- PushString( EMPTY_STRING );
+ PushString( EMPTY_OUSTRING );
else
{
const xub_StrLen nLen = aStr.getLength();
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 4f60f39..e4dc903 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -372,7 +372,7 @@ ScViewCfg::ScViewCfg() :
{
case SCLAYOUTOPT_GRIDCOLOR:
if ( pValues[nProp] >>= nIntVal )
- SetGridColor( Color(nIntVal), EMPTY_STRING );
+ SetGridColor( Color(nIntVal), EMPTY_OUSTRING );
break;
case SCLAYOUTOPT_GRIDLINES:
SetOption( VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 024e6b4..9cc81da 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1276,7 +1276,7 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
if (nFormulaLen == 0)
{
- aPool.Store(String("-/-"));
+ aPool.Store(OUString("-/-"));
aPool >> aStack;
rpArray = aPool[aStack.Get()];
return ConvOK;
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index f0fd387..27c15ae 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -141,7 +141,7 @@ void LotusFontBuffer::MakeFont( ENTRY* pEntry )
break;
}
- pEntry->pFont = new SvxFontItem( eFamily, *pEntry->pTmpName, EMPTY_STRING, ePitch, eCharSet, ATTR_FONT );
+ pEntry->pFont = new SvxFontItem( eFamily, *pEntry->pTmpName, EMPTY_OUSTRING, ePitch, eCharSet, ATTR_FONT );
delete pEntry->pTmpName;
pEntry->pTmpName = NULL;
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 8dadbab..b537009 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -355,7 +355,7 @@ XclExpStringRef lclCreateFormattedString(
{
/* Create an empty Excel string object with correctly initialized BIFF mode,
because this function only uses Append() functions that require this. */
- XclExpStringRef xString = XclExpStringHelper::CreateString( rRoot, EMPTY_STRING, nFlags, nMaxLen );
+ XclExpStringRef xString = XclExpStringHelper::CreateString( rRoot, EMPTY_OUSTRING, nFlags, nMaxLen );
// script type handling
Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator();
@@ -424,7 +424,7 @@ XclExpStringRef lclCreateFormattedString(
{
/* Create an empty Excel string object with correctly initialized BIFF mode,
because this function only uses Append() functions that require this. */
- XclExpStringRef xString = XclExpStringHelper::CreateString( rRoot, EMPTY_STRING, nFlags, nMaxLen );
+ XclExpStringRef xString = XclExpStringHelper::CreateString( rRoot, EMPTY_OUSTRING, nFlags, nMaxLen );
// font buffer and helper item set for edit engine -> Calc item conversion
XclExpFontBuffer& rFontBuffer = rRoot.GetFontBuffer();
@@ -539,7 +539,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
XclExpStringRef XclExpStringHelper::CreateString(
const XclExpRoot& rRoot, sal_Unicode cChar, XclStrFlags nFlags, sal_uInt16 nMaxLen )
{
- XclExpStringRef xString = CreateString( rRoot, EMPTY_STRING, nFlags, nMaxLen );
+ XclExpStringRef xString = CreateString( rRoot, EMPTY_OUSTRING, nFlags, nMaxLen );
AppendChar( *xString, rRoot, cChar );
return xString;
}
@@ -617,7 +617,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
{
OSL_FAIL( "XclExpStringHelper::CreateString - textbox without para object" );
// create BIFF dependent empty Excel string
- xString = CreateString( rRoot, EMPTY_STRING, nFlags, nMaxLen );
+ xString = CreateString( rRoot, EMPTY_OUSTRING, nFlags, nMaxLen );
}
return xString;
}
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index fa4f5ba..5a8a2fe 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -838,7 +838,7 @@ void XclExpPivotCache::AddCalcFields( const ScDPObject& /*rDPObj*/ )
void XclExpPivotCache::WriteDconref( XclExpStream& rStrm ) const
{
- XclExpString aRef( XclExpUrlHelper::EncodeUrl( GetRoot(), EMPTY_STRING, &maTabName ) );
+ XclExpString aRef( XclExpUrlHelper::EncodeUrl( GetRoot(), EMPTY_OUSTRING, &maTabName ) );
rStrm.StartRecord( EXC_ID_DCONREF, 7 + aRef.GetSize() );
rStrm << static_cast< sal_uInt16 >( maExpSrcRange.aStart.Row() )
<< static_cast< sal_uInt16 >( maExpSrcRange.aEnd.Row() )
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index b38d562..7a0a2f2 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -178,7 +178,7 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW
}
else
{
- rEE.SetText( EMPTY_STRING );
+ rEE.SetText( EMPTY_OUSTRING );
rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), ESelection() );
if( const ScPatternAttr* pPattern = rDoc.getDoc().GetPattern( aScPos.Col(), aScPos.Row(), nScTab ) )
{
@@ -958,7 +958,7 @@ void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName )
if( !maURL.isEmpty() && (meMode != xlWQUnknown) && rDoc.GetDocumentShell() )
{
ScAreaLink* pLink = new ScAreaLink( rDoc.GetDocumentShell(),
- maURL, rFilterName, EMPTY_STRING, maTables, maDestRange, mnRefresh * 60UL );
+ maURL, rFilterName, EMPTY_OUSTRING, maTables, maDestRange, mnRefresh * 60UL );
rDoc.GetLinkManager()->InsertFileLink( *pLink, OBJECT_CLIENT_FILE,
maURL, &rFilterName, &maTables );
}
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 8e9e672..95d2bea 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -644,7 +644,7 @@ void XclImpDrawObjBase::ConvertLineStyle( SdrObject& rSdrObj, const XclObjLineDa
{
long nLineWidth = 35 * ::std::min( rLineData.mnWidth, EXC_OBJ_LINE_THICK );
rSdrObj.SetMergedItem( XLineWidthItem( nLineWidth ) );
- rSdrObj.SetMergedItem( XLineColorItem( EMPTY_STRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) );
+ rSdrObj.SetMergedItem( XLineColorItem( EMPTY_OUSTRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) );
rSdrObj.SetMergedItem( XLineJointItem( com::sun::star::drawing::LineJoint_MITER ) );
sal_uLong nDotLen = ::std::max< sal_uLong >( 70 * rLineData.mnWidth, 35 );
@@ -659,19 +659,19 @@ void XclImpDrawObjBase::ConvertLineStyle( SdrObject& rSdrObj, const XclObjLineDa
break;
case EXC_OBJ_LINE_DASH:
rSdrObj.SetMergedItem( XLineStyleItem( XLINE_DASH ) );
- rSdrObj.SetMergedItem( XLineDashItem( EMPTY_STRING, XDash( XDASH_RECT, 0, nDotLen, 1, nDashLen, nDist ) ) );
+ rSdrObj.SetMergedItem( XLineDashItem( EMPTY_OUSTRING, XDash( XDASH_RECT, 0, nDotLen, 1, nDashLen, nDist ) ) );
break;
case EXC_OBJ_LINE_DOT:
rSdrObj.SetMergedItem( XLineStyleItem( XLINE_DASH ) );
- rSdrObj.SetMergedItem( XLineDashItem( EMPTY_STRING, XDash( XDASH_RECT, 1, nDotLen, 0, nDashLen, nDist ) ) );
+ rSdrObj.SetMergedItem( XLineDashItem( EMPTY_OUSTRING, XDash( XDASH_RECT, 1, nDotLen, 0, nDashLen, nDist ) ) );
break;
case EXC_OBJ_LINE_DASHDOT:
rSdrObj.SetMergedItem( XLineStyleItem( XLINE_DASH ) );
- rSdrObj.SetMergedItem( XLineDashItem( EMPTY_STRING, XDash( XDASH_RECT, 1, nDotLen, 1, nDashLen, nDist ) ) );
+ rSdrObj.SetMergedItem( XLineDashItem( EMPTY_OUSTRING, XDash( XDASH_RECT, 1, nDotLen, 1, nDashLen, nDist ) ) );
break;
case EXC_OBJ_LINE_DASHDOTDOT:
rSdrObj.SetMergedItem( XLineStyleItem( XLINE_DASH ) );
- rSdrObj.SetMergedItem( XLineDashItem( EMPTY_STRING, XDash( XDASH_RECT, 2, nDotLen, 1, nDashLen, nDist ) ) );
+ rSdrObj.SetMergedItem( XLineDashItem( EMPTY_OUSTRING, XDash( XDASH_RECT, 2, nDotLen, 1, nDashLen, nDist ) ) );
break;
case EXC_OBJ_LINE_MEDTRANS:
rSdrObj.SetMergedItem( XLineStyleItem( XLINE_SOLID ) );
@@ -711,7 +711,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
if( (rFillData.mnPattern == EXC_PATT_SOLID) || (aPattColor == aBackColor) )
{
rSdrObj.SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
- rSdrObj.SetMergedItem( XFillColorItem( EMPTY_STRING, aPattColor ) );
+ rSdrObj.SetMergedItem( XFillColorItem( EMPTY_OUSTRING, aPattColor ) );
}
else
{
@@ -758,7 +758,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa
aBitmap = aXOBitmap.GetBitmap();
rSdrObj.SetMergedItem(XFillStyleItem(XFILL_BITMAP));
- rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_STRING, Graphic(aBitmap)));
+ rSdrObj.SetMergedItem(XFillBitmapItem(EMPTY_OUSTRING, Graphic(aBitmap)));
}
}
}
@@ -1161,13 +1161,13 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
long nWidth = static_cast< long >( 125 * fArrowWidth );
if( bLineStart )
{
- xSdrObj->SetMergedItem( XLineStartItem( EMPTY_STRING, aArrowPolyPoly ) );
+ xSdrObj->SetMergedItem( XLineStartItem( EMPTY_OUSTRING, aArrowPolyPoly ) );
xSdrObj->SetMergedItem( XLineStartWidthItem( nWidth ) );
xSdrObj->SetMergedItem( XLineStartCenterItem( false ) );
}
if( bLineEnd )
{
- xSdrObj->SetMergedItem( XLineEndItem( EMPTY_STRING, aArrowPolyPoly ) );
+ xSdrObj->SetMergedItem( XLineEndItem( EMPTY_OUSTRING, aArrowPolyPoly ) );
xSdrObj->SetMergedItem( XLineEndWidthItem( nWidth ) );
xSdrObj->SetMergedItem( XLineEndCenterItem( false ) );
}
@@ -2881,7 +2881,7 @@ XclImpPictureObj::XclImpPictureObj( const XclImpRoot& rRoot ) :
SetCustomDffObj( true );
}
-String XclImpPictureObj::GetOleStorageName() const
+OUString XclImpPictureObj::GetOleStorageName() const
{
OUString aStrgName;
if( (mbEmbedded || mbLinked) && !mbControl && (mnStorageId > 0) )
@@ -3297,7 +3297,7 @@ XclImpDffConverter::~XclImpDffConverter()
{
}
-String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId )
+OUString XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId )
{
OUString sOleName;
OUString sCodeName = GetExtDocOptions().GetCodeName( nTab );
@@ -3588,7 +3588,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO
// filled without color -> set system window color
if( GetPropertyBool( DFF_Prop_fFilled ) && !IsProperty( DFF_Prop_fillColor ) )
- xSdrObj->SetMergedItem( XFillColorItem( EMPTY_STRING, GetPalette().GetColor( EXC_COLOR_WINDOWBACK ) ) );
+ xSdrObj->SetMergedItem( XFillColorItem( EMPTY_OUSTRING, GetPalette().GetColor( EXC_COLOR_WINDOWBACK ) ) );
// additional processing on the SdrObject
xDrawObj->PreProcessSdrObject( *this, *xSdrObj );
@@ -3674,7 +3674,7 @@ const XclImpDffConverter::XclImpDffConvData& XclImpDffConverter::GetConvData() c
return *maDataStack.back();
}
-String XclImpDffConverter::ReadHlinkProperty( SvStream& rDffStrm ) const
+OUString XclImpDffConverter::ReadHlinkProperty( SvStream& rDffStrm ) const
{
/* Reads hyperlink data from a complex DFF property. Contents of this
property are equal to the HLINK record, import of this record is
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 5e01dd4..b6df6eb 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -280,7 +280,7 @@ XclImpHFConverter::~XclImpHFConverter()
void XclImpHFConverter::ParseString( const OUString& rHFString )
{
// edit engine objects
- mrEE.SetText( EMPTY_STRING );
+ mrEE.SetText( EMPTY_OUSTRING );
maInfos.clear();
maInfos.resize( EXC_HF_PORTION_COUNT );
meCurrObj = EXC_HF_CENTER;
@@ -357,7 +357,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString )
}
break;
case 'F': // file name
- InsertField( SvxFieldItem( SvxExtFileField( EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ), EE_FEATURE_FIELD ) );
+ InsertField( SvxFieldItem( SvxExtFileField( EMPTY_OUSTRING, SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ), EE_FEATURE_FIELD ) );
break;
case 'U': // underline
@@ -587,7 +587,7 @@ void XclImpHFConverter::SetNewPortion( XclImpHFPortion eNew )
if( GetCurrObj().get() )
mrEE.SetText( *GetCurrObj() );
else
- mrEE.SetText( EMPTY_STRING );
+ mrEE.SetText( EMPTY_OUSTRING );
ResetFontData();
}
}
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 708fbc1..db38fb6 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -317,7 +317,7 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo
case FAMILY_MODERN: ePitch = PITCH_FIXED; break;
default: break;
}
- SvxFontItem aFontItem( eFtFamily , maData.maName, EMPTY_STRING, ePitch, eTempTextEnc, ATTR_FONT );
+ SvxFontItem aFontItem( eFtFamily , maData.maName, EMPTY_OUSTRING, ePitch, eTempTextEnc, ATTR_FONT );
// set only for valid script types
if( mbHasWstrn )
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 01e36a0..4913752 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -1542,7 +1542,7 @@ void XclNumFmtBuffer::InsertBuiltinFormats()
if( pBuiltIn->mpFormat )
rNumFmt.maFormat = OUString( pBuiltIn->mpFormat, strlen(pBuiltIn->mpFormat), RTL_TEXTENCODING_UTF8 );
else
- rNumFmt.maFormat = EMPTY_STRING;
+ rNumFmt.maFormat = EMPTY_OUSTRING;
if( pBuiltIn->meOffset == PRV_NF_INDEX_REUSE )
aReuseMap[ pBuiltIn->mnXclNumFmt ] = pBuiltIn->mnXclReuseFmt;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 3752f1f..aded321 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1569,7 +1569,7 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo )
}
if ( !aFontName.isEmpty() )
pActEntry->aItemSet.Put( SvxFontItem( FAMILY_DONTKNOW,
- aFontName, EMPTY_STRING, PITCH_DONTKNOW,
+ aFontName, EMPTY_OUSTRING, PITCH_DONTKNOW,
RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) );
}
break;
@@ -3085,7 +3085,7 @@ void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo )
}
if ( !aFontName.isEmpty() )
mpCurrTable->PutItem( SvxFontItem( FAMILY_DONTKNOW,
- aFontName, EMPTY_STRING, PITCH_DONTKNOW,
+ aFontName, EMPTY_OUSTRING, PITCH_DONTKNOW,
RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) );
}
break;
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 2a62ed4..ff5dd4d 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -33,7 +33,7 @@ void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt8 nFormat, sa
void InitPage( void );
-String DosToSystem( sal_Char *pSource );
+OUString DosToSystem( sal_Char *pSource );
double SnumToDouble( sal_Int16 nVal );
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 03a6b3e..8c71cfd 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -873,7 +873,7 @@ public:
/** Returns true, if the OLE object will be shown as symbol. */
inline bool IsSymbol() const { return mbSymbol; }
/** Returns the storage name for the OLE object. */
- String GetOleStorageName() const;
+ OUString GetOleStorageName() const;
/** Returns true, if this object is an OCX form control. */
inline bool IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; }
@@ -1066,7 +1066,7 @@ private:
const XclImpDffConvData& GetConvData() const;
/** Reads contents of a hyperlink property and returns the extracted URL. */
- String ReadHlinkProperty( SvStream& rDffStrm ) const;
+ OUString ReadHlinkProperty( SvStream& rDffStrm ) const;
/** Processes a drawing container (all drawing data of a sheet). */
void ProcessDgContainer( SvStream& rDffStrm, const DffRecordHeader& rDgHeader );
@@ -1226,7 +1226,7 @@ public:
void SetOleNameOverrideInfo( const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& rxOverrideInfo ) { mxOleCtrlNameOverride = rxOverrideInfo; }
/** Returns the name of overridden name ( or zero length string ) for
associated object id. */
- String GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId );
+ OUString GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId );
// ------------------------------------------------------------------------
private:
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index aaca8d2..7e9e1d0 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -516,7 +516,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
break;
case FT_ConstString:
{
- String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar));
+ OUString aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar));
aStack << aPool.Store( aTmp );
}
break;
@@ -535,12 +535,12 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
break;
case FT_Nrref:
{
- String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar));
+ OUString aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar));
if( rRangeNameBufferWK3.FindRel( aTmp, nRngIndex ) )
aStack << aPool.Store( nRngIndex );
else
{
- String aText( RTL_CONSTASCII_USTRINGPARAM( "NRREF " ) );
+ OUString aText( "NRREF ");
aText += aTmp;
aStack << aPool.Store( aText );
}
@@ -548,12 +548,12 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
break;
case FT_Absnref:
{
- String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar));
+ OUString aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar));
if( rRangeNameBufferWK3.FindAbs( aTmp, nRngIndex ) )
aStack << aPool.Store( nRngIndex );
else
{
- String aText( RTL_CONSTASCII_USTRINGPARAM( "ABSNREF " ) );
+ OUString aText( "ABSNREF " );
aText += aTmp;
aStack << aPool.Store( aText );
}
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 04c5366..64663cf 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -195,7 +195,7 @@ void ImportLotus::Userrange( void )
sal_Char aBuffer[ 17 ];
pIn->Read( aBuffer, 16 );
aBuffer[ 16 ] = 0;
- String aName( aBuffer, eQuellChar );
+ OUString aName( aBuffer, strlen(aBuffer), eQuellChar );
Read( aScRange );
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 608a38a..ba1522a 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list