[Libreoffice-commits] core.git: 95 commits - chart2/source cui/source include/editeng include/svx sc/source sd/source sfx2/source svx/inc svx/source sw/source
Noel Grandin
noel at peralex.com
Thu Sep 5 00:17:30 PDT 2013
chart2/source/controller/main/DragMethod_Base.cxx | 2
chart2/source/controller/main/DragMethod_Base.hxx | 2
chart2/source/controller/main/DragMethod_PieSegment.cxx | 4
chart2/source/controller/main/DragMethod_PieSegment.hxx | 2
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 2
chart2/source/controller/main/DragMethod_RotateDiagram.hxx | 2
cui/source/dialogs/cuifmsearch.cxx | 4
cui/source/factory/dlgfact.cxx | 60 +--
cui/source/factory/dlgfact.hxx | 80 ++--
cui/source/inc/numfmt.hxx | 4
cui/source/tabpages/numfmt.cxx | 87 ++--
cui/source/tabpages/tpbitmap.cxx | 2
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
cui/source/tabpages/tplnedef.cxx | 2
cui/source/tabpages/tplneend.cxx | 2
include/editeng/outliner.hxx | 8
include/svx/ParseContext.hxx | 2
include/svx/SpellDialogChildWindow.hxx | 2
include/svx/XPropertyEntry.hxx | 10
include/svx/checklbx.hxx | 8
include/svx/databaselocationinput.hxx | 5
include/svx/dialcontrol.hxx | 2
include/svx/dlgctrl.hxx | 6
include/svx/fmpage.hxx | 6
include/svx/fmsearch.hxx | 11
include/svx/fontlb.hxx | 2
include/svx/fontworkgallery.hxx | 2
include/svx/frmdirlbox.hxx | 2
include/svx/gallery.hxx | 16
include/svx/gallery1.hxx | 14
include/svx/galmisc.hxx | 11
include/svx/galtheme.hxx | 14
include/svx/hlnkitem.hxx | 22 -
include/svx/itemwin.hxx | 2
include/svx/langbox.hxx | 6
include/svx/linectrl.hxx | 4
include/svx/linkwarn.hxx | 2
include/svx/nbdtmg.hxx | 20 -
include/svx/numfmtsh.hxx | 96 ++---
include/svx/numinf.hxx | 8
include/svx/numvset.hxx | 4
include/svx/pagectrl.hxx | 4
include/svx/pageitem.hxx | 8
include/svx/passwd.hxx | 8
include/svx/pfiledlg.hxx | 2
include/svx/pszctrl.hxx | 2
include/svx/rubydialog.hxx | 2
include/svx/sidebar/ColorControl.hxx | 6
include/svx/srchdlg.hxx | 14
include/svx/svdcrtv.hxx | 6
include/svx/svddrgmt.hxx | 10
include/svx/svdedtv.hxx | 8
include/svx/svdetc.hxx | 6
include/svx/svdmodel.hxx | 22 -
include/svx/svdmrkv.hxx | 8
include/svx/svdoashp.hxx | 2
include/svx/svdobj.hxx | 2
include/svx/svdocapt.hxx | 2
include/svx/svdocirc.hxx | 2
include/svx/svdoedge.hxx | 2
include/svx/svdograf.hxx | 6
include/svx/svdomeas.hxx | 4
include/svx/svdoole2.hxx | 10
include/svx/svdopath.hxx | 2
include/svx/svdorect.hxx | 2
include/svx/svdotable.hxx | 2
include/svx/svdotext.hxx | 16
include/svx/svdouno.hxx | 16
include/svx/svdovirt.hxx | 2
include/svx/svdpagv.hxx | 8
include/svx/svdpntv.hxx | 16
include/svx/svdundo.hxx | 18
include/svx/svdview.hxx | 2
include/svx/svdxcgv.hxx | 2
include/svx/svxdlg.hxx | 58 +--
include/svx/swframeposstrings.hxx | 2
include/svx/sxlayitm.hxx | 2
include/svx/sxmfsitm.hxx | 2
include/svx/sxonitm.hxx | 2
include/svx/tbcontrl.hxx | 9
include/svx/txencbox.hxx | 4
include/svx/txenctab.hxx | 2
include/svx/ucsubset.hxx | 6
include/svx/unoapi.hxx | 1
include/svx/xbtmpit.hxx | 2
include/svx/xcolit.hxx | 2
include/svx/xflclit.hxx | 2
include/svx/xflftrit.hxx | 2
include/svx/xflhtit.hxx | 2
include/svx/xftshcit.hxx | 2
include/svx/xit.hxx | 12
include/svx/xlnclit.hxx | 2
include/svx/xlndsit.hxx | 2
include/svx/xlnedit.hxx | 2
include/svx/xlnstit.hxx | 2
include/svx/xmleohlp.hxx | 1
include/svx/xmlexchg.hxx | 8
include/svx/xmlgrhlp.hxx | 10
include/svx/xoutbmp.hxx | 6
include/svx/xsflclit.hxx | 2
include/svx/xtable.hxx | 48 +-
sc/source/filter/html/htmlexp.cxx | 6
sc/source/filter/html/htmlexp2.cxx | 4
sd/source/core/sdpage.cxx | 4
sd/source/core/stlsheet.cxx | 2
sfx2/source/appl/app.cxx | 3
sfx2/source/appl/appdde.cxx | 22 -
sfx2/source/appl/appopen.cxx | 28 -
sfx2/source/appl/appserv.cxx | 6
sfx2/source/appl/appuno.cxx | 90 ++--
sfx2/source/appl/childwin.cxx | 32 -
sfx2/source/appl/fileobj.cxx | 20 -
sfx2/source/appl/helpdispatch.cxx | 6
sfx2/source/appl/helpinterceptor.cxx | 6
sfx2/source/appl/imagemgr.cxx | 2
sfx2/source/appl/impldde.cxx | 10
sfx2/source/appl/linkmgr2.cxx | 30 -
sfx2/source/appl/linksrc.cxx | 24 -
sfx2/source/appl/lnkbase2.cxx | 30 -
sfx2/source/appl/newhelp.cxx | 128 +++----
sfx2/source/appl/opengrf.cxx | 4
sfx2/source/appl/openuriexternally.cxx | 4
sfx2/source/appl/sfxpicklist.cxx | 10
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 2
svx/inc/dragmt3d.hxx | 2
svx/inc/galbrws2.hxx | 6
svx/inc/galobj.hxx | 28 -
svx/inc/tbunosearchcontrollers.hxx | 2
svx/source/accessibility/charmapacc.cxx | 4
svx/source/core/extedit.cxx | 9
svx/source/core/graphichelper.cxx | 8
svx/source/customshapes/EnhancedCustomShape2d.cxx | 6
svx/source/customshapes/EnhancedCustomShape3d.cxx | 4
svx/source/dialog/SpellDialogChildWindow.cxx | 4
svx/source/dialog/_bmpmask.cxx | 14
svx/source/dialog/_contdlg.cxx | 16
svx/source/dialog/charmap.cxx | 2
svx/source/dialog/checklbx.cxx | 4
svx/source/dialog/compressgraphicdialog.cxx | 2
svx/source/dialog/contwnd.cxx | 4
svx/source/dialog/dialcontrol.cxx | 6
svx/source/dialog/dlgctl3d.cxx | 2
svx/source/dialog/dlgctrl.cxx | 2
svx/source/dialog/docrecovery.cxx | 52 +-
svx/source/dialog/fntctrl.cxx | 47 +-
svx/source/dialog/fontlb.cxx | 2
svx/source/dialog/fontwork.cxx | 3
svx/source/dialog/frmdirlbox.cxx | 2
svx/source/dialog/imapdlg.cxx | 42 +-
svx/source/dialog/imapwnd.cxx | 53 +-
svx/source/dialog/imapwnd.hxx | 6
svx/source/dialog/langbox.cxx | 29 -
svx/source/dialog/linkwarn.cxx | 6
svx/source/dialog/pagectrl.cxx | 10
svx/source/dialog/passwd.cxx | 8
svx/source/dialog/pfiledlg.cxx | 59 +--
svx/source/dialog/relfld.cxx | 10
svx/source/dialog/rubydialog.cxx | 20 -
svx/source/dialog/srchdlg.cxx | 66 +--
svx/source/dialog/svxbmpnumvalueset.cxx | 7
svx/source/dialog/svxruler.cxx | 4
svx/source/dialog/swframeposstrings.cxx | 4
svx/source/dialog/txencbox.cxx | 6
svx/source/dialog/txenctab.cxx | 2
svx/source/engine3d/dragmt3d.cxx | 2
svx/source/engine3d/float3d.cxx | 8
svx/source/fmcomp/fmgridcl.cxx | 4
svx/source/fmcomp/fmgridif.cxx | 10
svx/source/fmcomp/gridcell.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 10
svx/source/form/ParseContext.cxx | 2
svx/source/form/databaselocationinput.cxx | 28 -
svx/source/form/datanavi.cxx | 136 +++----
svx/source/form/filtnav.cxx | 2
svx/source/form/fmPropBrw.cxx | 2
svx/source/form/fmobj.cxx | 10
svx/source/form/fmpgeimp.cxx | 4
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmundo.cxx | 4
svx/source/form/formcontroller.cxx | 10
svx/source/form/navigatortree.cxx | 8
svx/source/form/navigatortreemodel.cxx | 12
svx/source/form/tbxform.cxx | 2
svx/source/gallery2/galbrws1.cxx | 30 -
svx/source/gallery2/galbrws1.hxx | 4
svx/source/gallery2/galbrws2.cxx | 47 +-
svx/source/gallery2/galctrl.cxx | 14
svx/source/gallery2/galexpl.cxx | 16
svx/source/gallery2/gallery1.cxx | 16
svx/source/gallery2/galmisc.cxx | 32 -
svx/source/gallery2/galobj.cxx | 40 +-
svx/source/gallery2/galtheme.cxx | 78 ++--
svx/source/gengal/gengal.cxx | 2
svx/source/inc/datanavi.hxx | 56 +--
svx/source/inc/docrecovery.hxx | 32 -
svx/source/inc/stringlistresource.hxx | 12
svx/source/items/customshapeitem.cxx | 6
svx/source/items/hlnkitem.cxx | 14
svx/source/items/numfmtsh.cxx | 181 ++++------
svx/source/items/numinf.cxx | 10
svx/source/items/pageitem.cxx | 12
svx/source/mnuctrls/clipboardctl.cxx | 4
svx/source/mnuctrls/fntctl.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 10
svx/source/sidebar/area/AreaPropertyPanel.cxx | 16
svx/source/sidebar/area/AreaPropertyPanel.hxx | 6
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 8
svx/source/sidebar/line/LinePropertyPanel.cxx | 4
svx/source/sidebar/line/LinePropertyPanel.hxx | 4
svx/source/sidebar/line/LineWidthControl.cxx | 32 -
svx/source/sidebar/line/LineWidthControl.hxx | 4
svx/source/sidebar/line/LineWidthValueSet.cxx | 4
svx/source/sidebar/line/LineWidthValueSet.hxx | 4
svx/source/sidebar/nbdtmg.cxx | 155 ++++----
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 42 +-
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 76 ++--
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 16
svx/source/sidebar/text/SvxSBFontNameBox.hxx | 4
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 18
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 2
svx/source/sidebar/text/TextPropertyPanel.cxx | 4
svx/source/sidebar/tools/ColorControl.cxx | 8
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 13
svx/source/stbctrls/insctrl.cxx | 4
svx/source/stbctrls/pszctrl.cxx | 38 +-
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 10
svx/source/stbctrls/zoomsliderctrl.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 4
svx/source/svdraw/svddrgm1.hxx | 16
svx/source/svdraw/svddrgmt.cxx | 94 ++---
svx/source/svdraw/svddrgv.cxx | 13
svx/source/svdraw/svdedtv1.cxx | 29 -
svx/source/svdraw/svdedtv2.cxx | 9
svx/source/svdraw/svdedxv.cxx | 21 -
svx/source/svdraw/svdfmtf.cxx | 15
svx/source/svdraw/svdglev.cxx | 8
svx/source/svdraw/svdhdl.cxx | 6
svx/source/svdraw/svdmark.cxx | 20 -
svx/source/svdraw/svdmodel.cxx | 72 +--
svx/source/svdraw/svdmrkv.cxx | 21 -
svx/source/svdraw/svdoashp.cxx | 10
svx/source/svdraw/svdobj.cxx | 4
svx/source/svdraw/svdocapt.cxx | 4
svx/source/svdraw/svdocirc.cxx | 2
svx/source/svdraw/svdoedge.cxx | 4
svx/source/svdraw/svdograf.cxx | 48 +-
svx/source/svdraw/svdomeas.cxx | 37 --
svx/source/svdraw/svdoole2.cxx | 26 -
svx/source/svdraw/svdopath.cxx | 72 +--
svx/source/svdraw/svdorect.cxx | 4
svx/source/svdraw/svdotext.cxx | 30 -
svx/source/svdraw/svdotextdecomposition.cxx | 4
svx/source/svdraw/svdotextpathdecomposition.cxx | 6
svx/source/svdraw/svdotxat.cxx | 21 -
svx/source/svdraw/svdotxdr.cxx | 2
svx/source/svdraw/svdotxed.cxx | 2
svx/source/svdraw/svdotxfl.cxx | 2
svx/source/svdraw/svdotxln.cxx | 4
svx/source/svdraw/svdouno.cxx | 20 -
svx/source/svdraw/svdoutl.cxx | 2
svx/source/svdraw/svdovirt.cxx | 2
svx/source/svdraw/svdpntv.cxx | 13
svx/source/svdraw/svdpoev.cxx | 6
svx/source/svdraw/svdundo.cxx | 90 ++--
svx/source/svdraw/svdview.cxx | 32 -
svx/source/svdraw/svdxcgv.cxx | 2
svx/source/table/cell.cxx | 12
svx/source/table/svdotable.cxx | 2
svx/source/table/tablertfexporter.cxx | 2
svx/source/table/tablertfimporter.cxx | 2
svx/source/tbxctrls/colorwindow.hxx | 2
svx/source/tbxctrls/fillctrl.cxx | 71 +--
svx/source/tbxctrls/fontworkgallery.cxx | 4
svx/source/tbxctrls/grafctrl.cxx | 24 -
svx/source/tbxctrls/itemwin.cxx | 4
svx/source/tbxctrls/layctrl.cxx | 26 -
svx/source/tbxctrls/lboxctrl.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 8
svx/source/tbxctrls/tbcontrl.cxx | 38 --
svx/source/tbxctrls/tbunocontroller.cxx | 6
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2
svx/source/toolbars/extrusionbar.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 22 -
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 6
svx/source/unodraw/UnoGraphicExporter.cxx | 16
svx/source/unodraw/UnoNameItemTable.cxx | 4
svx/source/unodraw/XPropertyTable.cxx | 18
svx/source/unodraw/unomod.cxx | 38 +-
svx/source/unodraw/unomtabl.cxx | 18
svx/source/unodraw/unoprov.cxx | 38 --
svx/source/unodraw/unoshap2.cxx | 4
svx/source/unodraw/unoshape.cxx | 6
svx/source/unodraw/unoshtxt.cxx | 2
svx/source/xml/xmleohlp.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 86 ++--
svx/source/xml/xmlxtimp.cxx | 3
svx/source/xoutdev/XPropertyEntry.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 30 -
svx/source/xoutdev/xattr.cxx | 122 +++---
svx/source/xoutdev/xattrbmp.cxx | 4
svx/source/xoutdev/xtabbtmp.cxx | 20 -
svx/source/xoutdev/xtabcolr.cxx | 123 ++----
svx/source/xoutdev/xtabdash.cxx | 23 -
svx/source/xoutdev/xtabgrdt.cxx | 2
svx/source/xoutdev/xtabhtch.cxx | 2
svx/source/xoutdev/xtable.cxx | 24 -
svx/source/xoutdev/xtablend.cxx | 2
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 2
sw/source/ui/inc/SwSpellDialogChildWindow.hxx | 2
sw/source/ui/shells/drformsh.cxx | 4
317 files changed, 2407 insertions(+), 2563 deletions(-)
New commits:
commit 9f04bfd8d53a7640bd6f0707708401a8ac9fb386
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 16:41:31 2013 +0200
convert svx/* from XubString to OUString
Change-Id: Ifa063924d95bfe397bd512411a44247d4c016018
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 7331739..2dc6275 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -498,8 +498,8 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
if( bUndo )
{
OUString aStr(SVX_RESSTR(RID_STR_FORM));
- XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
- aUndoStr.SearchAndReplace(OUString('#'), aStr);
+ OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+ aUndoStr = aUndoStr.replaceFirst("#", aStr);
pModel->BegUndo(aUndoStr);
}
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 263826e..bbcfcb3 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -275,7 +275,7 @@ namespace svxform
Reference< XChild > xElement( pEntry->GetChildIFace() );
if (bAlterModel)
{
- XubString aStr;
+ OUString aStr;
if (pEntry->ISA(FmFormData))
aStr = SVX_RESSTR(RID_STR_FORM);
else
@@ -291,8 +291,8 @@ namespace svxform
if( bUndo )
{
- XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
- aUndoStr.SearchAndReplace(OUString('#'), aStr);
+ OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+ aUndoStr = aUndoStr.replaceFirst("#", aStr);
m_pFormModel->BegUndo(aUndoStr);
}
@@ -381,7 +381,7 @@ namespace svxform
Reference< XChild > xElement ( pEntry->GetChildIFace() );
if (bAlterModel)
{
- XubString aStr;
+ OUString aStr;
if (pEntry->ISA(FmFormData))
aStr = SVX_RESSTR(RID_STR_FORM);
else
@@ -389,8 +389,8 @@ namespace svxform
if( bUndo )
{
- XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE));
- aUndoStr.SearchAndReplace(OUString('#'), aStr);
+ OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE));
+ aUndoStr = aUndoStr.replaceFirst("#", aStr);
m_pFormModel->BegUndo(aUndoStr);
}
}
diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index 924cba0..38b86f4 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -130,16 +130,16 @@ void LineWidthControl::Initialize()
maMFWidth.SetMin( maMFWidth.Normalize( nMin ), FUNIT_TWIP );
maMFWidth.SetMax( maMFWidth.Normalize( nMax ), FUNIT_TWIP );
- rStr = new XubString[9];
+ rStr = new OUString[9];
//modify,
- rStr[0] = OUString("05");
- rStr[1] = OUString("08");
- rStr[2] = OUString("10");
- rStr[3] = OUString("15");
- rStr[4] = OUString("23");
- rStr[5] = OUString("30");
- rStr[6] = OUString("45");
- rStr[7] = OUString("60");
+ rStr[0] = "05";
+ rStr[1] = "08";
+ rStr[2] = "10";
+ rStr[3] = "15";
+ rStr[4] = "23";
+ rStr[5] = "30";
+ rStr[6] = "45";
+ rStr[7] = "60";
rStr[8] = SVX_RESSTR(STR_WIDTH_LAST_CUSTOM);
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
@@ -147,8 +147,8 @@ void LineWidthControl::Initialize()
for(int i = 0; i <= 7 ; i++)
{
- rStr[i] = rStr[i].Insert(cSep, 1);//Modify
- rStr[i].Append(mstrPT);
+ rStr[i] = rStr[i].replaceAt(1, 1, OUString(cSep));//Modify
+ rStr[i] += mstrPT;
}
//end
diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx
index c31a3de..e4060f9 100644
--- a/svx/source/sidebar/line/LineWidthControl.hxx
+++ b/svx/source/sidebar/line/LineWidthControl.hxx
@@ -50,8 +50,8 @@ private:
FixedText maFTWidth;
MetricField maMFWidth;
SfxMapUnit meMapUnit;
- XubString* rStr;
- XubString mstrPT; //
+ OUString* rStr;
+ OUString mstrPT; //
long mnCustomWidth;
bool mbCustom;
bool mbColseByEdit;
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx
index ffecfb2..d19c315 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -29,7 +29,7 @@ LineWidthValueSet::LineWidthValueSet (
nSelItem(0),
bCusEnable(false)
{
- strUnit = new XubString[9];
+ strUnit = new OUString[9];
SetColCount( 1 );
SetLineCount( 9);
}
@@ -46,7 +46,7 @@ LineWidthValueSet::~LineWidthValueSet (void)
-void LineWidthValueSet::SetUnit(XubString* str)
+void LineWidthValueSet::SetUnit(OUString* str)
{
for(int i = 0; i < 9; i++)
{
diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx
index 1e97af1..20492e5 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.hxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.hxx
@@ -30,7 +30,7 @@ public:
LineWidthValueSet (Window* pParent, const ResId& rResId);
virtual ~LineWidthValueSet (void);
- void SetUnit(XubString* str);
+ void SetUnit(OUString* str);
void SetSelItem(sal_uInt16 nSel);
sal_uInt16 GetSelItem();
void SetImage(Image img);
@@ -41,7 +41,7 @@ public:
protected:
VirtualDevice* pVDev;
sal_uInt16 nSelItem;
- XubString* strUnit;
+ OUString* strUnit;
Image imgCus;
bool bCusEnable;
};
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index da555ea..9b1a15e 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -639,14 +639,13 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
pInsPointUndo = dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pMarkedObj) );
DBG_ASSERT( pInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
- XubString aStr(ImpGetResStr(STR_DragInsertPoint));
+ OUString aStr(ImpGetResStr(STR_DragInsertPoint));
OUString aName(pMarkedObj->TakeObjNameSingul());
- xub_StrLen nPos(aStr.SearchAscii("%1"));
+ sal_Int32 nPos(aStr.indexOf("%1"));
- if(STRING_NOTFOUND != nPos)
+ if(-1 != nPos)
{
- aStr.Erase(nPos, 2);
- aStr.Insert(aName, nPos);
+ aStr = aStr.replaceAt(nPos, 2, aName);
}
aInsPointUndoStr = aStr;
@@ -749,10 +748,10 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
UnmarkAllGluePoints();
pInsPointUndo= dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj) );
DBG_ASSERT( pInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
- XubString aStr(ImpGetResStr(STR_DragInsertGluePoint));
+ OUString aStr(ImpGetResStr(STR_DragInsertGluePoint));
OUString aName(pObj->TakeObjNameSingul());
- aStr.SearchAndReplaceAscii("%1", aName);
+ aStr = aStr.replaceFirst("%1", aName);
aInsPointUndoStr=aStr;
SdrGluePointList* pGPL=pObj->ForceGluePointList();
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 7f0c5f1..edd1eec 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -184,9 +184,9 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
if( bUndo )
{
- XubString aStr(ImpGetResStr(STR_EditMove));
+ OUString aStr(ImpGetResStr(STR_EditMove));
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr += ImpGetResStr(STR_EditWithCopy);
// meeds its own UndoGroup because of its parameters
BegUndo(aStr,GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVE);
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 21a7ba2..81a80de 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1369,17 +1369,13 @@ sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
ESelection aESel(pTextEditOutlinerView->GetSelection());
if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaAnz-1))
{
- XubString aStr(pTextEditOutliner->GetText(pLastPara));
-
- if(aStr.Len() == aESel.nEndPos)
+ if( pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nEndPos )
bRet = sal_True;
}
// in case the selection was done backwards
if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaAnz-1))
{
- XubString aStr(pTextEditOutliner->GetText(pLastPara));
-
- if(aStr.Len() == aESel.nStartPos)
+ if(pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nStartPos)
bRet = sal_True;
}
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 72d6d57..386caf7 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1062,25 +1062,22 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
void ImpSdrGDIMetaFileImport::DoAction(MetaTextAction& rAct)
{
- XubString aStr(rAct.GetText());
- aStr.Erase(0,rAct.GetIndex());
- aStr.Erase(rAct.GetLen());
+ OUString aStr(rAct.GetText());
+ aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct );
}
void ImpSdrGDIMetaFileImport::DoAction(MetaTextArrayAction& rAct)
{
- XubString aStr(rAct.GetText());
- aStr.Erase(0,rAct.GetIndex());
- aStr.Erase(rAct.GetLen());
+ OUString aStr(rAct.GetText());
+ aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct );
}
void ImpSdrGDIMetaFileImport::DoAction(MetaStretchTextAction& rAct)
{
- XubString aStr(rAct.GetText());
- aStr.Erase(0,rAct.GetIndex());
- aStr.Erase(rAct.GetLen());
+ OUString aStr(rAct.GetText());
+ aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct );
}
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 359b413..83db166 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -362,8 +362,8 @@ static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void*
void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy)
{
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditMove));
- if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
+ OUString aStr(ImpGetResStr(STR_EditMove));
+ if (bCopy) aStr += ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_MOVE);
if (bCopy) ImpCopyMarkedGluePoints();
ImpTransformMarkedGluePoints(ImpMove,&rSiz);
@@ -381,7 +381,7 @@ static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3
void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
{
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_RESIZE);
if (bCopy) ImpCopyMarkedGluePoints();
@@ -400,7 +400,7 @@ static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void
void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy)
{
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditRotate));
+ OUString aStr(ImpGetResStr(STR_EditRotate));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_ROTATE);
if (bCopy) ImpCopyMarkedGluePoints();
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 1c7bf49..13f8c74 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -559,7 +559,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
if(!mbNameOk)
{
SdrMark* pMark = GetMark(0);
- XubString aNam;
+ OUString aNam;
if(!nAnz)
{
@@ -583,7 +583,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
{
SdrMark* pMark2 = GetMark(i);
OUString aStr1(pMark2->GetMarkedSdrObj()->TakeObjNamePlural());
- bEq = aNam.Equals(aStr1);
+ bEq = aNam == aStr1;
}
if(!bEq)
@@ -592,8 +592,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
}
}
- aNam.Insert(sal_Unicode(' '), 0);
- aNam.Insert(OUString::number( nAnz ), 0);
+ aNam = OUString::number( nAnz ) + " " + aNam;
}
const_cast<SdrMarkList*>(this)->maMarkName = aNam;
@@ -656,7 +655,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
else if(!rNameOk)
{
const SdrMark* pMark = GetMark(n1stMarkNum);
- XubString aNam;
+ OUString aNam;
if(1L == nMarkPtObjAnz)
{
@@ -682,7 +681,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
if(pPts && !pPts->empty() && pMark2->GetMarkedSdrObj())
{
OUString aStr1(pMark2->GetMarkedSdrObj()->TakeObjNamePlural());
- bEq = aNam.Equals(aStr1);
+ bEq = aNam == aStr1;
}
}
@@ -691,11 +690,10 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
aNam = ImpGetResStr(STR_ObjNamePlural);
}
- aNam.Insert(sal_Unicode(' '), 0);
- aNam.Insert(OUString::number( nMarkPtObjAnz ), 0);
+ aNam = OUString::number( nMarkPtObjAnz ) + " " + aNam;
}
- XubString aStr1;
+ OUString aStr1;
if(1L == nMarkPtAnz)
{
@@ -704,10 +702,10 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
else
{
aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoints : STR_ViewMarkedPoints));
- aStr1.SearchAndReplaceAscii("%2", OUString::number( nMarkPtAnz ));
+ aStr1 = aStr1.replaceFirst("%2", OUString::number( nMarkPtAnz ));
}
- aStr1.SearchAndReplaceAscii("%1", aNam);
+ aStr1 = aStr1.replaceFirst("%1", aNam);
rName = aStr1;
rNameOk = sal_True;
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 33f0888..a9a6fe5 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1000,10 +1000,10 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
aStr = aTmp;
// delete %O
- XubString aStr2(ImpGetResStr(STR_EditDelete));
+ OUString aStr2(ImpGetResStr(STR_EditDelete));
// UNICODE: delete point of ...
- aStr2.SearchAndReplaceAscii("%1", aStr);
+ aStr2 = aStr2.replaceFirst("%1", aStr);
return aStr2;
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a9f8cdc..1615b04 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -472,9 +472,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
if(nParaAnz==1)
{
// if it is only one paragraph, check if that paragraph is empty
- XubString aStr(pOutliner->GetText(p1stPara));
-
- if(!aStr.Len())
+ if( pOutliner->GetText(p1stPara).isEmpty() )
nParaAnz = 0;
}
@@ -970,7 +968,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
OUString SdrTextObj::TakeObjNameSingul() const
{
- XubString aStr;
+ OUString aStr;
switch(eTextKind)
{
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index f854be1..e426468 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1026,7 +1026,7 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnl
{
// bOnlyHardAttr has no effect here at all.
bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
- const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer;
+ const OUString& aNam = bMeasure ? aMeasureLayer : aAktLayer;
rAttr.Put(SdrLayerNameItem(aNam));
SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
if (nLayer!=SDRLAYER_NOTFOUND) {
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index e6324da..8ff5f02 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -664,7 +664,7 @@ void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
{
bCopy=sal_False; // TODO: not yet implemented
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditMove));
+ OUString aStr(ImpGetResStr(STR_EditMove));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_MOVE);
ImpTransformMarkedPoints(ImpMove,&rSiz);
@@ -685,7 +685,7 @@ void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFac
{
bCopy=sal_False; // TODO: not yet implemented
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_RESIZE);
ImpTransformMarkedPoints(ImpResize,&rRef,&xFact,&yFact);
@@ -706,7 +706,7 @@ void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCo
{
bCopy=sal_False; // TODO: not yet implemented
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_ROTATE);
double nSin=sin(nWink*nPi180);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index af0b4ab..68d258e 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1166,7 +1166,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
OUString SdrView::GetStatusText()
{
OUString aStr;
- XubString aName;
+ OUString aName;
aStr += STR_NOTHING;
@@ -1280,7 +1280,7 @@ OUString SdrView::GetStatusText()
aStr = "";
}
}
- else if(aName.Len())
+ else if(!aName.isEmpty())
{
aStr = aStr.replaceFirst("%1", aName);
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index a6e1d9d..a1e6eb5 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -67,25 +67,37 @@ bool XColorList::Create()
sal_uInt32 b(0);
// <!-- Gray palette from white to black -->
- XubString aStrGrey( SVX_RESSTR( RID_SVXSTR_COLOR_GREY ) );
+ const OUString aStrGrey( SVX_RESSTR( RID_SVXSTR_COLOR_GREY ) );
Insert( new XColorEntry( Color( 0xff, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_WHITE ) ) );
- aStrGrey.AppendAscii(" 1"); Insert( new XColorEntry( Color( 0xee, 0xee, 0xee ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('2')); Insert( new XColorEntry( Color( 0xdd, 0xdd, 0xdd ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('3')); Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xcc ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('4')); Insert( new XColorEntry( Color( 0xb2, 0xb2, 0xb2 ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('5')); Insert( new XColorEntry( Color( 0x99, 0x99, 0x99 ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('6')); Insert( new XColorEntry( Color( 0x80, 0x80, 0x80 ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('7')); Insert( new XColorEntry( Color( 0x66, 0x66, 0x66 ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('8')); Insert( new XColorEntry( Color( 0x33, 0x33, 0x33 ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('9')); Insert( new XColorEntry( Color( 0x1c, 0x1c, 0x1c ), aStrGrey ) );
- aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('1')); aStrGrey.AppendAscii("0"); Insert( new XColorEntry( Color( 0x11, 0x11, 0x11 ), aStrGrey ) );
+ Insert( new XColorEntry( Color( 0xee, 0xee, 0xee ), aStrGrey + " 1" ) );
+ Insert( new XColorEntry( Color( 0xdd, 0xdd, 0xdd ), aStrGrey + " 2" ) );
+ Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xcc ), aStrGrey + " 3" ) );
+ Insert( new XColorEntry( Color( 0xb2, 0xb2, 0xb2 ), aStrGrey + " 4" ) );
+ Insert( new XColorEntry( Color( 0x99, 0x99, 0x99 ), aStrGrey + " 5" ) );
+ Insert( new XColorEntry( Color( 0x80, 0x80, 0x80 ), aStrGrey + " 6" ) );
+ Insert( new XColorEntry( Color( 0x66, 0x66, 0x66 ), aStrGrey + " 7" ) );
+ Insert( new XColorEntry( Color( 0x33, 0x33, 0x33 ), aStrGrey + " 8" ) );
+ Insert( new XColorEntry( Color( 0x1c, 0x1c, 0x1c ), aStrGrey + " 9" ) );
+ Insert( new XColorEntry( Color( 0x11, 0x11, 0x11 ), aStrGrey + " 10") );
Insert( new XColorEntry( Color( 0x00, 0x00, 0x00 ), SVX_RESSTR( RID_SVXSTR_COLOR_BLACK ) ) );
// <!-- Base colors step 0 to 10 -->
const sal_uInt32 nNumColorsInGroup(12);
const sal_uInt32 nNumGroups(11);
- XubString aStrCol[nNumColorsInGroup];
+ const OUString aStrCol[nNumColorsInGroup] = {
+ SVX_RESSTR(RID_SVXSTR_COLOR_YELLOW),
+ SVX_RESSTR(RID_SVXSTR_COLOR_ORANGE),
+ SVX_RESSTR(RID_SVXSTR_COLOR_RED),
+ SVX_RESSTR(RID_SVXSTR_COLOR_PINK),
+ SVX_RESSTR(RID_SVXSTR_COLOR_MAGENTA),
+ SVX_RESSTR(RID_SVXSTR_COLOR_PURPLE),
+ SVX_RESSTR(RID_SVXSTR_COLOR_BLUE),
+ SVX_RESSTR(RID_SVXSTR_COLOR_SKYBLUE),
+ SVX_RESSTR(RID_SVXSTR_COLOR_CYAN),
+ SVX_RESSTR(RID_SVXSTR_COLOR_TURQUOISE),
+ SVX_RESSTR(RID_SVXSTR_COLOR_GREEN),
+ SVX_RESSTR(RID_SVXSTR_COLOR_YELLOWGREEN) };
const sal_uInt32 aStdCol[nNumColorsInGroup * nNumGroups] = {
0xffff99, 0xff6600, 0xff3333, 0xff00cc, 0xff33ff, 0x9900ff, 0x6666ff, 0x00ccff, 0x66ffff, 0x33ff99, 0x99ff66, 0xccff00,
0xffff66, 0xffcc00, 0xff9999, 0xff66cc, 0xff99ff, 0xcc66ff, 0x9999ff, 0x9999ff, 0x99ffff, 0x66ff99, 0x99ff99, 0xccff66,
@@ -101,56 +113,14 @@ bool XColorList::Create()
for(a = 0; a < nNumGroups; a++)
{
- switch(a)
- {
- case 0:
- {
- aStrCol[0] = SVX_RESSTR(RID_SVXSTR_COLOR_YELLOW);
- aStrCol[1] = SVX_RESSTR(RID_SVXSTR_COLOR_ORANGE);
- aStrCol[2] = SVX_RESSTR(RID_SVXSTR_COLOR_RED);
- aStrCol[3] = SVX_RESSTR(RID_SVXSTR_COLOR_PINK);
- aStrCol[4] = SVX_RESSTR(RID_SVXSTR_COLOR_MAGENTA);
- aStrCol[5] = SVX_RESSTR(RID_SVXSTR_COLOR_PURPLE);
- aStrCol[6] = SVX_RESSTR(RID_SVXSTR_COLOR_BLUE);
- aStrCol[7] = SVX_RESSTR(RID_SVXSTR_COLOR_SKYBLUE);
- aStrCol[8] = SVX_RESSTR(RID_SVXSTR_COLOR_CYAN);
- aStrCol[9] = SVX_RESSTR(RID_SVXSTR_COLOR_TURQUOISE);
- aStrCol[10] = SVX_RESSTR(RID_SVXSTR_COLOR_GREEN);
- aStrCol[11] = SVX_RESSTR(RID_SVXSTR_COLOR_YELLOWGREEN);
- break;
- }
- case 1:
- {
- for(b = 0; b < nNumColorsInGroup; b++)
- {
- aStrCol[b].AppendAscii(" 1");
- }
- break;
- }
- case 10:
- {
- for(b = 0; b < nNumColorsInGroup; b++)
- {
- aStrCol[b].SetChar(aStrCol[b].Len() - 1, sal_Unicode('1'));
- aStrCol[b].AppendAscii("0");
- }
- break;
- }
- default: // 2 .. 9, 11
- {
- for(b = 0; b < nNumColorsInGroup; b++)
- {
- aStrCol[b].SetChar(aStrCol[b].Len() - 1, sal_Unicode('0') + sal_Unicode(a % 10));
- }
- break;
- }
- }
+ OUString aSuffix;
+ if (a > 0) aSuffix = OUString::number(a);
const sal_uInt32 nOffset(a * nNumColorsInGroup);
for(b = 0; b < nNumColorsInGroup; b++)
{
- Insert( new XColorEntry( aStdCol[nOffset + b], aStrCol[b] ) );
+ Insert( new XColorEntry( aStdCol[nOffset + b], aStrCol[b] + aSuffix ) );
}
}
@@ -168,32 +138,19 @@ bool XColorList::Create()
Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_SEABLUE ) ) );
// <!-- add Chart colors from original palette (also 12, coincidence?) -->
- XubString aStrChart( SVX_RESSTR( RID_SVXSTR_COLOR_CHART ) );
- aStrChart.AppendAscii(" 1");
- Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('2'));
- Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('3'));
- Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('4'));
- Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('5'));
- Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('6'));
- Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('7'));
- Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('8'));
- Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('9'));
- Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('1'));
- aStrChart.AppendAscii("0");
- Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('1'));
- Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStrChart ) );
- aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('2'));
- Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStrChart ) );
+ const OUString aStrChart( SVX_RESSTR( RID_SVXSTR_COLOR_CHART ) );
+ Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStrChart + " 1" ) );
+ Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStrChart + " 2" ) );
+ Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStrChart + " 3" ) );
+ Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStrChart + " 4" ) );
+ Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStrChart + " 5" ) );
+ Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStrChart + " 6" ) );
+ Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStrChart + " 7" ) );
+ Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStrChart + " 8" ) );
+ Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStrChart + " 9" ) );
+ Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStrChart + " 10" ) );
+ Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStrChart + " 11" ) );
+ Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStrChart + " 12" ) );
return(165 == Count());
}
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 7cb5ed3..d34e60f 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -68,16 +68,11 @@ uno::Reference< container::XNameContainer > XDashList::createInstance()
bool XDashList::Create()
{
- XubString aStr(SVX_RESSTR(RID_SVXSTR_LINESTYLE));
- xub_StrLen nLen;
-
- aStr.AppendAscii(" 1");
- nLen = aStr.Len() - 1;
- Insert(new XDashEntry(XDash(XDASH_RECT,1, 50,1, 50, 50),aStr));
- aStr.SetChar(nLen, sal_Unicode('2'));
- Insert(new XDashEntry(XDash(XDASH_RECT,1,500,1,500,500),aStr));
- aStr.SetChar(nLen, sal_Unicode('3'));
- Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr));
+ const OUString aStr(SVX_RESSTR(RID_SVXSTR_LINESTYLE));
+
+ Insert(new XDashEntry(XDash(XDASH_RECT,1, 50,1, 50, 50),aStr + " 1"));
+ Insert(new XDashEntry(XDash(XDASH_RECT,1,500,1,500,500),aStr + " 2"));
+ Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr + " 3"));
return true;
}
commit e0848f6dae86e53dac12b18120e4362957d000d2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 15:53:52 2013 +0200
convert svx/source/accessibility/*.cxx from String to OUString
Change-Id: I98ddae6dafea9c52e4b96274c5f2881d929cf096
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 7728329..7b65526 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -696,7 +696,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
{
OExternalLockGuard aGuard( this );
ensureAlive();
- String sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE );
+ OUString sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE );
sal_Unicode c = mpParent->maText[0];
char buf[16] = "0x0000";
@@ -709,7 +709,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
}
if( c < 256 )
snprintf( buf+6, 10, " (%d)", c );
- sDescription.AppendAscii(buf);
+ sDescription += OUString(buf, strlen(buf), RTL_TEXTENCODING_ASCII_US);
return sDescription;
}
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 7c571e4..42dc8cf 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -207,12 +207,12 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
OUString aMimeType;
SvtPathOptions aPathOpt;
- String sGraphicPath( aPathOpt.GetGraphicPath() );
+ OUString sGraphicPath( aPathOpt.GetGraphicPath() );
FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION, 0 );
Reference < XFilePicker > xFilePicker = aDialogHelper.GetFilePicker();
- aDialogHelper.SetTitle( OUString( "Save as Picture" ) );
+ aDialogHelper.SetTitle( "Save as Picture" );
INetURLObject aPath;
aPath.SetSmartURL( sGraphicPath );
commit a628d232c668ed4a58df8e20f4a363465bc0ff28
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 15:49:22 2013 +0200
convert svx/source/customshapes/*.cxx from String to OUString
Change-Id: Ie66bbb6280d050d908e0522cc2cb7a1efe627a6a
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 6ec8a72..a8170f4 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2151,7 +2151,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
aFillColor = GetColorData(
((XFillColorItem&)rCustomShapeSet.Get( XATTR_FILLCOLOR )).GetColorValue(),
std::min(nColorIndex, nColorCount-1), rObj.GetBrightness() );
- rObj.SetMergedItem( XFillColorItem( String(), aFillColor ) );
+ rObj.SetMergedItem( XFillColorItem( "", aFillColor ) );
}
break;
}
@@ -2170,7 +2170,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
std::min(nColorIndex, nColorCount-1), rObj.GetBrightness() ));
}
- rObj.SetMergedItem( XFillGradientItem( String(), aXGradient ) );
+ rObj.SetMergedItem( XFillGradientItem( "", aXGradient ) );
break;
}
case XFILL_HATCH:
@@ -2184,7 +2184,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
std::min(nColorIndex, nColorCount-1), rObj.GetBrightness() ));
}
- rObj.SetMergedItem( XFillHatchItem( String(), aXHatch ) );
+ rObj.SetMergedItem( XFillHatchItem( "", aXHatch ) );
break;
}
case XFILL_BITMAP:
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index df2694c..7ab4577 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -531,7 +531,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
p3DObj->NbcSetLayer( pShape2d->GetLayer() );
p3DObj->SetMergedItemSet( aLocalSet );
if ( bUseExtrusionColor )
- p3DObj->SetMergedItem( XFillColorItem( String(), ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) );
+ p3DObj->SetMergedItem( XFillColorItem( "", ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) );
p3DObj->SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
@@ -552,7 +552,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
else if ( aLocalFillStyle == XFILL_NONE )
{
XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR );
- p3DObj->SetMergedItem( XFillColorItem( String(), rLineColor.GetColorValue() ) );
+ p3DObj->SetMergedItem( XFillColorItem( "", rLineColor.GetColorValue() ) );
p3DObj->SetMergedItem( Svx3DDoubleSidedItem( sal_True ) );
p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
commit ef84ce9cec9fff75868433a862db8571440a10b4
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 15:29:16 2013 +0200
convert svx/source/dialog/*.cxx from String to OUString
Change-Id: Icba1afdaf0d6ec16d2d09788ed3346160cb7564d
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 5d9cc80..3961f28 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -75,7 +75,7 @@ public:
/** Inserts a list entry and sets the font used for this entry.
@param pColor The font color. NULL = use default listbox text color. */
void InsertFontEntry(
- const String& rString, const Font& rFont, const Color* pColor = NULL );
+ const OUString& rString, const Font& rFont, const Color* pColor = NULL );
/** Selects/deselects an entry specified by its position in the list box. */
void SelectEntryPos( sal_uInt16 nPos, bool bSelect = true );
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 15f83ee..ea97d6c 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -575,7 +575,7 @@ void SvxBmpMask::SetColorList( const XColorListRef &pList )
{
if ( pList.is() && ( pList != pColLst ) )
{
- const String aTransp(BMP_RESID(RID_SVXDLG_BMPMASK_STR_TRANSP).toString());
+ const OUString aTransp(BMP_RESID(RID_SVXDLG_BMPMASK_STR_TRANSP).toString());
pColLst = pList;
@@ -1210,23 +1210,23 @@ void SvxBmpMask::ApplyStyle()
*/
void SvxBmpMask::SetAccessibleNames (void)
{
- String sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString());
- String sSourceColorN;
+ OUString sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString());
+ OUString sSourceColorN;
sSourceColorN = sSourceColor;
- sSourceColorN.AppendAscii (" 1");
+ sSourceColorN += " 1";
aCbx1.SetAccessibleName (sSourceColorN);
sSourceColorN = sSourceColor;
- sSourceColorN.AppendAscii (" 2");
+ sSourceColorN += " 2";
aCbx2.SetAccessibleName (sSourceColorN);
sSourceColorN = sSourceColor;
- sSourceColorN.AppendAscii (" 3");
+ sSourceColorN += " 3";
aCbx3.SetAccessibleName (sSourceColorN);
sSourceColorN = sSourceColor;
- sSourceColorN.AppendAscii (" 4");
+ sSourceColorN += " 4";
aCbx4.SetAccessibleName (sSourceColorN);
}
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index d594ee0..d0fcd9e 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -557,15 +557,15 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
{
- String aStr;
+ OUString aStr;
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Point& rMousePos = pWnd->GetMousePos();
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
- aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) );
- aStr.Append( OUString(" / ") );
- aStr.Append( GetUnitString( rMousePos.Y(), eFieldUnit, cSep ) );
+ aStr = GetUnitString( rMousePos.X(), eFieldUnit, cSep );
+ aStr += " / ";
+ aStr += GetUnitString( rMousePos.Y(), eFieldUnit, cSep );
aStbStatus.SetItemText( 2, aStr );
@@ -574,15 +574,15 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
{
- String aStr;
+ OUString aStr;
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Size& rSize = pWnd->GetGraphicSize();
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
- aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) );
- aStr.Append( OUString(" x ") );
- aStr.Append( GetUnitString( rSize.Height(), eFieldUnit, cSep ) );
+ aStr = GetUnitString( rSize.Width(), eFieldUnit, cSep );
+ aStr += " x ";
+ aStr += GetUnitString( rSize.Height(), eFieldUnit, cSep );
aStbStatus.SetItemText( 3, aStr );
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 4f1cbf6..24fc2ce 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -400,7 +400,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 )
OUStringBuffer buf;
buf.appendUtf32( maFontCharMap.GetCharFromIndex( i ) );
- String aCharStr(buf.makeStringAndClear());
+ OUString aCharStr(buf.makeStringAndClear());
int nTextWidth = GetTextWidth(aCharStr);
int tx = x + (nX - nTextWidth + 1) / 2;
int ty = y + (nY - nTextHeight + 1) / 2;
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index f719403..e08d15c 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -252,7 +252,7 @@ void CompressGraphicsDialog::Compress(SvStream& aStream)
aFilterData[ 2 ].Name = "Quality";
aFilterData[ 2 ].Value <<= (sal_Int32) m_pQualityMF->GetValue();
- String aGraphicFormatName = m_pLosslessRB->IsChecked() ? String( "png" ) : String( "jpg" );
+ OUString aGraphicFormatName = m_pLosslessRB->IsChecked() ? OUString( "png" ) : OUString( "jpg" );
sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( aGraphicFormatName );
rFilter.ExportGraphic( aScaledGraphic, OUString( "none" ), aStream, nFilterFormat, &aFilterData );
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index deb6740..a6f0600 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -73,7 +73,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
SfxItemSet aSet( pModel->GetItemPool() );
aSet.Put( XFillStyleItem( XFILL_SOLID ) );
- aSet.Put( XFillColorItem( String(), TRANSCOL ) );
+ aSet.Put( XFillColorItem( "", TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pPathObj->SetMergedItemSetAndBroadcast(aSet);
@@ -120,7 +120,7 @@ void ContourWindow::InitSdrModel()
SfxItemSet aSet( pModel->GetItemPool() );
- aSet.Put( XFillColorItem( String(), TRANSCOL ) );
+ aSet.Put( XFillColorItem( "", TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pView->SetAttributes( aSet );
pView->SetFrameDragSingles( sal_True );
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index d02fd97..42e4e6f 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -386,7 +386,7 @@ void DialControl::SetNoRotation()
mpImpl->mbNoRot = true;
InvalidateControl();
if( mpImpl->mpLinkField )
- mpImpl->mpLinkField->SetText( String() );
+ mpImpl->mpLinkField->SetText( "" );
}
}
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index d8429e7..a9dc9d5 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -137,7 +137,7 @@ void Svx3DPreviewControl::Construct()
0, 0 );
aSet.Put( XLineStyleItem( XLINE_NONE ) );
aSet.Put( XFillStyleItem( XFILL_SOLID ) );
- aSet.Put( XFillColorItem( String(), Color( COL_WHITE ) ) );
+ aSet.Put( XFillColorItem( "", Color( COL_WHITE ) ) );
mpScene->SetMergedItemSet(aSet);
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index b6f32be..a79e2d9 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -493,12 +493,12 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
// append as new one
// TODO think about mmatching Module name to a corresponding icon
- String sURL = aNew.OrgURL;
- if (!sURL.Len())
+ OUString sURL = aNew.OrgURL;
+ if (sURL.isEmpty())
sURL = aNew.FactoryURL;
- if (!sURL.Len())
+ if (sURL.isEmpty())
sURL = aNew.TempURL;
- if (!sURL.Len())
+ if (sURL.isEmpty())
sURL = aNew.TemplateURL;
INetURLObject aURL(sURL);
aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false);
@@ -1002,8 +1002,8 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
{
const TURLInfo& rInfo = *pIt;
- String sName( rInfo.DisplayName );
- sName += '\t';
+ OUString sName( rInfo.DisplayName );
+ sName += "\t";
sName += impl_getStatusString( rInfo );
SvTreeListEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage);
pEntry->SetUserData((void*)&rInfo);
@@ -1105,7 +1105,7 @@ short RecoveryDialog::execute()
// a user selected directrory.
short nRet = DLG_RET_UNKNOWN;
BrokenRecoveryDialog* pBrokenRecoveryDialog = new BrokenRecoveryDialog(this, m_pCore, !m_bWasRecoveryStarted);
- String sSaveDir = pBrokenRecoveryDialog->getSaveDirURL(); // get the default dir
+ OUString sSaveDir = pBrokenRecoveryDialog->getSaveDirURL(); // get the default dir
if (pBrokenRecoveryDialog->isExecutionNeeded())
{
nRet = pBrokenRecoveryDialog->Execute();
@@ -1174,7 +1174,7 @@ short RecoveryDialog::execute()
// we have to remove all recovery/session data anyway!
short nRet = DLG_RET_UNKNOWN;
BrokenRecoveryDialog* pBrokenRecoveryDialog = new BrokenRecoveryDialog(this, m_pCore, !m_bWasRecoveryStarted);
- String sSaveDir = pBrokenRecoveryDialog->getSaveDirURL(); // get the default save location
+ OUString sSaveDir = pBrokenRecoveryDialog->getSaveDirURL(); // get the default save location
// dialog itself checks if there is a need to copy files for this mode.
// It uses the information m_bWasRecoveryStarted doing so.
@@ -1271,8 +1271,8 @@ void RecoveryDialog::updateItems()
if ( !pInfo )
continue;
- String sStatus = impl_getStatusString( *pInfo );
- if ( sStatus.Len() > 0 )
+ OUString sStatus = impl_getStatusString( *pInfo );
+ if ( !sStatus.isEmpty() )
m_aFileListLB.SetEntryText( sStatus, pEntry, 1 );
}
@@ -1451,7 +1451,7 @@ OUString BrokenRecoveryDialog::getSaveDirURL()
//===============================================
IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl)
{
- String sPhysicalPath = comphelper::string::strip(m_aSaveDirED.GetText(), ' ');
+ OUString sPhysicalPath = comphelper::string::strip(m_aSaveDirED.GetText(), ' ');
OUString sURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPhysicalPath, sURL );
m_sSavePath = sURL;
@@ -1719,10 +1719,10 @@ void BrokenRecoveryDialog::impl_askForSavePath()
void ErrorRepSendDialog::initControls()
{
// if the text is too short for two lines, insert a newline
- String sText = maDocTypeFT.GetText();
+ OUString sText = maDocTypeFT.GetText();
if ( maDocTypeFT.GetCtrlTextWidth( sText ) <= maDocTypeFT.GetSizePixel().Width() )
{
- sText.Insert( '\n', 0 );
+ sText = "\n" + sText;
maDocTypeFT.SetText( sText );
}
@@ -1956,9 +1956,9 @@ void BrokenRecoveryDialog::impl_askForSavePath()
return aURL;
}
- static String LoadCrashFile( const OUString &rURL )
+ static OUString LoadCrashFile( const OUString &rURL )
{
- String aFileContent;
+ OUString aFileContent;
::osl::File aFile( rURL );
printf( "Loading %s:", OString( rURL.getStr(), rURL.getLength(), osl_getThreadTextEncoding() ).getStr() );
@@ -2006,16 +2006,16 @@ void BrokenRecoveryDialog::impl_askForSavePath()
mnMinHeight = ( maContentML.GetSizePixel().Height() / 2 );
- String aPreview = LoadCrashFile( GetPreviewURL() );
+ OUString aPreview = LoadCrashFile( GetPreviewURL() );
ErrorRepSendDialog *pMainDlg = (ErrorRepSendDialog *)_pParent;
- String aSeparator = OUString( "\r\n\r\n================\r\n\r\n" );
+ OUString aSeparator( "\r\n\r\n================\r\n\r\n" );
- String aContent = pMainDlg->GetDocType();
- if ( aContent.Len() > 0 )
+ OUString aContent = pMainDlg->GetDocType();
+ if ( !aContent.isEmpty() )
aContent += aSeparator;
aContent += pMainDlg->GetUsing();
- if ( aContent.Len() > 0 )
+ if ( !aContent.isEmpty() )
aContent += aSeparator;
aContent += aPreview;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 8a90881..c19acdb 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -143,8 +143,8 @@ class FontPrevWin_Impl
std::vector<sal_uInt16> aScriptType;
SvxFont aCJKFont;
SvxFont aCTLFont;
- String aText;
- String aScriptText;
+ OUString aText;
+ OUString aScriptText;
Color* pColor;
Color* pBackColor;
long nAscent;
@@ -229,7 +229,7 @@ inline bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
*/
void FontPrevWin_Impl::CheckScript()
{
- assert(aText.Len()); // must have a preview text here!
+ assert(!aText.isEmpty()); // must have a preview text here!
if (aText == aScriptText)
{
return; // already initialized
@@ -251,7 +251,7 @@ void FontPrevWin_Impl::CheckScript()
if( com::sun::star::i18n::ScriptType::WEAK == nScript )
{
nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript );
- if( nChg < aText.Len() )
+ if( nChg < aText.getLength() )
nScript = xBreak->getScriptType( aText, nChg );
else
nScript = com::sun::star::i18n::ScriptType::LATIN;
@@ -260,11 +260,11 @@ void FontPrevWin_Impl::CheckScript()
do
{
nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript );
- if (nChg < aText.Len() && nChg > 0 &&
+ if (nChg < aText.getLength() && nChg > 0 &&
(com::sun::star::i18n::ScriptType::WEAK ==
xBreak->getScriptType(aText, nChg - 1)))
{
- int8_t nType = u_charType(aText.GetChar(nChg) );
+ int8_t nType = u_charType(aText[nChg] );
if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK ||
nType == U_COMBINING_SPACING_MARK )
{
@@ -282,7 +282,7 @@ void FontPrevWin_Impl::CheckScript()
aScriptType.push_back( nScript );
aTextWidth.push_back( 0 );
- if( nChg < aText.Len() )
+ if( nChg < aText.getLength() )
nScript = xBreak->getScriptType( aText, nChg );
else
break;
@@ -314,7 +314,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
}
else
{
- nEnd = aText.Len();
+ nEnd = aText.getLength();
nScript = com::sun::star::i18n::ScriptType::LATIN;
}
long nTxtWidth = 0;
@@ -346,7 +346,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
calcFontHeightAnyAscent(pWin,rFont,nHeight,nAscent);
}
- if( nEnd < aText.Len() && nIdx < nCnt )
+ if( nEnd < aText.getLength() && nIdx < nCnt )
{
nStart = nEnd;
nEnd = aScriptChg[ nIdx ];
@@ -396,7 +396,7 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
}
else
{
- nEnd = aText.Len();
+ nEnd = aText.getLength();
nScript = com::sun::star::i18n::ScriptType::LATIN;
}
do
@@ -407,7 +407,7 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
rFnt.DrawPrev( pWin, _pPrinter, rPt, aText, nStart, nEnd - nStart );
rPt.X() += aTextWidth[ nIdx++ ];
- if( nEnd < aText.Len() && nIdx < nCnt )
+ if( nEnd < aText.getLength() && nIdx < nCnt )
{
nStart = nEnd;
nEnd = aScriptChg[ nIdx ];
@@ -669,7 +669,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
{
pImpl->aText = pSh->GetSelectionText();
pImpl->bGetSelection = true;
- pImpl->bSelection = pImpl->aText.Len() != 0;
+ pImpl->bSelection = !pImpl->aText.isEmpty();
}
@@ -685,42 +685,41 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
if (pImpl->m_bCJKEnabled)
{
- if (pImpl->aText.Len())
- pImpl->aText.AppendAscii(" ");
+ if (!pImpl->aText.isEmpty())
+ pImpl->aText += " ";
pImpl->aText += makeRepresentativeTextForFont(ASIAN, rCJKFont);
}
if (pImpl->m_bCTLEnabled)
{
- if (pImpl->aText.Len())
- pImpl->aText.AppendAscii(" ");
+ if (!pImpl->aText.isEmpty())
+ pImpl->aText += " ";
pImpl->aText += makeRepresentativeTextForFont(COMPLEX, rCTLFont);
}
}
- if ( !pImpl->aText.Len() )
+ if ( pImpl->aText.isEmpty() )
pImpl->aText = GetText();
- if (!pImpl->aText.Len())
+ if (pImpl->aText.isEmpty())
{ // fdo#58427: still no text? let's try that one...
pImpl->aText = makeRepresentativeTextForFont(LATIN, rFont);
}
// remove line feeds and carriage returns from string
bool bNotEmpty = false;
- for ( xub_StrLen i = 0; i < pImpl->aText.Len(); ++i )
+ for ( sal_Int32 i = 0; i < pImpl->aText.getLength(); ++i )
{
- if ( 0xa == pImpl->aText.GetChar( i ) ||
- 0xd == pImpl->aText.GetChar( i ) )
- pImpl->aText.SetChar( i, ' ' );
+ if ( 0xa == pImpl->aText[i] || 0xd == pImpl->aText[i] )
+ pImpl->aText = pImpl->aText.replaceAt( i, 1, " " );
else
bNotEmpty = true;
}
if ( !bNotEmpty )
pImpl->aText = GetText();
- if ( pImpl->aText.Len() > (TEXT_WIDTH-1) )
- pImpl->aText.Erase( pImpl->aText.Search( sal_Unicode( ' ' ), TEXT_WIDTH ) );
+ if ( pImpl->aText.getLength() > (TEXT_WIDTH-1) )
+ pImpl->aText = pImpl->aText.replaceAt( pImpl->aText.indexOf(" ", TEXT_WIDTH), 1, "" );
}
// calculate text width scaling
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index a778744..2a64e7a 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -106,7 +106,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pPar
return new SvxFontListBox(pParent, nWinStyle);
}
-void SvxFontListBox::InsertFontEntry( const String& rString, const Font& rFont, const Color* pColor )
+void SvxFontListBox::InsertFontEntry( const OUString& rString, const Font& rFont, const Color* pColor )
{
mbUseFont = true; // InitEntry() will use maEntryFont
maEntryFont = rFont; // font to use in InitEntry() over InsertEntry()
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index d3773ae..1183bad 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -770,8 +770,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl)
{
- XFormTextShadowColorItem aItem( (const String &) String(),
- (const Color &) aShadowColorLB.GetSelectEntryColor() );
+ XFormTextShadowColorItem aItem( "", aShadowColorLB.GetSelectEntryColor() );
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SFX_CALLMODE_RECORD, &aItem, 0L );
return 0;
}
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index dbf7fca..8c1b46f 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -472,7 +472,7 @@ void SvxIMapDlg::DoOpen()
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
ImageMap aLoadIMap;
- const String aFilter( IMAP_ALL_FILTER );
+ const OUString aFilter( IMAP_ALL_FILTER );
aDlg.AddFilter( aFilter, IMAP_ALL_TYPE );
aDlg.AddFilter( IMAP_CERN_FILTER, IMAP_CERN_TYPE );
@@ -490,7 +490,7 @@ void SvxIMapDlg::DoOpen()
if( pIStm )
{
- aLoadIMap.Read( *pIStm, IMAP_FORMAT_DETECT, String() );
+ aLoadIMap.Read( *pIStm, IMAP_FORMAT_DETECT, "" );
if( pIStm->GetError() )
{
@@ -512,9 +512,9 @@ sal_Bool SvxIMapDlg::DoSave()
::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
- const String aBinFilter( IMAP_BINARY_FILTER );
- const String aCERNFilter( IMAP_CERN_FILTER );
- const String aNCSAFilter( IMAP_NCSA_FILTER );
+ const OUString aBinFilter( IMAP_BINARY_FILTER );
+ const OUString aCERNFilter( IMAP_CERN_FILTER );
+ const OUString aNCSAFilter( IMAP_NCSA_FILTER );
SdrModel* pModel = pIMapWnd->GetSdrModel();
const sal_Bool bChanged = pModel->IsChanged();
sal_Bool bRet = false;
@@ -528,9 +528,9 @@ sal_Bool SvxIMapDlg::DoSave()
if( aDlg.Execute() == ERRCODE_NONE )
{
- const String aFilter( aDlg.GetCurrentFilter() );
- String aExt;
- sal_uIntPtr nFormat;
+ const OUString aFilter( aDlg.GetCurrentFilter() );
+ OUString aExt;
+ sal_uIntPtr nFormat;
if ( aFilter == aBinFilter )
{
@@ -566,7 +566,7 @@ sal_Bool SvxIMapDlg::DoSave()
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC );
if( pOStm )
{
- pIMapWnd->GetImageMap().Write( *pOStm, nFormat, String() );
+ pIMapWnd->GetImageMap().Write( *pOStm, nFormat, "" );
if( pOStm->GetError() )
ErrorHandler::HandleError( ERRCODE_IO_GENERAL );
@@ -583,7 +583,7 @@ sal_Bool SvxIMapDlg::DoSave()
IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
{
- String aStr;
+ OUString aStr;
const NotifyInfo& rInfo = pWnd->GetInfo();
if ( rInfo.bNewObj )
@@ -615,8 +615,8 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
maFtTarget.Disable();
maCbbTarget.Disable();
- maURLBox.SetText( String() );
- aEdtText.SetText( String() );
+ maURLBox.SetText( "" );
+ aEdtText.SetText( "" );
}
else
{
@@ -694,13 +694,13 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl)
IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
{
- NotifyInfo aNewInfo;
- const String aURLText( maURLBox.GetText() );
- const String aTargetText( maCbbTarget.GetText() );
+ NotifyInfo aNewInfo;
+ const OUString aURLText( maURLBox.GetText() );
+ const OUString aTargetText( maCbbTarget.GetText() );
- if ( aURLText.Len() )
+ if ( !aURLText.isEmpty() )
{
- String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
+ OUString aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
aNewInfo.aMarkURL = ::URIHelper::SmartRel2Abs( INetURLObject(aBase), aURLText, URIHelper::GetMaybeFileHdl(), true, false,
INetURLObject::WAS_ENCODED,
INetURLObject::DECODE_UNAMBIGUOUS );
@@ -710,7 +710,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
aNewInfo.aMarkAltText = aEdtText.GetText();
- if ( !aTargetText.Len() )
+ if ( aTargetText.isEmpty() )
aNewInfo.aMarkTarget = SELF_TARGET;
else
aNewInfo.aMarkTarget = aTargetText;
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 76235e0..f583be6 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -248,17 +248,17 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
SfxItemSet aSet( pModel->GetItemPool() );
aSet.Put( XFillStyleItem( XFILL_SOLID ) );
- aSet.Put( XFillColorItem( String(), TRANSCOL ) );
+ aSet.Put( XFillColorItem( "", TRANSCOL ) );
if ( !pIMapObj->IsActive() )
{
aSet.Put( XFillTransparenceItem( 100 ) );
- aSet.Put( XLineColorItem( String(), Color( COL_RED ) ) );
+ aSet.Put( XLineColorItem( "", Color( COL_RED ) ) );
}
else
{
aSet.Put( XFillTransparenceItem( 50 ) );
- aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) );
+ aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) );
}
pSdrObj->SetMergedItemSetAndBroadcast(aSet);
@@ -276,7 +276,7 @@ void IMapWindow::InitSdrModel()
SfxItemSet aSet( pModel->GetItemPool() );
- aSet.Put( XFillColorItem( String(), TRANSCOL ) );
+ aSet.Put( XFillColorItem( "", TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pView->SetAttributes( aSet );
pView->SetFrameDragSingles( sal_True );
@@ -289,8 +289,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
case( OBJ_RECT ):
{
SdrRectObj* pRectObj = (SdrRectObj*) &rObj;
- IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(),
- String(), String(), String(), String(), String(), sal_True, sal_False );
+ IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), "", "", "", "", "", sal_True, sal_False );
pRectObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -303,7 +302,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
delete pPathObj;
- IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), sal_True, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), "", "", "", "", "", sal_True, sal_False );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
pCircObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -320,7 +319,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
Polygon aPoly(rXPolyPoly.getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), sal_True, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, "", "", "", "", "", sal_True, sal_False );
pPathObj->AppendUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
}
@@ -337,12 +336,12 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
if ( pUserData )
{
- String aURL;
- String aAltText;
- String aDesc;
- String aTarget;
+ OUString aURL;
+ OUString aAltText;
+ OUString aDesc;
+ OUString aTarget;
IMapObjectPtr pIMapObj = pUserData->GetObject();
- sal_Bool bActive = sal_True;
+ sal_Bool bActive = sal_True;
if ( pIMapObj.get() )
{
@@ -358,7 +357,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
case( OBJ_RECT ):
{
pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(),
- aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ) ) );
+ aURL, aAltText, aDesc, aTarget, "", bActive, sal_False ) ) );
}
break;
@@ -368,7 +367,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, sal_False );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
// was only created by us temporarily
@@ -388,7 +387,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, sal_False );
pUserData->ReplaceObject( IMapObjectPtr(pObj) );
}
}
@@ -518,7 +517,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
if( IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) )
{
- const String aString;
+ const OUString aString;
INetBookmark aBookMark( aString, aString );
SdrObject* pSdrObj = GetHitSdrObj( rEvt.maPosPixel );
@@ -550,9 +549,9 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt )
if ( pView->PickObj( aPos, pView->getHitTolLog(), pSdrObj, pPageView ) )
{
const IMapObject* pIMapObj = GetIMapObj( pSdrObj );
- String aStr;
+ OUString aStr;
- if ( pIMapObj && ( aStr = pIMapObj->GetURL() ).Len() )
+ if ( pIMapObj && !( aStr = pIMapObj->GetURL() ).isEmpty() )
{
Rectangle aLogicPix( LogicToPixel( Rectangle( Point(), GetGraphicSize() ) ) );
Rectangle aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ),
@@ -579,17 +578,17 @@ void IMapWindow::SetCurrentObjState( sal_Bool bActive )
GetIMapObj( pObj )->SetActive( bActive );
- aSet.Put( XFillColorItem( String(), TRANSCOL ) );
+ aSet.Put( XFillColorItem( "", TRANSCOL ) );
if ( !bActive )
{
aSet.Put( XFillTransparenceItem( 100 ) );
- aSet.Put( XLineColorItem( String(), Color( COL_RED ) ) );
+ aSet.Put( XLineColorItem( "", Color( COL_RED ) ) );
}
else
{
aSet.Put( XFillTransparenceItem( 50 ) );
- aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) );
+ aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) );
}
pView->SetAttributes( aSet, sal_False );
@@ -616,7 +615,7 @@ void IMapWindow::UpdateInfo( sal_Bool bNewObj )
}
else
{
- aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = String();
+ aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = "";
aInfo.bOneMarked = sal_False;
aInfo.bActivated = sal_False;
}
@@ -634,8 +633,8 @@ void IMapWindow::DoMacroAssign()
SfxItemSet aSet( *pIMapPool, SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG, 0 );
SfxEventNamesItem aNamesItem(SID_EVENTCONFIG);
- aNamesItem.AddEvent( OUString("MouseOver"), String(), SFX_EVENT_MOUSEOVER_OBJECT );
- aNamesItem.AddEvent( OUString("MouseOut"), String(), SFX_EVENT_MOUSEOUT_OBJECT );
+ aNamesItem.AddEvent( "MouseOver", "", SFX_EVENT_MOUSEOVER_OBJECT );
+ aNamesItem.AddEvent( "MouseOut", "", SFX_EVENT_MOUSEOUT_OBJECT );
aSet.Put( aNamesItem );
SvxMacroItem aMacroItem(SID_ATTR_MACROITEM);
@@ -673,9 +672,9 @@ void IMapWindow::DoPropertyDialog()
DBG_ASSERT(aDlg, "Dialogdiet fail!");
if ( aDlg->Execute() == RET_OK )
{
- const String aURLText( aDlg->GetURL() );
+ const OUString aURLText( aDlg->GetURL() );
- if ( aURLText.Len() )
+ if ( !aURLText.isEmpty() )
{
INetURLObject aObj( aURLText, INET_PROT_FILE );
DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL" );
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index bba9ac2..e24bb80 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -149,7 +149,7 @@ void SvxLanguageBox::Init()
m_pLangTable = new SvtLanguageTable;
m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) );
m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) );
- m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) );
+ m_aAllString = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL );
m_nLangList = LANG_LIST_EMPTY;
m_bHasLangNone = sal_False;
m_bLangNoneIsLangAll = sal_False;
@@ -343,7 +343,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
return nAt;
}
- String aStrEntry = m_pLangTable->GetString( nLang );
+ OUString aStrEntry = m_pLangTable->GetString( nLang );
if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
aStrEntry = m_aAllString;
@@ -351,12 +351,12 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
if (nRealLang == LANGUAGE_SYSTEM)
{
nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
- aStrEntry.AppendAscii(" - ");
- aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
+ aStrEntry += " - ";
+ aStrEntry += m_pLangTable->GetString( nRealLang );
} else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) {
nRealLang = MsLangId::getSystemLanguage();
- aStrEntry.AppendAscii(" - ");
- aStrEntry.Append(m_pLangTable->GetString( nRealLang ));
+ aStrEntry += " - ";
+ aStrEntry += m_pLangTable->GetString( nRealLang );
}
aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
@@ -414,7 +414,7 @@ sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
return nAt;
}
- String aStrEntry = m_pLangTable->GetString( nLang );
+ OUString aStrEntry = m_pLangTable->GetString( nLang );
if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
aStrEntry = m_aAllString;
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 560f298..e15d795 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -40,8 +40,8 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString& _rF
m_aQueryImage.SetImage( QueryBox::GetStandardImage() );
// replace filename
- String sInfoText = m_aInfoText.GetText();
- sInfoText.SearchAndReplaceAll(OUString("%FILENAME"), _rFileName);
+ OUString sInfoText = m_aInfoText.GetText();
+ sInfoText = sInfoText.replaceAll("%FILENAME", _rFileName);
m_aInfoText.SetText( sInfoText );
// load state of "warning on" checkbox from misc options
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 055d9b9..a08f8fe 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -267,10 +267,10 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s
Size aDrawSize( 0, aRect.GetHeight() / 6);
aFont.SetSize(aDrawSize);
SetFont(aFont);
- String sText(OUString("ABC"));
+ OUString sText("ABC");
Point aMove(1, GetTextHeight());
sal_Unicode cArrow = 0x2193;
- long nAWidth = GetTextWidth(OUString(sText.GetChar(0)));
+ long nAWidth = GetTextWidth(sText.copy(0,1));
switch(pImpl->nFrameDirection)
{
case FRMDIR_HORI_LEFT_TOP:
@@ -297,10 +297,10 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s
aMove.X() = 0;
break;
}
- sText.Append(cArrow);
- for(sal_uInt16 i = 0; i < sText.Len(); i++)
+ sText += OUString(cArrow);
+ for(sal_uInt16 i = 0; i < sText.getLength(); i++)
{
- OUString sDraw(sText.GetChar(i));
+ OUString sDraw(sText.copy(0,1));
long nHDiff = 0;
long nCharWidth = GetTextWidth(sDraw);
bool bHorizontal = 0 == aMove.Y();
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 349cffa..2e80408 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -31,7 +31,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
{
bool bOK = true;
short nRet = RET_OK;
- String aEmpty;
+ OUString aEmpty;
if ( aNewPasswdED.GetText() != aRepeatPasswdED.GetText() )
{
@@ -62,10 +62,10 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl)
{
if ( !bEmpty )
{
- String aPasswd = comphelper::string::strip(aRepeatPasswdED.GetText(), ' ');
- if ( !aPasswd.Len() && aOKBtn.IsEnabled() )
+ OUString aPasswd = comphelper::string::strip(aRepeatPasswdED.GetText(), ' ');
+ if ( aPasswd.isEmpty() && aOKBtn.IsEnabled() )
aOKBtn.Disable();
- else if ( aPasswd.Len() && !aOKBtn.IsEnabled() )
+ else if ( !aPasswd.isEmpty() && !aOKBtn.IsEnabled() )
aOKBtn.Enable();
}
else if ( !aOKBtn.IsEnabled() )
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index f5cc4aa..2138081 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -75,29 +75,29 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
const plugin::PluginDescription* pDescription = aSeq.getConstArray();
sal_Int32 nAnzahlPlugins = rPluginManager->getPluginDescriptions().getLength();
- std::list< String > aPlugNames;
- std::list< String > aPlugExtensions;
- std::list< String >::iterator j;
- std::list< String >::iterator k;
- std::list< String >::const_iterator end;
+ std::list< OUString > aPlugNames;
+ std::list< OUString > aPlugExtensions;
+ std::list< OUString >::iterator j;
+ std::list< OUString >::iterator k;
+ std::list< OUString >::const_iterator end;
for ( int i = 0; i < nAnzahlPlugins; i++ )
{
- String aStrPlugMIMEType( pDescription[i].Mimetype );
- String aStrPlugName( pDescription[i].Description );
- String aStrPlugExtension( pDescription[i].Extension );
+ OUString aStrPlugMIMEType( pDescription[i].Mimetype );
+ OUString aStrPlugName( pDescription[i].Description );
+ OUString aStrPlugExtension( pDescription[i].Extension );
- aStrPlugMIMEType.ToLowerAscii();
- aStrPlugExtension.ToLowerAscii();
+ aStrPlugMIMEType = aStrPlugMIMEType.toAsciiLowerCase();
+ aStrPlugExtension = aStrPlugExtension.toAsciiLowerCase();
- if ( ( nKind == SID_INSERT_SOUND && aStrPlugMIMEType.SearchAscii ( sAudio ) == 0 ) ||
- ( nKind == SID_INSERT_VIDEO && aStrPlugMIMEType.SearchAscii ( sVideo ) == 0 ) )
+ if ( ( nKind == SID_INSERT_SOUND && aStrPlugMIMEType.indexOf( sAudio ) == 0 ) ||
+ ( nKind == SID_INSERT_VIDEO && aStrPlugMIMEType.indexOf( sVideo ) == 0 ) )
{
// extension already in the filterlist of the filedlg ?
bool bAlreadyExist = false;
for ( j = aPlugExtensions.begin(), end = aPlugExtensions.end(); j != end && !bAlreadyExist; ++j )
{
- bAlreadyExist = (j->Search( aStrPlugExtension ) != STRING_NOTFOUND );
+ bAlreadyExist = (j->indexOf( aStrPlugExtension ) != -1 );
}
if ( !bAlreadyExist )
@@ -110,14 +110,15 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
end = aPlugNames.end();
j != end && nfound != 0; )
{
- if ( ( nfound = j->Search( aStrPlugName ) ) == 0 )
+ if ( ( nfound = j->indexOf( aStrPlugName ) ) == 0 )
{
- if ( aStrPlugExtension.Len() > 0 )
- aStrPlugExtension.Insert( sal_Unicode( ';' ) );
- aStrPlugExtension.Insert( *k );
+ if ( !aStrPlugExtension.isEmpty() )
+ aStrPlugExtension += ";";
+ aStrPlugExtension += *k;
// remove old entry, increment (iterators are invalid thereafter, thus the postincrement)
- aPlugNames.erase(j++); aPlugExtensions.erase(k++);
+ aPlugNames.erase(j++);
+ aPlugExtensions.erase(k++);
// update end iterator (which may be invalid, too!)
end = aPlugNames.end();
@@ -130,9 +131,9 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
}
// build filterdescription
- aStrPlugName.AppendAscii( " (" );
- aStrPlugName.Append( aStrPlugExtension );
- aStrPlugName.AppendAscii( ")" );
+ aStrPlugName += " (";
+ aStrPlugName += aStrPlugExtension;
+ aStrPlugName += ")";
// use a own description for the video-formate avi, mov and mpeg
// the descriptions of these MIME-types are not very meaningful
@@ -142,13 +143,13 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
const sal_Char sMPE[] = "*.mpe";
const sal_Char sMPEG[] = "*.mpeg";
- if ( aStrPlugExtension.EqualsIgnoreCaseAscii( sAVI ) )
+ if ( aStrPlugExtension.equalsIgnoreAsciiCase( sAVI ) )
aStrPlugName = SVX_RESSTR( STR_INSERT_VIDEO_EXTFILTER_AVI );
- else if ( aStrPlugExtension.EqualsIgnoreCaseAscii( sMOV ) )
+ else if ( aStrPlugExtension.equalsIgnoreAsciiCase( sMOV ) )
aStrPlugName = SVX_RESSTR( STR_INSERT_VIDEO_EXTFILTER_MOV );
- else if ( aStrPlugExtension.SearchAscii( sMPG ) != STRING_NOTFOUND ||
- aStrPlugExtension.SearchAscii( sMPE ) != STRING_NOTFOUND ||
- aStrPlugExtension.SearchAscii( sMPEG ) != STRING_NOTFOUND )
+ else if ( aStrPlugExtension.indexOf( sMPG ) != -1 ||
+ aStrPlugExtension.indexOf( sMPE ) != -1 ||
+ aStrPlugExtension.indexOf( sMPEG ) != -1 )
aStrPlugName = SVX_RESSTR(STR_INSERT_VIDEO_EXTFILTER_MPEG);
aPlugNames.push_back( aStrPlugName );
@@ -167,8 +168,8 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
}
// add the All-Filter
- String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ).toString() );
- maFileDlg.AddFilter(aAllFilter, OUString("*.*"));
+ OUString aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ).toString() );
+ maFileDlg.AddFilter(aAllFilter, "*.*");
// and activate him
maFileDlg.SetCurrentFilter( aAllFilter );
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 10da9a3..a073598 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -46,12 +46,12 @@ void SvxRelativeField::Modify()
if ( bRelativeMode )
{
- String aStr = GetText();
+ OUString aStr = GetText();
sal_Bool bNewMode = bRelative;
if ( bRelative )
{
- const sal_Unicode* pStr = aStr.GetBuffer();
+ const sal_Unicode* pStr = aStr.getStr();
while ( *pStr )
{
@@ -66,9 +66,7 @@ void SvxRelativeField::Modify()
}
else
{
- xub_StrLen nPos = aStr.Search( sal_Unicode( '%' ) );
-
- if ( nPos != STRING_NOTFOUND )
+ if ( aStr.indexOf( "%" ) != -1 )
bNewMode = sal_True;
}
@@ -96,7 +94,7 @@ void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
{
Selection aSelection = GetSelection();
- String aStr = GetText();
+ OUString aStr = GetText();
if ( bNewRelative )
{
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 6435b0a..b6ad3f1 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -251,7 +251,7 @@ SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW,
UpdateColors();
- String leftLabelName = m_pLeftFT->GetText(), rightLabelName = m_pRightFT->GetText();
+ OUString leftLabelName = m_pLeftFT->GetText(), rightLabelName = m_pRightFT->GetText();
m_pLeft2ED->SetAccessibleName(leftLabelName);
m_pLeft3ED->SetAccessibleName(leftLabelName);
m_pLeft4ED->SetAccessibleName(leftLabelName);
@@ -306,7 +306,7 @@ void SvxRubyDialog::Activate()
if(xRubySel.is())
{
Reference< XModel > xModel = pImpl->GetModel();
- const String sCharStyleSelect = m_pCharStyleLB->GetSelectEntry();
+ const OUString sCharStyleSelect = m_pCharStyleLB->GetSelectEntry();
ClearCharStyleList();
Reference<XStyleFamiliesSupplier> xSupplier(xModel, UNO_QUERY);
if(xSupplier.is())
@@ -356,7 +356,7 @@ void SvxRubyDialog::Activate()
{
OSL_FAIL("exception in style access");
}
- if(sCharStyleSelect.Len())
+ if(!sCharStyleSelect.isEmpty())
m_pCharStyleLB->SelectEntry(sCharStyleSelect);
}
m_pCharStyleLB->Enable(xSupplier.is());
@@ -813,7 +813,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
nYBase = nTmp;
}
long nYOutput, nOutTextWidth;
- String sOutputText;
+ OUString sOutputText;
if(bRubyStretch)
@@ -854,13 +854,13 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
}
// no break!
case RubyAdjust_BLOCK:
- if(sOutputText.Len() > 1)
+ if(sOutputText.getLength() > 1)
{
- xub_StrLen nCount = sOutputText.Len();
+ sal_Int32 nCount = sOutputText.getLength();
long nSpace = ((nRightEnd - nLeftStart) - GetTextWidth(sOutputText)) / (nCount - 1);
- for(xub_StrLen i = 0; i < nCount; i++)
+ for(sal_Int32 i = 0; i < nCount; i++)
{
- OUString sChar(sOutputText.GetChar(i));
+ OUString sChar(sOutputText[i]);
DrawText( Point( nLeftStart , nYOutput), sChar);
long nCharWidth = GetTextWidth(sChar);
nLeftStart += nCharWidth + nSpace;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 2c47fdb..d9535b1 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -732,16 +732,16 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
}
else
{
- String aText = m_pSearchAttrText->GetText();
+ OUString aText = m_pSearchAttrText->GetText();
m_pSearchAttrText->Hide();
- if ( aText.Len() )
+ if ( !aText.isEmpty() )
pImpl->m_pSearchFormats->SetText( aText );
pImpl->m_pSearchFormats->Show();
aText = m_pReplaceAttrText->GetText();
m_pReplaceAttrText->Hide();
- if ( aText.Len() )
+ if ( !aText.isEmpty() )
pImpl->m_pReplaceFormats->SetText( aText );
pImpl->m_pReplaceFormats->Show();
}
@@ -940,7 +940,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
if ( bSetSearch && !bAttributes )
m_pSearchLB->SetText(aSearchStrings[0]);
- String aReplaceTxt = pSearchItem->GetReplaceString();
+ OUString aReplaceTxt = pSearchItem->GetReplaceString();
if (!aReplaceStrings.empty())
aReplaceTxt = aReplaceStrings[0];
@@ -1299,13 +1299,13 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
{
if ( !m_pLayoutBtn->IsChecked() || bInclusive )
{
- String aStr( m_pSearchLB->GetText() );
+ OUString aStr( m_pSearchLB->GetText() );
- if ( aStr.Len() )
+ if ( !aStr.isEmpty() )
Remember_Impl( aStr, sal_True );
aStr = m_pReplaceLB->GetText();
- if ( aStr.Len() )
+ if ( !aStr.isEmpty() )
Remember_Impl( aStr, sal_False );
}
SaveToModule_Impl();
@@ -1560,8 +1560,8 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch )
void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
{
- String aOldSrch( m_pSearchTmplLB->GetSelectEntry() );
- String aOldRepl( m_pReplaceTmplLB->GetSelectEntry() );
+ OUString aOldSrch( m_pSearchTmplLB->GetSelectEntry() );
+ OUString aOldRepl( m_pReplaceTmplLB->GetSelectEntry() );
m_pSearchTmplLB->Clear();
m_pReplaceTmplLB->Clear();
rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL );
@@ -1580,11 +1580,11 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
m_pReplaceTmplLB->SetUpdateMode( sal_True );
m_pSearchTmplLB->SelectEntryPos(0);
- if ( aOldSrch.Len() )
+ if ( !aOldSrch.isEmpty() )
m_pSearchTmplLB->SelectEntry( aOldSrch );
m_pReplaceTmplLB->SelectEntryPos(0);
- if ( aOldRepl.Len() )
+ if ( !aOldRepl.isEmpty() )
m_pReplaceTmplLB->SelectEntry( aOldRepl );
if ( m_pSearchTmplLB->GetEntryCount() )
@@ -1926,7 +1926,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
pWhRanges[nPos] = 0;
SfxItemPool& rPool = pSh->GetPool();
SfxItemSet aSet( rPool, pWhRanges );
- String aTxt;
+ OUString aTxt;
aSet.InvalidateAllItems();
aSet.Put(SvxBrushItem(nBrushWhich));
@@ -1952,7 +1952,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
{
SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( this, aSet, RID_SVXDLG_SEARCHFORMAT );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
- aTxt.Insert( pDlg->GetText(), 0 );
+ aTxt = pDlg->GetText() + aTxt;
pDlg->SetText( aTxt );
if ( pDlg->Execute() == RET_OK )
@@ -2012,17 +2012,17 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
if ( bSearch )
{
if ( !pImpl->bMultiLineEdit )
- m_pSearchAttrText->SetText( String() );
+ m_pSearchAttrText->SetText( "" );
else
- pImpl->m_pSearchFormats->SetText( String() );
+ pImpl->m_pSearchFormats->SetText( "" );
pSearchList->Clear();
}
else
{
if ( !pImpl->bMultiLineEdit )
- m_pReplaceAttrText->SetText( String() );
+ m_pReplaceAttrText->SetText( "" );
else
- pImpl->m_pReplaceFormats->SetText( String() );
+ pImpl->m_pReplaceFormats->SetText( "" );
pReplaceList->Clear();
}
pImpl->bSaveToModule = sal_False;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 7951fe3..b620965 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -92,8 +92,7 @@ static const sal_Unicode aBulletTypes[] =
static Font& lcl_GetDefaultBulletFont()
{
static sal_Bool bInit = 0;
- static Font aDefBulletFont( OUString("StarSymbol"),
- String(), Size( 0, 14 ) );
+ static Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
if(!bInit)
{
aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
@@ -218,10 +217,10 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
sal_uInt16 nY = 11 + i * 33;
aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100;
- String sText;
+ OUString sText;
if(nPageType == NUM_PAGETYPE_BULLET)
{
- sText = aBulletTypes[nItemId - 1];
+ sText = OUString( aBulletTypes[nItemId - 1] );
aStart.Y() -= pDev->GetTextHeight()/2;
aStart.X() = aBLPos.X() + 5;
}
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 18c739f..59ab709 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -77,7 +77,7 @@ public:
~RulerDebugWindow();
ListBox& GetLBox() {return aBox;}
- static void AddDebugText(const sal_Char* pDescription, const String& rText );
+ static void AddDebugText(const sal_Char* pDescription, const OUString& rText );
};
static RulerDebugWindow* pDebugWindow = 0;
@@ -85,7 +85,7 @@ RulerDebugWindow::~RulerDebugWindow()
{
pDebugWindow = 0;
}
-void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const String& rText )
+void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const OUString& rText )
{
if(!pDebugWindow)
{
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 99fda8e..ace1243 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -209,8 +209,8 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos )
{
- const String& rEntry = m_pEncTable->GetTextString( nEnc );
- if ( rEntry.Len() )
+ const OUString& rEntry = m_pEncTable->GetTextString( nEnc );
+ if ( !rEntry.isEmpty() )
InsertTextEncoding( nEnc, rEntry, nPos );
else
SAL_WARN( "svx.dialog", "SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) );
commit 55a15541a17e5c9b49039b0db31473ab81c2456b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 14:54:01 2013 +0200
convert svx/source/engine3d/*.cxx from String to OUString
Change-Id: I0ef33d146a54c35ff9ad6ed8e1105de55d2fb78a
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 5463145..6195119 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2183,7 +2183,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if( aLbMatColor.GetSelectEntryCount() )
{
aColor = aLbMatColor.GetSelectEntryColor();
- rAttrs.Put( XFillColorItem( String(), aColor) );
+ rAttrs.Put( XFillColorItem( "", aColor) );
}
else
{
@@ -3053,13 +3053,13 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
pLb->SelectEntry( rColor );
if( pLb->GetSelectEntryCount() == 0 )
{
- String aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R));
+ OUString aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R));
aStr += OUString::number((sal_Int32)rColor.GetRed());
- aStr += sal_Unicode(' ');
+ aStr += " '";
aStr += SVX_RESSTR(RID_SVXFLOAT3D_FIX_G);
aStr += OUString::number((sal_Int32)rColor.GetGreen());
- aStr += sal_Unicode(' ');
+ aStr += " ";
aStr += SVX_RESSTR(RID_SVXFLOAT3D_FIX_B);
aStr += OUString::number((sal_Int32)rColor.GetBlue());
commit 258f946d3dbe6121b9e6c1886ee26cf0c8f1012b
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 14:52:29 2013 +0200
convert svx/source/fmcomp/*.cxx from String to OUString
Change-Id: Iecc2d85f55124ecb026d2b7a63586ef39160752b
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a683bc9c..ff30e59 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -543,7 +543,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
if (bDateNTimeCol)
{
- String sRealName,sPurePostfix;
+ OUString sRealName,sPurePostfix;
OUString aPostfix[] = {
SVX_RESSTR(RID_STR_POSTFIX_DATE),
@@ -556,7 +556,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
sPurePostfix = comphelper::string::stripStart(sPurePostfix, '(');
sPurePostfix = comphelper::string::stripEnd(sPurePostfix, ')');
sRealName = sFieldName;
- sRealName += '_';
+ sRealName += "_";
sRealName += sPurePostfix;
if (i)
xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName)));
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 32350b7..94ebe22 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1422,8 +1422,8 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
// Strings are dealt with directly by the GetFieldText
case TypeClass_STRING :
{
- String sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() );
- pReturnArray[i] <<= OUString(sText);
+ OUString sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() );
+ pReturnArray[i] <<= sText;
}
break;
// everything else is requested in the DatabaseVariant
@@ -1491,7 +1491,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
if (evt.PropertyName == FM_PROP_LABEL)
{
- String aName = ::comphelper::getString(evt.NewValue);
+ OUString aName = ::comphelper::getString(evt.NewValue);
if (aName != pGrid->GetColumnTitle(nId))
pGrid->SetColumnTitle(nId, aName);
}
@@ -1810,7 +1810,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep
addColumnListeners(xSet);
Reference< XPropertySet > xNewColumn(xSet);
- String aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
+ OUString aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
Any aWidth = xNewColumn->getPropertyValue(FM_PROP_WIDTH);
sal_Int32 nWidth = 0;
if (aWidth >>= nWidth)
@@ -1854,7 +1854,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
removeColumnListeners(xOldColumn);
addColumnListeners(xNewColumn);
- String aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
+ OUString aName = ::comphelper::getString(xNewColumn->getPropertyValue(FM_PROP_LABEL));
Any aWidth = xNewColumn->getPropertyValue(FM_PROP_WIDTH);
sal_Int32 nWidth = 0;
if (aWidth >>= nWidth)
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 577e3e1..a7dde06 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2688,7 +2688,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum
if ( aPosSeq.getLength() )
sText = static_cast<ListBox*>(m_pWindow)->GetEntry(aPosSeq.getConstArray()[0]);
else
- sText = String();
+ sText = "";
}
}
catch( const Exception& )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 4869e16..b7c3edf 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -651,7 +651,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
case NavigationBar::RECORD_COUNT:
{
pWnd = &m_aRecordCount;
- String aText;
+ OUString aText;
if (bAvailable)
{
if (pParent->GetOptions() & DbGridControl::OPT_INSERT)
@@ -667,15 +667,15 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
aText += OUString(" *");
}
else
- aText = String();
+ aText = "";
// add the number of selected rows, if applicable
if (pParent->GetSelectRowCount())
{
- String aExtendedInfo(aText);
- aExtendedInfo.AppendAscii(" (");
+ OUString aExtendedInfo(aText);
+ aExtendedInfo += " (";
aExtendedInfo += m_aAbsolute.CreateFieldText(pParent->GetSelectRowCount());
- aExtendedInfo += ')';
+ aExtendedInfo += ")";
pWnd->SetText(aExtendedInfo);
}
else
commit 689bf5e24a5a6757efd035515f828b11b559cded
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 4 14:50:08 2013 +0200
convert svx/source/form/*.cxx from String to OUString
Change-Id: I3cac7b1f267bf119265869968c723df0473043b6
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 1e4dd6e..37ca315 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -61,7 +61,7 @@ OSystemParseContext::~OSystemParseContext()
//-----------------------------------------------------------------------------
OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
{
- String aMsg;
+ OUString aMsg;
SolarMutexGuard aGuard;
switch (_eCode)
{
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 8eb6a0d..92e8775 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -63,15 +63,15 @@ namespace svx
);
~DatabaseLocationInputController_Impl();
- bool prepareCommit();
- void setURL( const String& _rURL );
- String getURL() const;
+ bool prepareCommit();
+ void setURL( const OUString& _rURL );
+ OUString getURL() const;
private:
- void impl_initFilterProperties_nothrow();
- void impl_onBrowseButtonClicked();
- void impl_onLocationModified();
- String impl_getCurrentURL() const;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list