[Libreoffice-commits] .: 7 commits - basctl/source basic/source chart2/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source formula/source fpicker/source officecfg/Configuration_officecfg.mk officecfg/registry postprocess/packregistry reportdesign/source scaddins/source sc/source sd/source sfx2/source shell/source starmath/inc starmath/source svl/source svtools/bmpmaker svtools/source svx/source sw/inc sw/source toolkit/source unusedcode.easy vcl/source vcl/unx xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jul 9 04:54:02 PDT 2012
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/linenumberwindow.cxx | 4
basic/source/basmgr/basmgr.cxx | 10 +-
basic/source/comp/basiccharclass.cxx | 3
basic/source/comp/dim.cxx | 2
basic/source/comp/parser.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 4
cui/source/dialogs/hldocntp.cxx | 4
cui/source/dialogs/hyphen.cxx | 4
cui/source/dialogs/insdlg.cxx | 8 -
cui/source/dialogs/multipat.cxx | 4
cui/source/options/dbregister.hrc | 3
cui/source/options/optgdlg.cxx | 43 ---------
cui/source/options/optgdlg.hrc | 12 --
cui/source/options/optgdlg.hxx | 2
cui/source/options/optgdlg.src | 25 -----
cui/source/options/optinet2.cxx | 2
cui/source/options/optjava.cxx | 32 +++----
cui/source/options/optpath.cxx | 10 +-
cui/source/options/optpath.hrc | 3
cui/source/tabpages/autocdlg.cxx | 5 -
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/numpages.cxx | 4
cui/source/tabpages/tabstpge.cxx | 6 -
dbaccess/source/ui/app/AppController.cxx | 4
dbaccess/source/ui/browser/unodatbr.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 20 +---
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 10 +-
dbaccess/source/ui/dlg/dbadmin.cxx | 6 -
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 4
dbaccess/source/ui/misc/WCPage.cxx | 4
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2
desktop/source/app/cmdlineargs.cxx | 4
drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx | 2
editeng/source/editeng/editdoc.cxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/impedit2.cxx | 6 -
editeng/source/editeng/impedit3.cxx | 13 +-
editeng/source/editeng/impedit4.cxx | 2
editeng/source/items/svxfont.cxx | 7 -
editeng/source/misc/svxacorr.cxx | 49 +++++------
editeng/source/outliner/outliner.cxx | 2
editeng/source/uno/unotext.cxx | 4
extensions/source/propctrlr/formlinkdialog.cxx | 4
filter/source/flash/swfwriter1.cxx | 2
filter/source/flash/swfwriter2.cxx | 2
filter/source/graphicfilter/eos2met/eos2met.cxx | 4
filter/source/graphicfilter/epict/epict.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/pdf/impdialog.cxx | 4
filter/source/pdf/impdialog.hxx | 2
filter/source/svg/svgfontexport.cxx | 2
filter/source/svg/svgwriter.cxx | 2
formula/source/core/api/FormulaCompiler.cxx | 8 -
formula/source/ui/dlg/formula.cxx | 2
fpicker/source/office/iodlg.cxx | 4
fpicker/source/office/iodlgimp.cxx | 9 +-
officecfg/Configuration_officecfg.mk | 2
officecfg/registry/data/org/openoffice/UserProfile.xcu | 17 +--
postprocess/packregistry/makefile.mk | 2
reportdesign/source/core/sdr/UndoActions.cxx | 4
reportdesign/source/filter/xml/xmlExport.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/report/SectionWindow.cxx | 4
sc/source/core/data/attrib.cxx | 13 +-
sc/source/core/data/global.cxx | 4
sc/source/core/data/global2.cxx | 2
sc/source/core/data/table4.cxx | 6 -
sc/source/core/tool/compiler.cxx | 6 -
sc/source/core/tool/editutil.cxx | 2
sc/source/core/tool/interpr1.cxx | 5 -
sc/source/filter/excel/xechart.cxx | 6 -
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xehelper.cxx | 4
sc/source/filter/excel/xelink.cxx | 4
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xicontent.cxx | 2
sc/source/filter/excel/xihelper.cxx | 2
sc/source/filter/excel/xlroot.cxx | 2
sc/source/filter/ftools/fapihelper.cxx | 7 -
sc/source/filter/inc/fapihelper.hxx | 5 -
sc/source/filter/inc/xlchart.hxx | 2
sc/source/ui/app/inputhdl.cxx | 15 +--
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/scmod.cxx | 2
sc/source/ui/dbgui/asciiopt.cxx | 2
sc/source/ui/dbgui/csvgrid.cxx | 4
sc/source/ui/dbgui/filtdlg.cxx | 2
sc/source/ui/dbgui/pfiltdlg.cxx | 2
sc/source/ui/dbgui/scuiimoptdlg.cxx | 4
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/impex.cxx | 12 +-
sc/source/ui/formdlg/formula.cxx | 15 +--
sc/source/ui/miscdlgs/conflictsdlg.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 6 -
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/pagedlg/scuitphfedit.cxx | 6 -
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/view/cellsh1.cxx | 10 +-
sc/source/ui/view/editsh.cxx | 2
sc/source/ui/view/gridwin.cxx | 35 ++++---
sc/source/ui/view/output2.cxx | 8 -
scaddins/source/analysis/analysishelper.cxx | 19 +---
sd/source/core/anminfo.cxx | 2
sd/source/core/drawdoc2.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/func/fupoor.cxx | 4
sfx2/source/appl/appuno.cxx | 10 +-
sfx2/source/appl/childwin.cxx | 18 +---
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 6 -
sfx2/source/dialog/splitwin.cxx | 21 ++--
sfx2/source/doc/doctemplates.cxx | 4
sfx2/source/doc/new.cxx | 4
sfx2/source/notify/eventsupplier.cxx | 4
shell/source/backends/desktopbe/desktopbackend.cxx | 3
shell/source/backends/gconfbe/gconfaccess.cxx | 32 +++----
starmath/inc/node.hxx | 4
starmath/source/dialog.cxx | 4
starmath/source/document.cxx | 2
starmath/source/node.cxx | 4
starmath/source/parse.cxx | 8 -
starmath/source/symbol.cxx | 6 -
starmath/source/view.cxx | 4
svl/source/numbers/zforfind.cxx | 6 -
svl/source/numbers/zforlist.cxx | 22 ++--
svl/source/numbers/zformat.cxx | 5 -
svtools/bmpmaker/bmp.cxx | 16 +--
svtools/bmpmaker/bmpcore.cxx | 4
svtools/bmpmaker/bmpsum.cxx | 12 +-
svtools/bmpmaker/g2g.cxx | 12 +-
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/contnr/fileview.cxx | 6 -
svtools/source/contnr/svtreebx.cxx | 2
svtools/source/control/ctrlbox.cxx | 2
svtools/source/dialogs/filedlg2.cxx | 2
svtools/source/edit/syntaxhighlight.cxx | 2
svtools/source/edit/texteng.cxx | 2
svtools/source/edit/textview.cxx | 6 -
svtools/source/filter/filter.cxx | 2
svtools/source/filter/sgvtext.cxx | 2
svtools/source/filter/wmf/emfwr.cxx | 2
svtools/source/filter/wmf/winmtf.cxx | 2
svx/source/core/extedit.cxx | 2
svx/source/dialog/ctredlin.cxx | 4
svx/source/dialog/fntctrl.cxx | 8 -
svx/source/dialog/pagectrl.cxx | 4
svx/source/dialog/relfld.cxx | 2
svx/source/dialog/rubydialog.cxx | 6 -
svx/source/dialog/swframeexample.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/fmpgeimp.cxx | 4
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/fmundo.cxx | 2
svx/source/form/formcontroller.cxx | 4
svx/source/form/navigatortree.cxx | 6 -
svx/source/form/navigatortreemodel.cxx | 4
sw/inc/swtypes.hxx | 3
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/accportions.cxx | 2
sw/source/core/bastyp/swtypes.cxx | 4
sw/source/core/crsr/bookmrk.cxx | 4
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/doctxm.cxx | 9 +-
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/edit/autofmt.cxx | 20 ++--
sw/source/core/edit/editsh.cxx | 2
sw/source/core/edit/edlingu.cxx | 2
sw/source/core/edit/edtox.cxx | 8 -
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/docufld.cxx | 7 -
sw/source/core/fields/tblcalc.cxx | 3
sw/source/core/frmedt/fetab.cxx | 9 +-
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/inftxt.cxx | 2
sw/source/core/text/itratr.cxx | 6 -
sw/source/core/text/porexp.cxx | 2
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porfly.cxx | 2
sw/source/core/text/porglue.cxx | 4
sw/source/core/text/pormulti.cxx | 8 -
sw/source/core/text/porref.cxx | 2
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/portox.cxx | 2
sw/source/core/text/portxt.cxx | 4
sw/source/core/text/txthyph.cxx | 6 -
sw/source/core/text/txttab.cxx | 6 -
sw/source/core/txtnode/fntcache.cxx | 4
sw/source/core/txtnode/thints.cxx | 6 -
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/undo/undel.cxx | 2
sw/source/core/undo/undobj.cxx | 2
sw/source/core/undo/unins.cxx | 2
sw/source/core/undo/unovwr.cxx | 14 +--
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoidx.cxx | 2
sw/source/core/unocore/unotext.cxx | 2
sw/source/filter/html/css1atr.cxx | 2
sw/source/filter/html/swhtml.cxx | 14 +--
sw/source/filter/rtf/rtffld.cxx | 6 -
sw/source/filter/rtf/swparrtf.cxx | 2
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww1/w1filter.cxx | 2
sw/source/filter/ww8/wrtw8num.cxx | 2
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 4
sw/source/filter/ww8/ww8graf.cxx | 10 +-
sw/source/filter/ww8/ww8par.cxx | 10 +-
sw/source/filter/ww8/ww8par4.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 18 ++--
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/ui/app/applab.cxx | 9 +-
sw/source/ui/app/docsh2.cxx | 2
sw/source/ui/app/docstyle.cxx | 4
sw/source/ui/cctrl/actctrl.cxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/dbmgr.cxx | 7 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 6 -
sw/source/ui/dbui/mmconfigitem.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/dialog/regionsw.cxx | 2
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/docvw/srcedtw.cxx | 2
sw/source/ui/envelp/envlop1.cxx | 21 ++--
sw/source/ui/envelp/label1.cxx | 21 ++--
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/fldui/fldmgr.cxx | 2
sw/source/ui/fldui/fldpage.cxx | 4
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/cption.cxx | 7 -
sw/source/ui/index/cnttab.cxx | 21 ++--
sw/source/ui/misc/bookmark.cxx | 2
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/outline.cxx | 4
sw/source/ui/misc/srtdlg.cxx | 4
sw/source/ui/ribbar/inputwin.cxx | 18 ++--
sw/source/ui/shells/annotsh.cxx | 2
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/shells/textsh.cxx | 6 -
sw/source/ui/table/convert.cxx | 2
sw/source/ui/table/tabledlg.cxx | 5 -
sw/source/ui/uiview/srcview.cxx | 2
sw/source/ui/uno/unomailmerge.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 4
sw/source/ui/utlui/prcntfld.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 2
toolkit/source/awt/vclxfont.cxx | 4
unusedcode.easy | 5 -
vcl/source/control/edit.cxx | 4
vcl/source/control/lstbox.cxx | 2
vcl/source/window/dlgctrl.cxx | 4
vcl/source/window/msgbox.cxx | 2
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 7 +
xmloff/source/chart/SchXMLExport.cxx | 4
xmloff/source/style/xmlnumfe.cxx | 3
267 files changed, 689 insertions(+), 766 deletions(-)
New commits:
commit 4fc8af89257436b9cad70de574a166aa11ec42f1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 9 12:51:16 2012 +0100
Resolves: rhbz#838368 --view ignored while -view accepted
and our ooviewdoc script uses --view
Change-Id: Ice708f1c72c8d29d411ba21e93cb19876af13881
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index af7ee26..c67db8c 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" )))
+ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" )))
{
// open in viewmode
bOpenEvent = false;
@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" )))
+ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" )))
{
// open in viewmode
bOpenEvent = false;
commit 5a44320a4d8c7893f596ba2ad1ef2db33fdc8b5c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 9 09:47:52 2012 +0100
Related: fdo#30763 always fill in default name under GNOME
regardless of whether lockdown is in effect.
Change-Id: I3c5d3aba89f8cedb6e3e4bd2ecc1af954a953306
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 637d845..682a3e2 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -161,7 +161,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Setup-math.xcu \
org/openoffice/Setup-report.xcu \
org/openoffice/Setup-start.xcu \
- org/openoffice/UserProfile-gconflockdown.xcu \
+ org/openoffice/UserProfile-unixdesktop.xcu \
org/openoffice/VCL-gconflockdown.xcu \
org/openoffice/VCL-unixdesktop.xcu \
org/openoffice/Office/Accelerators-macosx.xcu \
diff --git a/officecfg/registry/data/org/openoffice/UserProfile.xcu b/officecfg/registry/data/org/openoffice/UserProfile.xcu
index 4e4ec41..d0d2979 100644
--- a/officecfg/registry/data/org/openoffice/UserProfile.xcu
+++ b/officecfg/registry/data/org/openoffice/UserProfile.xcu
@@ -28,18 +28,13 @@
<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
<oor:component-data oor:name="UserProfile" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="Data">
- <prop oor:name="apartment" oor:type="xs:string">
- <value/>
+ <prop oor:name="givenname">
+ <value install:module="unixdesktop" oor:external=
+ "com.sun.star.configuration.backend.DesktopBackend givenname"/>
</prop>
- <prop oor:name="fathersname" oor:type="xs:string">
- <value/>
- </prop>
- <prop oor:name="givenname" install:module="gconflockdown">
- <value oor:external=
- "com.sun.star.configuration.backend.GconfBackend givenname"/>
- </prop>
- <prop oor:name="sn" install:module="gconflockdown">
- <value oor:external="com.sun.star.configuration.backend.GconfBackend sn"/>
+ <prop oor:name="sn">
+ <value install:module="unixdesktop" oor:external=
+ "com.sun.star.configuration.backend.DesktopBackend sn"/>
</prop>
</node>
</oor:component-data>
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 1749b5f..3c63d1f 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -307,6 +307,7 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Office/Common-unx.xcu \
$(MY_MOD)/org/openoffice/Office/Paths-unixdesktop.xcu \
$(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \
+ $(MY_MOD)/org/openoffice/UserProfile-unixdesktop.xcu \
$(MY_MOD)/org/openoffice/VCL-unixdesktop.xcu
# Inet-unixdesktop.xcu must come after Inet.xcu
# VCL-unixdesktop.xcu must come after VCL.xcu
@@ -466,7 +467,6 @@ MY_DEPS_gnome = main
MY_FILES_gnome += \
$(MY_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \
$(MY_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \
- $(MY_MOD)/org/openoffice/UserProfile-gconflockdown.xcu \
$(MY_MOD)/org/openoffice/VCL-gconflockdown.xcu
.END
.IF "$(ENABLE_GIO)" == "TRUE"
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 9b859c9..e84e096 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -173,7 +173,7 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName)
|| PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
|| PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
|| PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
- || PropertyName == "ooInetProxyType" )
+ || PropertyName == "ooInetProxyType" || PropertyName == "givenname" || PropertyName == "sn" )
{
return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
}
@@ -214,6 +214,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
desktop;
}
+
// Fall back to the default if the specific backend is not available:
css::uno::Reference< css::uno::XInterface > backend;
if ( desktop == "GNOME" ) {
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 47d4138..8743bcd 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -568,6 +568,22 @@ ConfigurationValue const ConfigurationValues[] =
SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked
},
+ {
+ SETTING_USER_GIVENNAME,
+ "/desktop/gnome/url-handlers/mailto/command", // dummy
+ RTL_CONSTASCII_STRINGPARAM("givenname"),
+ sal_True,
+ SETTING_USER_GIVENNAME
+ },
+
+ {
+ SETTING_USER_SURNAME,
+ "/desktop/gnome/url-handlers/mailto/command", // dummy
+ RTL_CONSTASCII_STRINGPARAM("sn"),
+ sal_True,
+ SETTING_USER_SURNAME
+ },
+
#ifdef ENABLE_LOCKDOWN
{
SETTING_WRITER_DEFAULT_DOC_FORMAT,
@@ -610,22 +626,6 @@ ConfigurationValue const ConfigurationValues[] =
},
{
- SETTING_USER_GIVENNAME,
- "/desktop/gnome/url-handlers/mailto/command", // dummy
- RTL_CONSTASCII_STRINGPARAM("givenname"),
- sal_True,
- SETTING_USER_GIVENNAME
- },
-
- {
- SETTING_USER_SURNAME,
- "/desktop/gnome/url-handlers/mailto/command", // dummy
- RTL_CONSTASCII_STRINGPARAM("sn"),
- sal_True,
- SETTING_USER_SURNAME
- },
-
- {
SETTING_DISABLE_PRINTING,
"/desktop/gnome/lockdown/disable_printing",
RTL_CONSTASCII_STRINGPARAM("DisablePrinting"),
commit 526f80404c87a41fe46cf5694b32b469875e5c6d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 6 16:00:51 2012 +0100
Related: fdo#30763 fill in default user realname under GNOME3
i.e. recognize that gnome-shell is a gnome session
so we use gconfbackend for default settings
so that we get a default name filled in for FirstName, LastName
so that the author/editor properties of new documents gets filled in by default
out of the box
so that the last-used position in odf files gets restored for that user
Change-Id: I6630866e64414e886c80abad1ca6200ffc25b378
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 68b3b71..f33c76d 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -111,8 +111,13 @@ static bool is_gnome_desktop( Display* pDisplay )
if( pProp && nType == nUTFAtom )
{
OString aWMName( (sal_Char*)pProp );
- if( aWMName.equalsIgnoreAsciiCase( "gnome-panel" ) )
+ if (
+ (aWMName.equalsIgnoreAsciiCase("gnome-shell")) ||
+ (aWMName.equalsIgnoreAsciiCase("gnome-panel"))
+ )
+ {
ret = true;
+ }
}
if( pProp )
XFree( pProp );
commit 2567a8c8e2722ea56508b0e85a6fdfe3b265d595
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 6 10:55:47 2012 +0100
update unused list
Change-Id: I9f17f0205c0dd0391006a710809ef45e0fe309c3
diff --git a/unusedcode.easy b/unusedcode.easy
index b2f763b..34f825b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -66,10 +66,10 @@ SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(Sea
StgCache::Pos2Page(int)
String::CreateFromAscii(char const*)
String::CreateFromAscii(char const*, unsigned short)
-String::String(rtl::OString const&, unsigned short, unsigned int)
String::String(unsigned short const*)
String::String(unsigned short const*, unsigned short)
SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char)
+SvPtrarr::Replace(void* const&, unsigned short)
SvPtrarr::Replace(void* const*, unsigned short, unsigned short)
SvPtrarr::_ForEach(unsigned short, unsigned short, unsigned char (*)(void* const&, void*), void*)
SvStringsISortDtor::Insert(String* const*, unsigned short)
@@ -100,7 +100,6 @@ SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const*, unsigned short, unsigned short)
SvxTabStopArr_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(SvxTabStop const&, void*), void*)
-SwAttrIter::Dump(SvStream&) const
SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
SwBlinkList::Insert(SwBlinkPortion* const&, unsigned short&)
SwBlinkList::Insert(SwBlinkPortion* const*, unsigned short)
@@ -340,7 +339,7 @@ nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-oox::drawingml::TextListStyle::dump() const
+oox::drawingml::TextParagraphProperties::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
oox::xls::CellBlock::RichStringCell::RichStringCell(com::sun::star::table::CellAddress const&, boost::shared_ptr<oox::xls::RichString> const&, oox::xls::Font const*)
commit e133535eb8518b9dd22f4ce890a61f34f40d096b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 6 10:32:07 2012 +0100
remove dangling missing resources since high contrast cleanup
Change-Id: I582a17512666ec72f427de994ccf6382d2e93a18
diff --git a/cui/source/options/dbregister.hrc b/cui/source/options/dbregister.hrc
index 7757050..fcd5d56 100644
--- a/cui/source/options/dbregister.hrc
+++ b/cui/source/options/dbregister.hrc
@@ -26,8 +26,7 @@
#define BTN_EDIT 14
#define GB_STD 15
#define IMG_LOCK 16
-#define IMG_LOCK_HC 17
-#define BTN_DELETE 18
+#define BTN_DELETE 17
#endif // SVX_DBREGISTER_HRC
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index d2b5a5f..14829c5 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -88,13 +88,13 @@ struct OptPath_Impl
{
SvtDefaultOptions m_aDefOpt;
Image m_aLockImage;
- Image m_aLockImageHC;
String m_sMultiPathDlg;
Reference< XPropertySet > m_xPathSettings;
- OptPath_Impl(const ResId& rLockRes, const ResId& rLockResHC) :
- m_aLockImage(rLockRes),
- m_aLockImageHC(rLockResHC){}
+ OptPath_Impl(const ResId& rLockRes)
+ : m_aLockImage(rLockRes)
+ {
+ }
};
// struct PathUserData_Impl ----------------------------------------------
@@ -219,7 +219,7 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
aPathBtn ( this, CUI_RES( BTN_PATH ) ),
pHeaderBar ( NULL ),
pPathBox ( NULL ),
- pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK), CUI_RES(IMG_LOCK_HC) ) ),
+ pImpl ( new OptPath_Impl( CUI_RES(IMG_LOCK) ) ),
xDialogListener ( new ::svt::DialogClosedListener() )
{
diff --git a/cui/source/options/optpath.hrc b/cui/source/options/optpath.hrc
index cf45a0e..3b1a259 100644
--- a/cui/source/options/optpath.hrc
+++ b/cui/source/options/optpath.hrc
@@ -27,8 +27,7 @@
#define BTN_STANDARD 14
#define GB_STD 15
#define IMG_LOCK 16
-#define IMG_LOCK_HC 17
-#define STR_MULTIPATHDLG 18
+#define STR_MULTIPATHDLG 17
#endif
commit 8c6cd2f686c72c57d44a4295d4f7c9cdbead1e38
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 6 10:27:38 2012 +0100
remove instantiated but unused ui elements without existing resources
Change-Id: Icefcd4746d416d5a0d4a244ee32eeddb376221ae
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 06e2329..8800e11 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -200,8 +200,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ),
aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ),
aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ),
- aHelpFormatFT ( this, CUI_RES( FT_HELPFORMAT ) ),
- aHelpFormatLB ( this, CUI_RES( LB_HELPFORMAT ) ),
aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ),
aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ),
aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ),
@@ -220,11 +218,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
{
FreeResource();
-#if !defined(ENABLE_HELP_FORMATTING)
- aHelpFormatFT.Hide();
- aHelpFormatLB.Hide();
-#endif
-
if (!lcl_HasSystemFilePicker())
{
aFileDlgFL.Hide();
@@ -334,22 +327,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aToolTipsCB.SetClickHdl( aLink );
aHelpAgentCB.SetClickHdl( aLink );
aHelpAgentResetBtn.SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) );
-
- //fill default names as user data
- static const char* aHelpFormatNames[] =
- {
- "Default",
- "HighContrast1",
- "HighContrast2",
- "HighContrastBlack",
- "HighContrastWhite"
- };
-
- for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++ )
- {
- String* pData = new String( rtl::OUString::createFromAscii( aHelpFormatNames[i] ) );
- aHelpFormatLB.SetEntryData( i, pData );
- }
}
#ifdef WNT
@@ -364,10 +341,6 @@ IMPL_LINK_NOARG(OfaMiscTabPage, OnFileDlgToggled)
OfaMiscTabPage::~OfaMiscTabPage()
{
- for(sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++)
- {
- delete static_cast< String* >( aHelpFormatLB.GetEntryData(i) );
- }
}
// -----------------------------------------------------------------------
@@ -393,12 +366,6 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
bChecked = aHelpAgentCB.IsChecked();
if ( bChecked != aHelpAgentCB.GetSavedValue() )
aHelpOptions.SetHelpAgentAutoStartMode( bChecked );
- sal_uInt16 nHelpFormatPos = aHelpFormatLB.GetSelectEntryPos();
- if ( nHelpFormatPos != LISTBOX_ENTRY_NOTFOUND &&
- nHelpFormatPos != aHelpFormatLB.GetSavedValue() )
- {
- aHelpOptions.SetHelpStyleSheet( *static_cast< String* >( aHelpFormatLB.GetEntryData( nHelpFormatPos ) ) );
- }
if ( aFileDlgCB.IsChecked() != aFileDlgCB.GetSavedValue() )
{
@@ -469,20 +436,10 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
aToolTipsCB.Check( aHelpOptions.IsHelpTips() );
aExtHelpCB.Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() );
aHelpAgentCB.Check( aHelpOptions.IsHelpAgentAutoStartMode() );
- String sStyleSheet = aHelpOptions.GetHelpStyleSheet();
- for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); ++i )
- {
- if ( *static_cast< String* >( aHelpFormatLB.GetEntryData(i) ) == sStyleSheet )
- {
- aHelpFormatLB.SelectEntryPos(i);
- break;
- }
- }
aToolTipsCB.SaveValue();
aExtHelpCB.SaveValue();
aHelpAgentCB.SaveValue();
- aHelpFormatLB.SaveValue();
HelpCheckHdl_Impl( &aHelpAgentCB );
SvtMiscOptions aMiscOpt;
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 2d2ff4c..9be9051 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -21,8 +21,6 @@
// defines for positions and sizes ---------------------------------------
-#define ENABLE_HELP_FORMATTING 0
-
#define WHOLE_WIDTH 248
#define EDIT_WIDTH 30
#define UNIT_WIDTH 40
@@ -39,11 +37,7 @@
#define ROWSPACE RSC_SP_CTRL_DESC_Y
#define ROW0 3
#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#if ENABLE_HELP_FORMATTING
-#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#else
#define ROW2 (ROW1)
-#endif
#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
@@ -99,10 +93,8 @@
#define CB_EXTHELP 12
#define CB_HELPAGENT 13
#define PB_HELPAGENT_RESET 14
-#define FT_HELPFORMAT 15
-#define LB_HELPFORMAT 16
-#define CB_EXPERIMENTAL 18
-#define CB_MACRORECORDER 20
+#define CB_EXPERIMENTAL 15
+#define CB_MACRORECORDER 16
#define FL_TWOFIGURE 40
#define FT_INTERPRET 41
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 4b7f571..3ae53fd 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -50,8 +50,6 @@ private:
CheckBox aExtHelpCB;
CheckBox aHelpAgentCB;
PushButton aHelpAgentResetBtn;
- FixedText aHelpFormatFT;
- ListBox aHelpFormatLB;
FixedLine aFileDlgFL;
ReadOnlyImage aFileDlgROImage;
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index e3e3ef9..6f1ab4e 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -62,31 +62,6 @@ TabPage OFA_TP_MISC
Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Extended tips";
};
-#if ENABLE_HELP_FORMATTING
- FixedText FT_HELPFORMAT
- {
- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) );
- Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Help ~formatting";
- };
- ListBox LB_HELPFORMAT
- {
- HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
- Pos = MAP_APPFONT( COL3, ROW2 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
- DropDown = TRUE ;
- Border = TRUE ;
- TabStop = TRUE ;
- StringList [ en-US ] =
- {
- < "Default" ; > ;
- < "High Contrast #1" ; > ;
- < "High Contrast #2" ; > ;
- < "High Contrast Black" ; > ;
- < "High Contrast White" ; > ;
- };
- };
-#endif
CheckBox CB_HELPAGENT
{
HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
commit 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 4 23:58:05 2012 +0100
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index fa504e3..e419c42 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -929,7 +929,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
// nLinepPage is not correct if there's a line break
sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height()/nLineHeight);
- sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pPrinter->GetTextWidth( 'X' ) );
+ sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width() / pPrinter->GetTextWidth(rtl::OUString('X')) );
sal_uLong nParas = GetEditEngine()->GetParagraphCount();
sal_uInt16 nPages = (sal_uInt16) (nParas/nLinespPage+1 );
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 3313995..3e96c22 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -763,7 +763,7 @@ void EditorWindow::InitScrollBars()
{
pModulWindow->GetHScrollBar()->SetVisibleSize( aOutSz.Width() );
pModulWindow->GetHScrollBar()->SetPageSize( aOutSz.Width() * 8 / 10 );
- pModulWindow->GetHScrollBar()->SetLineSize( GetTextWidth( 'x' ) );
+ pModulWindow->GetHScrollBar()->SetLineSize( GetTextWidth( rtl::OUString('x') ) );
pModulWindow->GetHScrollBar()->SetThumbPos( pEditView->GetStartDocPos().X() );
pModulWindow->GetHScrollBar()->Show();
}
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 052e2a3..97674a6 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -38,7 +38,7 @@ LineNumberWindow::LineNumberWindow( Window* pParent, ModulWindow* pModulWin ) :
m_nCurYOffset(0)
{
SetBackground(Wallpaper(GetSettings().GetStyleSettings().GetFieldColor()));
- m_nBaseWidth = GetTextWidth(String('8'));
+ m_nBaseWidth = GetTextWidth(rtl::OUString('8'));
m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;
}
@@ -71,7 +71,7 @@ void LineNumberWindow::Paint( const Rectangle& )
// FIXME: it would be best if we could get notified of a font change
// rather than doing that re-calculation at each Paint event
- m_nBaseWidth = GetTextWidth(String('8'));
+ m_nBaseWidth = GetTextWidth(rtl::OUString('8'));
// reserve enough for 3 sigit minimum, with a bit to spare for confort
m_nWidth = m_nBaseWidth * 3 + m_nBaseWidth / 2;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 8fa93f5..5d25cd4 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1810,10 +1810,12 @@ ErrCode BasicManager::ExecuteMacro( String const& i_fullyQualifiedName, String c
}
// add quoted arguments and do the call
- String sCall( '[' );
- sCall += pMethod->GetName();
- sCall += sQuotedArgs;
- sCall += ']';
+ rtl::OUString sCall = rtl::OUStringBuffer().
+ append('[').
+ append(pMethod->GetName()).
+ append(sQuotedArgs).
+ append(']').
+ makeStringAndClear();
SbxVariable* pRet = pMethod->GetParent()->Execute( sCall );
if ( pRet && ( pRet != pMethod ) )
diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx
index eb11a39..bea2924 100644
--- a/basic/source/comp/basiccharclass.cxx
+++ b/basic/source/comp/basiccharclass.cxx
@@ -110,9 +110,8 @@ bool BasicCharClass::isLetterUnicode( sal_Unicode c )
static CharClass* pCharClass = NULL;
if( pCharClass == NULL )
pCharClass = new CharClass( Application::GetSettings().GetLocale() );
- String aStr( c );
// can we get pCharClass to accept a sal_Unicode instead of this waste?
- return pCharClass->isLetter( aStr, 0 );
+ return pCharClass->isLetter( rtl::OUString(c), 0 );
}
bool BasicCharClass::isAlpha( sal_Unicode c, bool bCompatible )
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 1acc7c9..9b3bbad 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -138,7 +138,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed )
// #52709 DIM AS NEW for Uno with full-qualified name
if( Peek() == DOT )
{
- String aDotStr( '.' );
+ rtl::OUString aDotStr( '.' );
while( Peek() == DOT )
{
aCompleteName += aDotStr;
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 1af42ef..f958a88 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -722,7 +722,7 @@ void SbiParser::Implements()
Next();
if( Peek() == DOT )
{
- String aDotStr( '.' );
+ rtl::OUString aDotStr( '.' );
while( Peek() == DOT )
{
aImplementedIface += aDotStr;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index bde97f0..a0598d4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -345,8 +345,8 @@ DataSourceTabPage::DataSourceTabPage(
// set button text
sal_Unicode cBlackUpPointingTriangle( 0x25b2 );
sal_Unicode cBlackDownPointingTriangle( 0x25bc );
- m_aBTN_UP.SetText( String( cBlackUpPointingTriangle ));
- m_aBTN_DOWN.SetText( String( cBlackDownPointingTriangle ));
+ m_aBTN_UP.SetText( rtl::OUString( cBlackUpPointingTriangle ));
+ m_aBTN_DOWN.SetText( rtl::OUString( cBlackDownPointingTriangle ));
// init controls
m_aLB_ROLE.SetTabs( lcl_pRoleListBoxTabs, MAP_APPFONT );
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 99c473b..e38fc0f 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -350,10 +350,10 @@ void SvxHyperlinkNewDocTp::DoApply ()
SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") );
SfxStringItem aFrame( SID_TARGETNAME, rtl::OUString("_blank") );
- String aStrFlags ( sal_Unicode('S') );
+ rtl::OUString aStrFlags('S');
if ( maRbtEditLater.IsChecked() )
{
- aStrFlags += sal_Unicode('H');
+ aStrFlags += rtl::OUString('H');
}
SfxStringItem aFlags (SID_OPTIONS, aStrFlags);
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 064231c..6d93cde 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -326,8 +326,8 @@ String SvxHyphenWordDialog_Impl::EraseUnusableHyphens_Impl(
// 1) remove all not usable hyphenation positions from the end of the string
nPos = nIdx == STRING_NOTFOUND ? 0 : nIdx + 1;
nPos1 = nPos; //save for later use in 2) below
- const String aTmp( sal_Unicode( HYPH_POS_CHAR ) );
- const String aEmpty;
+ const rtl::OUString aTmp( sal_Unicode( HYPH_POS_CHAR ) );
+ const rtl::OUString aEmpty;
while (nPos != STRING_NOTFOUND)
nPos = aTxt.SearchAndReplace( aTmp, aEmpty, nPos + 1 );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d7ccde6..f731ef3 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -312,7 +312,7 @@ short SvInsertOleDlg::Execute()
// object couldn't be created from file
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
- aErr.SearchAndReplace( String( '%' ), aFileName );
+ aErr.SearchAndReplace( rtl::OUString( '%' ), aFileName );
ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute();
}
else
@@ -320,7 +320,7 @@ short SvInsertOleDlg::Execute()
// object couldn't be created
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) );
- aErr.SearchAndReplace( String( '%' ), aServerName );
+ aErr.SearchAndReplace( rtl::OUString( '%' ), aServerName );
ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute();
}
}
@@ -373,7 +373,7 @@ short SvInsertOleDlg::Execute()
// object couldn't be created from file
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
- aErr.SearchAndReplace( String( '%' ), aFileName );
+ aErr.SearchAndReplace( rtl::OUString( '%' ), aFileName );
ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute();
}
}
@@ -529,7 +529,7 @@ short SvInsertPlugInDialog::Execute()
// PlugIn couldn't be created
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_PLUGIN ) );
- aErr.SearchAndReplace( String( '%' ), aURL );
+ aErr.SearchAndReplace( rtl::OUString('%'), aURL );
ErrorBox( this, WB_3DLOOK | WB_OK, aErr ).Execute();
}
}
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 5ab52fd..92ce9f4 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -105,7 +105,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
sal_uLong nPos = aRadioLB.GetEntryPos( sInsPath, 1 );
if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos
{
- String sNewEntry( '\t' );
+ rtl::OUString sNewEntry( '\t' );
sNewEntry += sInsPath;
SvLBoxEntry* pEntry = aRadioLB.InsertEntry( sNewEntry );
String* pData = new String( aURL );
@@ -293,7 +293,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath )
if ( pImpl->bIsRadioButtonMode )
{
- String sEntry( '\t' );
+ rtl::OUString sEntry( '\t' );
sEntry += (bIsSystemPath ? sSystemPath : sPath);
SvLBoxEntry* pEntry = aRadioLB.InsertEntry( sEntry );
String* pURL = new String( sPath );
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a8ab0d1..859e83a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -596,7 +596,7 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
rtl::OUString aValue = pEdit->GetText();
if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX )
- pEdit->SetText( '0' );
+ pEdit->SetText( rtl::OUString('0') );
return 0;
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 52b5c4b..f1238d8 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -133,14 +133,15 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
};
m_aJavaList.SvxSimpleTable::SetTabs( aStaticTabs );
- String sHeader( '\t' );
- sHeader += String( CUI_RES( STR_HEADER_VENDOR ) );
- sHeader += '\t';
- sHeader += String( CUI_RES( STR_HEADER_VERSION ) );
- sHeader += '\t';
- sHeader += String( CUI_RES( STR_HEADER_FEATURES ) );
- sHeader += '\t';
- m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT );
+ rtl::OUStringBuffer sHeader;
+ sHeader.append('\t');
+ sHeader.append(CUI_RESSTR(STR_HEADER_VENDOR));
+ sHeader.append('\t');
+ sHeader.append(CUI_RESSTR(STR_HEADER_VERSION));
+ sHeader.append('\t');
+ sHeader.append(CUI_RESSTR(STR_HEADER_FEATURES));
+ sHeader.append('\t');
+ m_aJavaList.InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT );
m_aJavaList.SetHelpId( HID_OPTIONS_JAVA_LIST );
@@ -476,14 +477,15 @@ void SvxJavaOptionsPage::LoadJREs()
void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
{
- String sEntry( '\t' );
- sEntry += String( ::rtl::OUString( _pInfo->sVendor ) );
- sEntry += '\t';
- sEntry += String( ::rtl::OUString( _pInfo->sVersion ) );
- sEntry += '\t';
+ rtl::OUStringBuffer sEntry;
+ sEntry.append('\t');
+ sEntry.append(_pInfo->sVendor);
+ sEntry.append('\t');
+ sEntry.append(_pInfo->sVersion);
+ sEntry.append('\t');
if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE )
- sEntry += m_sAccessibilityText;
- SvLBoxEntry* pEntry = m_aJavaList.InsertEntry( sEntry );
+ sEntry.append(m_sAccessibilityText);
+ SvLBoxEntry* pEntry = m_aJavaList.InsertEntry(sEntry.makeStringAndClear());
INetURLObject aLocObj( ::rtl::OUString( _pInfo->sLocation ) );
String* pLocation = new String( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
pEntry->SetUserData( pLocation );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2643aa4..2172115 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/module.hxx>
#include <sfx2/request.hxx>
@@ -597,11 +598,11 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
pOpt->bChgEnumNum = bCheck;
bModified |= aBulletFont != pOpt->aBulletFont;
pOpt->aBulletFont = aBulletFont;
- bModified |= String(pOpt->cBullet) != sBulletChar;
+ bModified |= !comphelper::string::equals(sBulletChar, pOpt->cBullet);
pOpt->cBullet = sBulletChar.GetChar(0);
bModified |= aByInputBulletFont != pOpt->aByInputBulletFont;
- bModified |= String(pOpt->cByInputBullet) != sByInputBulletChar;
+ bModified |= !comphelper::string::equals(sByInputBulletChar, pOpt->cByInputBullet);
pOpt->aByInputBulletFont = aByInputBulletFont;
pOpt->cByInputBullet = sByInputBulletChar.GetChar(0);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 7e82b1c..8704493 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -701,7 +701,7 @@ void SvxBackgroundTabPage::FillUserData()
*/
{
- SetUserData( String( aBtnPreview.IsChecked() ? sal_Unicode('1') : sal_Unicode('0') ) );
+ SetUserData( aBtnPreview.IsChecked() ? rtl::OUString('1') : rtl::OUString('0') );
}
//------------------------------------------------------------------------
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 98b00b6..55b1180 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3576,7 +3576,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
if ( !bFound )
{
- nEntryPos = pBox->InsertEntry( String( cBracket ) );
+ nEntryPos = pBox->InsertEntry( rtl::OUString(cBracket) );
pBox->SelectEntryPos( nEntryPos );
}
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e909c17..6008b63 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2311,7 +2311,7 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
aBulletColor.Invert();
aFont.SetColor(aBulletColor);
pVDev->SetFont( aFont );
- String aText(sal_Unicode(rFmt.GetBulletChar()));
+ rtl::OUString aText(rFmt.GetBulletChar());
long nY = nYStart;
nY -= ((aTmpSize.Height() - rSize.Height())/ 2);
pVDev->DrawText( Point(nXStart, nY), aText );
@@ -2463,7 +2463,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
{
pVDev->SetFont(aStdFont);
- String aText(' ');
+ rtl::OUString aText(' ');
pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText);
}
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index ecb0461..58784d8 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -463,7 +463,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
pTypeBtn = &aDezTab;
aDezChar.Enable();
aDezCharLabel.Enable();
- aDezChar.SetText( String( (sal_Unicode)aAktTab.GetDecimal() ) );
+ aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
}
else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_CENTER )
pTypeBtn = &aCenterTab;
@@ -486,7 +486,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
{
pFillBtn = &aFillSpecial;
aFillChar.Enable();
- aFillChar.SetText( String( (sal_Unicode)aAktTab.GetFill() ) );
+ aFillChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetFill() ) );
}
pFillBtn->Check();
}
@@ -628,7 +628,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
eAdj = SVX_TAB_ADJUST_DECIMAL;
aDezChar.Enable();
aDezCharLabel.Enable();
- aDezChar.SetText( String( (sal_Unicode)aAktTab.GetDecimal() ) );
+ aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
}
aAktTab.GetAdjustment() = eAdj;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 0614c47..9fd4d3a 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2205,9 +2205,9 @@ void OApplicationController::renameEntry()
}
catch(const ElementExistException& e)
{
- static ::rtl::OUString sStatus = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
+ rtl::OUString sStatus("S1000");
String sMsg = String( ModuleRes( STR_NAME_ALREADY_EXISTS ) );
- sMsg.SearchAndReplace('#',e.Message);
+ sMsg.SearchAndReplace(rtl::OUString('#'), e.Message);
showError(SQLExceptionInfo(SQLException(sMsg, e.Context, sStatus, 0, Any())));
}
catch(const Exception& )
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index b679e18..e50a64e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1857,7 +1857,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
xProp->getPropertyValue(PROPERTY_COMMAND) >>= aName;
String sObject(aName);
- sTitle.SearchAndReplace('#',sObject);
+ sTitle.SearchAndReplace(rtl::OUString('#'), sObject);
aReturn.sTitle = sTitle;
aReturn.bEnabled = sal_True;
}
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 2759864..b142314 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -48,6 +48,7 @@
#include <connectivity/dbtools.hxx>
#include <connectivity/dbconversion.hxx>
#include <comphelper/numbers.hxx>
+#include <comphelper/string.hxx>
#include "UITools.hxx"
#include <memory>
#include "dbu_control.hrc"
@@ -263,33 +264,26 @@ OFieldDescControl::~OFieldDescControl()
//------------------------------------------------------------------------------
String OFieldDescControl::BoolStringPersistent(const String& rUIString) const
{
- static String aZero('0');
- static String aOne('1');
-
if (rUIString == aNo)
- return aZero;
+ return rtl::OUString('0');
if (rUIString == aYes)
- return aOne;
- return String();
+ return rtl::OUString('1');
+ return rtl::OUString();
}
//------------------------------------------------------------------------------
String OFieldDescControl::BoolStringUI(const String& rPersistentString) const
{
- static String aZero('0');
- static String aOne('1');
- static String aNone(ModuleRes(STR_VALUE_NONE));
-
// Older versions may store a language dependend string as a default
if (rPersistentString.Equals(aYes) || rPersistentString.Equals(aNo))
return rPersistentString;
- if (rPersistentString == aZero)
+ if (comphelper::string::equals(rPersistentString, '0'))
return aNo;
- if (rPersistentString == aOne)
+ if (comphelper::string::equals(rPersistentString, '1'))
return aYes;
- return aNone;
+ return ModuleRes(STR_VALUE_NONE).toString();
}
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index a04d977..ab4b150 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -470,7 +470,7 @@ DBG_NAME(OTextConnectionHelper)
else
{
sExtension = m_aETOwnExtension.GetText();
- if ( sExtension.GetToken(0,'.').Equals('*') )
+ if ( comphelper::string::equals(sExtension.GetToken(0,'.'), '*') )
sExtension.Erase(0,2);
}
return sExtension;
@@ -487,11 +487,11 @@ DBG_NAME(OTextConnectionHelper)
return rBox.GetText().Copy(0);
if ( !( &m_aTextSeparator == &rBox && nPos == (rBox.GetEntryCount()-1) ) )
- return String(
+ return rtl::OUString(
static_cast< sal_Unicode >(
rList.GetToken(((nPos*2)+1), nTok ).ToInt32()));
// somewhat strange ... translates for instance an "32" into " "
- return String();
+ return rtl::OUString();
}
//------------------------------------------------------------------------
@@ -503,11 +503,11 @@ DBG_NAME(OTextConnectionHelper)
for( i=0 ; i<nCnt ; i+=2 )
{
- String sTVal(
+ rtl::OUString sTVal(
static_cast< sal_Unicode >(
rList.GetToken( (i+1), nTok ).ToInt32()));
- if( sTVal == rVal )
+ if( sTVal.equals(rVal) )
{
rBox.SetText( rList.GetToken( i, nTok ) );
break;
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 7c36e19..d3ddfb7 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -343,9 +343,9 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
*pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False);
*pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False);
*pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, rtl::OUString());
- *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, ',');
- *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, '"');
- *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, '.');
+ *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, rtl::OUString(','));
+ *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, rtl::OUString('"'));
+ *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, rtl::OUString('.'));
*pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString());
*pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt"));
*pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True);
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 9f0b4d9..1201400 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -219,7 +219,7 @@ DBG_NAME(IndexFieldsControl)
sal_Int32 nWidthAsc = GetTextWidth(m_sAscendingText) + GetSettings().GetStyleSettings().GetScrollBarSize();
sal_Int32 nWidthDesc = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize();
// maximum plus some additional space
- return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth('0') * 2;
+ return (nWidthAsc > nWidthDesc ? nWidthAsc : nWidthDesc) + GetTextWidth(rtl::OUString('0')) * 2;
}
return EditBrowseBox::GetTotalCellWidth(_nRow, _nColId);
}
@@ -249,7 +249,7 @@ DBG_NAME(IndexFieldsControl)
nOther = GetTextWidth(m_sDescendingText) + GetSettings().GetStyleSettings().GetScrollBarSize();
nSortOrderColumnWidth = nSortOrderColumnWidth > nOther ? nSortOrderColumnWidth : nOther;
// (plus some additional space)
- nSortOrderColumnWidth += GetTextWidth('0') * 2;
+ nSortOrderColumnWidth += GetTextWidth(rtl::OUString('0')) * 2;
InsertDataColumn(COLUMN_ID_ORDER, sColumnName, nSortOrderColumnWidth, HIB_STDSTYLE, 1);
m_pSortingCell = new ListBoxControl(&GetDataWindow());
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 7779a2d..6e16280 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -208,8 +208,8 @@ sal_Bool OCopyTable::LeavePage()
&& m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) )
{
String aInfoString( ModuleRes(STR_WIZ_PKEY_ALREADY_DEFINED) );
- aInfoString += String(' ');
- aInfoString += String(m_pParent->m_aKeyName);
+ aInfoString += rtl::OUString(' ');
+ aInfoString += m_pParent->m_aKeyName;
m_pParent->showError(aInfoString);
return sal_False;
}
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b7a07cf..7c4ad6f 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2329,7 +2329,7 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nCo
sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos();
if (nIdx == sal_uInt16(-1))
nIdx = 0;
- return String(nIdx);
+ return rtl::OUString(nIdx);
}
default:
return GetCellText(nCellIndex, nColId);
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 231eef5..2bd52f7 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1267,7 +1267,7 @@ String OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const
sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
{
DBG_CHKTHIS(OTableEditorCtrl,NULL);
- return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth('0');
+ return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(rtl::OUString('0'));
}
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 0794cd6..f3690eb 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -74,7 +74,7 @@ void OTableRowView::Init()
SetFont(aFont);
// HandleColumn, fuer maximal fuenf Ziffern einrichten
- InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth('0') * 4)/*, sal_True */);
+ InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */);
BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION |
BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL;
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index 47ddc50..1844947 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -69,7 +69,7 @@ namespace drawinglayer
Primitive2DSequence TextCharacterStrikeoutPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
// strikeout with character
- const String aSingleCharString(getStrikeoutChar());
+ const rtl::OUString aSingleCharString(getStrikeoutChar());
basegfx::B2DVector aScale, aTranslate;
double fRotate, fShearX;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 59f4524..b4a08e5 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2261,7 +2261,7 @@ EditPaM EditDoc::InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem )
{
DBG_ASSERT( aPaM.GetNode(), "Blinder PaM in EditDoc::InsertFeature" );
- aPaM.GetNode()->Insert( CH_FEATURE, aPaM.GetIndex() );
+ aPaM.GetNode()->Insert( rtl::OUString(CH_FEATURE), aPaM.GetIndex() );
aPaM.GetNode()->ExpandAttribs( aPaM.GetIndex(), 1, GetItemPool() );
// Create a feature-attribute for the feature...
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 58d0f7a..d3fb0c3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2724,7 +2724,7 @@ Rectangle EditEngine::GetBulletArea( sal_uInt16 )
XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& )
{
DBG_CHKTHIS( EditEngine, 0 );
- return ' ';
+ return rtl::OUString(' ');
}
void EditEngine::FieldClicked( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index be1e766..32eadcd 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2672,12 +2672,12 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
if ( IsUndoEnabled() && !IsInUndo() )
{
- EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), c);
+ EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), rtl::OUString(c));
sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False;
InsertUndo( pNewUndo, bTryMerge );
}
- aEditDoc.InsertText( (const EditPaM&)aPaM, c );
+ aEditDoc.InsertText( (const EditPaM&)aPaM, rtl::OUString(c) );
ParaPortion* pPortion = FindParaPortion( aPaM.GetNode() );
OSL_ENSURE( pPortion, "Blind Portion in InsertText" );
pPortion->MarkInvalid( aPaM.GetIndex(), 1 );
@@ -2954,7 +2954,7 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel )
if ( aPrevParaText.GetChar(n) == '\t' )
aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) );
else
- aPaM = ImpInsertText( aPaM, aPrevParaText.GetChar(n) );
+ aPaM = ImpInsertText( aPaM, rtl::OUString(aPrevParaText.GetChar(n)) );
n++;
}
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 504d774..a0aedb1 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1961,7 +1961,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
// A portion for inserting the separator ...
TextPortion* pHyphPortion = new TextPortion( 0 );
pHyphPortion->GetKind() = PORTIONKIND_HYPHENATOR;
- String aHyphText( CH_HYPH );
+ String aHyphText(rtl::OUString(CH_HYPH));
if ( cAlternateReplChar )
{
TextPortion* pPrev = pParaPortion->GetTextPortions()[nEndPortion];
@@ -1976,7 +1976,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
else if ( cAlternateExtraChar )
{
pHyphPortion->SetExtraValue( cAlternateExtraChar );
- aHyphText.Insert( cAlternateExtraChar, 0 );
+ aHyphText.Insert( rtl::OUString(cAlternateExtraChar), 0 );
}
// Determine the width of the Hyph-Portion:
@@ -3042,7 +3042,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
if ( 0x200B == cChar || 0x2060 == cChar )
{
- const String aBlank( ' ' );
+ const rtl::OUString aBlank( ' ' );
long nHalfBlankWidth = aTmpFont.QuickGetTextSize( pOutDev, aBlank, 0, 1, 0 ).Width() / 2;
const long nAdvanceX = ( nTmpIdx == nTmpEnd ?
@@ -3087,7 +3087,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
if ( 0x200B == cChar )
{
- const String aSlash( '/' );
+ const rtl::OUString aSlash( '/' );
const short nOldEscapement = aTmpFont.GetEscapement();
const sal_uInt8 nOldPropr = aTmpFont.GetPropr();
@@ -3490,7 +3490,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
aTmpFont.SetTransparent( sal_False );
aTmpFont.SetEscapement( 0 );
aTmpFont.SetPhysFont( pOutDev );
- long nCharWidth = aTmpFont.QuickGetTextSize( pOutDev, pTextPortion->GetExtraValue(), 0, 1, NULL ).Width();
+ long nCharWidth = aTmpFont.QuickGetTextSize( pOutDev,
+ rtl::OUString(pTextPortion->GetExtraValue()), 0, 1, NULL ).Width();
long nChars = 2;
if( nCharWidth )
nChars = pTextPortion->GetSize().Width() / nCharWidth;
@@ -3516,7 +3517,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
// StripPortions() data callback
GetEditEnginePtr()->DrawingTab( aTmpPos,
pTextPortion->GetSize().Width(),
- pTextPortion->GetExtraValue(),
+ rtl::OUString(pTextPortion->GetExtraValue()),
aTmpFont, n, nIndex, pTextPortion->GetRightToLeft(),
bEndOfLine, bEndOfParagraph,
aOverlineColor, aTextLineColor);
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 8eb912f..1271860 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -3039,7 +3039,7 @@ short ImpEditEngine::ReplaceTextOnly(
else
{
DBG_ASSERT( nDiff == 1, "TransliterateText - Diff other than expected! But should work..." );
- GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), rNewText.GetChar(n) );
+ GetEditDoc().InsertText( EditPaM( pNode, nCurrentPos ), rtl::OUString(rNewText.GetChar(n)) );
}
nDiffs = sal::static_int_cast< short >(nDiffs + nDiff);
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 4319cd6..ae8c99d 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include <comphelper/string.hxx>
#include <vcl/outdev.hxx>
#include <vcl/print.hxx>
#include <tools/poly.hxx>
@@ -148,7 +149,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
{
if( bBlank )
{
- String aTemp( aTxt.GetChar( i ) );
+ rtl::OUString aTemp(aTxt.GetChar(i));
aTemp = aCharClass.uppercase( aTemp );
aTxt.Replace( i, 1, aTemp );
}
@@ -281,7 +282,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
sal_uInt32 nCharacterType = aCharClass.getCharacterType( aCharString, 0 );
if ( ( nCharacterType & ::com::sun::star::i18n::KCharacterType::UPPER ) )
break;
- if ( CH_BLANK == aCharString )
+ if ( comphelper::string::equals(aCharString, CH_BLANK) )
break;
if( ++nPos < nTxtLen )
aCharString = rTxt.GetChar( nPos + nIdx );
@@ -306,7 +307,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
nOldPos = nPos;
}
// Now the blanks are<processed
- while( nPos < nTxtLen && CH_BLANK == aCharString && ++nPos < nTxtLen )
+ while( nPos < nTxtLen && comphelper::string::equals(aCharString, CH_BLANK) && ++nPos < nTxtLen )
aCharString = rTxt.GetChar( nPos + nIdx );
if( nOldPos != nPos )
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 7003f31..66b817e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -45,11 +45,12 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <comphelper/string.hxx>
#include <editeng/editids.hrc>
#include <sot/storage.hxx>
-#include <comphelper/storagehelper.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/escpitem.hxx>
@@ -433,9 +434,9 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
if(xSpellAlt.is())
{
sal_Unicode cSave = rTxt.GetChar( nSttPos );
- String sChar( cSave );
+ rtl::OUString sChar( cSave );
sChar = rCC.lowercase( sChar );
- if( sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ))
+ if( sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ))
{
if( SaveWordWrdSttLst & nFlags )
rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
@@ -552,17 +553,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
;
// found: " --[<AnySttChars>][A-z0-9]
- if( rCC.isLetterNumeric( cCh ) )
+ if( rCC.isLetterNumeric( rtl::OUString(cCh) ) )
{
for( n = nSttPos-1; n && lcl_IsInAsciiArr(
sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); )
;
// found: "[A-z0-9][<AnyEndChars>] --[<AnySttChars>][A-z0-9]
- if( rCC.isLetterNumeric( cCh ))
+ if( rCC.isLetterNumeric( rtl::OUString(cCh) ))
{
rDoc.Delete( nSttPos, nSttPos + 2 );
- rDoc.Insert( nSttPos, bAlwaysUseEmDash ? cEmDash : cEnDash );
+ rDoc.Insert( nSttPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) );
bRet = sal_True;
}
}
@@ -587,17 +588,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
;
// found: " - [<AnySttChars>][A-z0-9]
- if( rCC.isLetterNumeric( cCh ) )
+ if( rCC.isLetterNumeric( rtl::OUString(cCh) ) )
{
cCh = ' ';
for( n = nTmpPos-1; n && lcl_IsInAsciiArr(
sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); )
;
// found: "[A-z0-9][<AnyEndChars>] - [<AnySttChars>][A-z0-9]
- if( rCC.isLetterNumeric( cCh ))
+ if( rCC.isLetterNumeric( rtl::OUString(cCh) ))
{
rDoc.Delete( nTmpPos, nTmpPos + nLen );
- rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? cEmDash : cEnDash );
+ rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) );
bRet = sal_True;
}
}
@@ -621,7 +622,7 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
{
nSttPos = nSttPos + nFndPos;
rDoc.Delete( nSttPos, nSttPos + 2 );
- rDoc.Insert( nSttPos, (bEnDash ? cEnDash : cEmDash) );
+ rDoc.Insert( nSttPos, (bEnDash ? rtl::OUString(cEnDash) : rtl::OUString(cEmDash)) );
bRet = sal_True;
}
}
@@ -690,7 +691,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
// Add the non-breaking space at the end pos
if ( bHasSpace )
- rDoc.Insert( nPos, CHAR_HARDBLANK );
+ rDoc.Insert( nPos, rtl::OUString(CHAR_HARDBLANK) );
bRunNext = true;
bRet = true;
}
@@ -881,9 +882,9 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
if( !pPrevPara )
{
// valid separator -> replace
- String sChar( *pWordStt );
+ rtl::OUString sChar( *pWordStt );
sChar = rCC.uppercase( sChar );
- return sChar != *pWordStt &&
+ return !comphelper::string::equals(sChar, *pWordStt) &&
rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar );
}
@@ -1056,9 +1057,9 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
// Ok, then replace
sal_Unicode cSave = *pWordStt;
nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() );
- String sChar( cSave );
+ rtl::OUString sChar( cSave );
sChar = rCC.uppercase( sChar );
- sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
+ sal_Bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
// Parahaps someone wants to have the word
if( bRet && SaveWordCplSttLst & nFlags )
@@ -1096,7 +1097,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) )
// Another uppercase letter. Convert it.
- aConverted.Append( rCC.lowercase(String(rTxt.GetChar(i))) );
+ aConverted.Append(rCC.lowercase(rtl::OUString(rTxt.GetChar(i))));
else
// This is not an alphabetic letter. Leave it as-is.
aConverted.Append(rTxt.GetChar(i));
@@ -1147,13 +1148,13 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
- String sChg( cInsChar );
+ rtl::OUString sChg( cInsChar );
if( bIns )
rDoc.Insert( nInsPos, sChg );
else
rDoc.Replace( nInsPos, sChg );
- sChg = cRet;
+ sChg = rtl::OUString(cRet);
if( '\"' == cInsChar )
{
@@ -1167,7 +1168,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
case LANGUAGE_FRENCH_SWISS:
case LANGUAGE_FRENCH_LUXEMBOURG:
{
- String s( static_cast< sal_Unicode >(0xA0) );
+ rtl::OUString s( static_cast< sal_Unicode >(0xA0) );
// UNICODE code for no break space
if( rDoc.Insert( bSttQuote ? nInsPos+1 : nInsPos, s ))
{
@@ -1188,7 +1189,7 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
- String sRet( cRet );
+ String sRet = rtl::OUString(cRet);
if( '\"' == cInsChar )
{
@@ -1250,9 +1251,9 @@ sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
}
if( bInsert )
- rDoc.Insert( nInsPos, cChar );
+ rDoc.Insert( nInsPos, rtl::OUString(cChar) );
else
- rDoc.Replace( nInsPos, cChar );
+ rDoc.Replace( nInsPos, rtl::OUString(cChar) );
// Hardspaces autocorrection
if ( IsAutoCorrFlag( AddNonBrkSpace ) )
@@ -1846,7 +1847,7 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
{
- String sAbk( '~' );
+ String sAbk(rtl::OUString('~'));
sal_uInt16 nPos;
pList->Seek_Entry( &sAbk, &nPos );
if( nPos < pList->Count() )
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 7247c63..5e209a3 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -666,7 +666,7 @@ XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara
{
DBG_CHKTHIS(Outliner,0);
if ( !aCalcFieldValueHdl.IsSet() )
- return String( ' ' );
+ return rtl::OUString( ' ' );
EditFieldInfo aFldInfo( this, rField, nPara, nPos );
// The FldColor is preset with COL_LIGHTGRAY.
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 59bf016..bbe42e0 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1721,7 +1721,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
{
case text::ControlCharacter::PARAGRAPH_BREAK:
{
- const String aText( (sal_Unicode)13 ); // '\r' does not work on Mac
+ const rtl::OUString aText( (sal_Unicode)13 ); // '\r' does not work on Mac
insertString( xRange, aText, bAbsorb );
return;
@@ -1772,7 +1772,7 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text
aRange.nEndPos = aRange.nStartPos;
pRange->SetSelection( aRange );
- const String aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht
+ const rtl::OUString aText( (sal_Unicode)13 ); // '\r' geht auf'm Mac nicht
pRange->setString( aText );
aRange.nStartPos = 0;
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index e8b19fd..5fefcf4 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -437,8 +437,8 @@ namespace pcr
String sErrorMessage;
{
::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG );
- sErrorMessage = String( PcrRes( STR_ERROR_RETRIEVING_COLUMNS) );
- sErrorMessage.SearchAndReplace('#',sCommand);
+ sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString();
+ sErrorMessage.SearchAndReplace(rtl::OUString('#'), sCommand);
}
SQLContext aContext;
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index dfc7edf..0bff4ba 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -563,7 +563,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
if( nLen > 1 )
{
- aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rText.GetChar( (sal_uInt16) nLen - 1 ) );
+ aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar((sal_uInt16) nLen - 1)) );
if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
{
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 9377efc..70a621e 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -467,7 +467,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
// let the virtual device convert the character to polygons
PolyPolygon aPolyPoly;
- pVDev->GetTextOutline( aPolyPoly, nChar );
+ pVDev->GetTextOutline( aPolyPoly, rtl::OUString(nChar) );
maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) );
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 3d2ce16..64ba6ed 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -1926,7 +1926,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
aPt2 = aPolyDummy.GetPoint( 0 );
}
}
- METChrStr( aPt2, String( aStr.GetChar( i ) ) );
+ METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) );
}
}
else
@@ -1980,7 +1980,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
aPt2 = aPolyDummy.GetPoint( 0 );
}
}
- METChrStr( aPt2, String( aStr.GetChar( i ) ) );
+ METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) );
}
delete[] pDXAry;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 9db541c..7646ed2 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -1357,7 +1357,7 @@ void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal
if ( i > 0 )
aPt.X() += pDXAry[ i - 1 ];
- WriteOpcode_Text( aPt, String( c ), bDelta );
+ WriteOpcode_Text( aPt, rtl::OUString( c ), bDelta );
bDelta = sal_True;
}
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 8e2c2aa..ec33629 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2046,7 +2046,7 @@ void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDe
{
if ( i > 0 )
nx = pDXArry[ i - 1 ];
- ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rString[i] ) );
+ ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rtl::OUString(rString[i]) ) );
ImplWriteDouble( nx );
ImplWriteLine( "(", PS_NONE );
ImplWriteCharacter( rString[i] );
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index f6f9b15..999da17 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -447,7 +447,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
if( mbIsRangeChecked )
{
aRet[ nLength - nElementAdded ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) );
- aRet[ nLength - nElementAdded ].Value <<= OUString( msPageRange );
+ aRet[ nLength - nElementAdded ].Value <<= msPageRange;
nElementAdded--;
}
else if( mbSelectionIsChecked )
@@ -689,7 +689,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
if( maRbRange.IsChecked() )
{
paParent->mbIsRangeChecked = sal_True;
- paParent->msPageRange = String( maEdPages.GetText() ); //FIXME all right on other languages ?
+ paParent->msPageRange = maEdPages.GetText(); //FIXME all right on other languages ?
}
else if( maRbSelection.IsChecked() )
{
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 45747fd..8c468b1 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -141,7 +141,7 @@ protected:
com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords;
sal_Bool mbIsRangeChecked;
- String msPageRange;
+ rtl::OUString msPageRange;
sal_Bool mbSelectionIsChecked;
sal_Bool mbExportRelativeFsysLinks;
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index eef0e6f..3c2de0f 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -281,7 +281,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& r
mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", rCellStr );
if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 )
- aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( sal_Unicode( ' ' ) ), 0 ) );
+ aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( rtl::OUString(' ') ), 0 ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aBoundRect.GetWidth() ) );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a74e175..1e2a2c0 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1195,7 +1195,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
{
if( nLen > 1 )
{
- aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rText.GetChar( nLen - 1 ) );
+ aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar(nLen - 1)) );
if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
{
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index e2e3059..0a3d9af 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -670,9 +670,9 @@ void FormulaCompiler::InitSymbolsEnglishXL() const
// TODO: For now, just replace the separators to the Excel English
// variants. Later, if we want to properly map Excel functions with Calc
// functions, we'll need to do a little more work here.
- mxSymbolsEnglishXL->putOpCode(sal_Unicode(','), ocSep);
- mxSymbolsEnglishXL->putOpCode(sal_Unicode(','), ocArrayColSep);
- mxSymbolsEnglishXL->putOpCode(sal_Unicode(';'), ocArrayRowSep);
+ mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocSep);
+ mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocArrayColSep);
+ mxSymbolsEnglishXL->putOpCode(rtl::OUString(';'), ocArrayRowSep);
}
// -----------------------------------------------------------------------------
@@ -1766,7 +1766,7 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
else
{
String aStr( rStr );
- aStr.SearchAndReplaceAll( '"', String( RTL_CONSTASCII_USTRINGPARAM( "\"\"")));
+ aStr.SearchAndReplaceAll( rtl::OUString('"'), rtl::OUString("\"\"") );
rBuffer.append(aStr);
}
rBuffer.append(sal_Unicode('"'));
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index b32f64d..26473c0 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -937,7 +937,7 @@ void FormulaDlg_Impl::ClearAllParas()
}
String FormulaDlg_Impl::RepairFormula(const String& aFormula)
{
- String aResult('=');
+ rtl::OUString aResult('=');
try
{
UpdateTokenArray(aFormula);
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 78f8fe8..1354084 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1128,7 +1128,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
&& pThis->_pImp->_pCbAutoExtension // auto extension is enabled in general
&& pThis->_pImp->_pCbAutoExtension->IsChecked() // auto extension is really to be used
&& pThis->GetDefaultExt().Len() // there is a default extension
- && pThis->GetDefaultExt() != '*' // the default extension is not "all"
+ && !comphelper::string::equals(pThis->GetDefaultExt(), '*') // the default extension is not "all"
&& !( FILEDLG_MODE_SAVE == pThis->_pImp->_eMode // we're saving a file
&& pThis->_pFileView->GetSelectionCount() // there is a selected file in the file view -> it will later on
) // (in SvtFileDialog::GetPathList) be taken as file to save to
@@ -2568,7 +2568,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilt
if ( nPathTokenPos == STRING_NOTFOUND )
{
- String aDelim(
+ rtl::OUString aDelim(
#if defined(WNT)
'\\'
#else
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index cc0efe8..0309f3a 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -316,10 +316,11 @@ void SvtExpFileDlg_Impl::SetStandardDir( const String& _rDir )
namespace {
String lcl_DecoratedFilter( const String& _rOriginalFilter )
{
- String aDecoratedFilter = '<';
- aDecoratedFilter += _rOriginalFilter;
- aDecoratedFilter += '>';
- return aDecoratedFilter;
+ rtl::OUStringBuffer aDecoratedFilter;
+ aDecoratedFilter.append('<');
+ aDecoratedFilter.append(_rOriginalFilter);
+ aDecoratedFilter.append('>');
+ return aDecoratedFilter.makeStringAndClear();
}
}
#endif
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index eb278b7..d986f47 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -401,9 +401,9 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
rtl::OUString ORptUndoPropertyAction::GetComment() const
{
- String aStr(ModuleRes(RID_STR_UNDO_PROPERTY));
+ String aStr(ModuleRes(RID_STR_UNDO_PROPERTY).toString());
- aStr.SearchAndReplace( '#', m_aPropertyName );
+ aStr.SearchAndReplace(rtl::OUString('#'), m_aPropertyName);
return aStr;
}
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 91f122d..9f3ce57 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -300,7 +300,7 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1
m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper);
::rtl::OUString sFamily( GetXMLToken(XML_PARAGRAPH) );
- ::rtl::OUString aPrefix( String( 'P' ) );
+ ::rtl::OUString aPrefix( 'P');
GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily,
m_xParaPropMapper, aPrefix );
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 49c21d3..1633f61 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -366,7 +366,7 @@ void OFieldExpressionControl::lateInit()
aFont.SetWeight( WEIGHT_LIGHT );
SetFont(aFont);
- InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth('0') * 4)/*, sal_True */);
+ InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */);
InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100);
m_pComboCell = new ComboBoxControl( &GetDataWindow() );
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index cadea38..5b6c0ad 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -195,8 +195,8 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>&
sExpression = sLabel;
}
- String sTitle = String(ModuleRes(_nResId));
- sTitle.SearchAndReplace('#',sExpression);
+ String sTitle = ModuleRes(_nResId).toString();
+ sTitle.SearchAndReplace(rtl::OUString('#') ,sExpression);
m_aStartMarker.setTitle(sTitle);
m_aStartMarker.Invalidate(INVALIDATE_CHILDREN);
}
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 0c51238..e2f2c55 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -135,12 +135,13 @@ ScMergeAttr::~ScMergeAttr()
String ScMergeAttr::GetValueText() const
{
- String aString( '(' );
- aString += String::CreateFromInt32( nColMerge );
- aString += ',';
- aString += String::CreateFromInt32( nRowMerge );
- aString += ')';
- return aString;
+ rtl::OUStringBuffer aString;
+ aString.append('(');
+ aString.append(static_cast<sal_Int32>(nColMerge));
+ aString.append(',');
+ aString.append(static_cast<sal_Int32>(nRowMerge));
+ aString.append(')');
+ return aString.makeStringAndClear();
}
//------------------------------------------------------------------------
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 011d2e0..08310e7 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -822,7 +822,7 @@ void ScGlobal::AddQuotes( String& rString, sal_Unicode cQuote, bool bEscapeEmbed
pQ[0] = pQ[1] = cQuote;
pQ[2] = 0;
rtl::OUString aQuotes( pQ );
- rString.SearchAndReplaceAll( cQuote, aQuotes);
+ rString.SearchAndReplaceAll( rtl::OUString(cQuote), aQuotes);
}
rString.Insert( cQuote, 0 ).Append( cQuote );
}
@@ -838,7 +838,7 @@ void ScGlobal::EraseQuotes( String& rString, sal_Unicode cQuote, bool bUnescapeE
pQ[0] = pQ[1] = cQuote;
pQ[2] = 0;
rtl::OUString aQuotes( pQ );
- rString.SearchAndReplaceAll( aQuotes, cQuote);
+ rString.SearchAndReplaceAll( aQuotes, rtl::OUString(cQuote));
}
}
}
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 6fc2e4c..e180538 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -387,7 +387,7 @@ String ScGlobal::GetAbsDocName( const String& rFileName,
String ScGlobal::GetDocTabName( const String& rFileName,
const String& rTabName )
{
- String aDocTab( '\'' );
+ String aDocTab(rtl::OUString('\''));
aDocTab += rFileName;
xub_StrLen nPos = 1;
while( (nPos = aDocTab.Search( '\'', nPos ))
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 09ef436..fcafa58 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -94,7 +94,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDi
xub_StrLen nNum = 0;
if ( p[nNum] == '-' )
nNum = nNeg = 1;
- while ( p[nNum] && CharClass::isAsciiNumeric( p[nNum] ) )
+ while ( p[nNum] && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) )
nNum++;
sal_Unicode cNext = p[nNum]; // 0 if at the end
@@ -103,7 +103,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDi
// #i5550# If there are numbers at the beginning and the end,
// prefer the one at the beginning only if it's followed by a space.
// Otherwise, use the number at the end, to enable things like IP addresses.
- if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(cLast) ) )
+ if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(rtl::OUString(cLast)) ) )
{ // number at the beginning
nVal = aValue.Copy( 0, nNum ).ToInt32();
// any number with a leading zero sets the minimum number of digits
@@ -116,7 +116,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, sal_uInt16* pMinDi
{
nNeg = 0;
xub_StrLen nEnd = nNum = aValue.Len() - 1;
- while ( nNum && CharClass::isAsciiNumeric( p[nNum] ) )
+ while ( nNum && CharClass::isAsciiNumeric( rtl::OUString(p[nNum]) ) )
nNum--;
if ( p[nNum] == '-' )
{
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6a3aa14..a9f6e43 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2790,7 +2790,7 @@ bool ScCompiler::IsReference( const String& rName )
if ( ch1 == cDecSep )
return false;
// Who was that imbecile introducing '.' as the sheet name separator!?!
- if ( CharClass::isAsciiNumeric( ch1 ) )
+ if ( CharClass::isAsciiNumeric( rtl::OUString(ch1) ) )
{
// Numerical sheet name is valid.
// But English 1.E2 or 1.E+2 is value 100, 1.E-2 is 0.01
@@ -3492,7 +3492,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
String aOld( aRef[j] );
String aStr2;
const sal_Unicode* p = aRef[j].GetBuffer();
- while ( *p && CharClass::isAsciiNumeric( *p ) )
+ while ( *p && CharClass::isAsciiNumeric( rtl::OUString(*p) ) )
aStr2 += *p++;
aRef[j] = rtl::OUString( p );
aRef[j] += aStr2;
@@ -3604,7 +3604,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
}
else
{
- String aTmpStr( cSymbol[0] );
+ rtl::OUString aTmpStr( cSymbol[0] );
bMayBeFuncName = ScGlobal::pCharClass->isLetter( aTmpStr, 0 );
bAsciiNonAlnum = false;
}
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index eae3d24..be65253 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -591,7 +591,7 @@ String lcl_GetCharStr( sal_Int32 nNo )
String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType )
{
- String aTmpStr( '0' );
+ String aTmpStr(rtl::OUString('0'));
if( nNo )
{
switch( eType )
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 58e3cbd..15c1c89 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2336,7 +2336,7 @@ void ScInterpreter::ScCell()
// font color doesn't matter here
pDok->GetDefPattern()->GetFont( aDefFont, SC_AUTOCOL_BLACK, pPrinter );
pPrinter->SetFont( aDefFont );
- long nZeroWidth = pPrinter->GetTextWidth( String( '0' ) );
+ long nZeroWidth = pPrinter->GetTextWidth( rtl::OUString( '0' ) );
pPrinter->SetFont( aOldFont );
pPrinter->SetMapMode( aOldMode );
int nZeroCount = (int)(pDok->GetColWidth( aCellPos.Col(), aCellPos.Tab() ) / nZeroWidth);
@@ -3007,11 +3007,10 @@ void ScInterpreter::ScPropper()
const sal_Unicode* pUpr = aUpr.GetBuffer();
const sal_Unicode* pLwr = aLwr.GetBuffer();
*pStr = *pUpr;
- String aTmpStr( 'x' );
xub_StrLen nPos = 1;
while( nPos < nLen )
{
- aTmpStr.SetChar( 0, pStr[nPos-1] );
+ rtl::OUString aTmpStr( pStr[nPos-1] );
if ( !ScGlobal::pCharClass->isLetter( aTmpStr, 0 ) )
pStr[nPos] = pUpr[nPos];
else
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index d5ea624..9888f5a 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1152,9 +1152,9 @@ void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet, bool bShowSe
::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWBUBBLE, bShowBubble );
// label value separator
- rPropSet.GetStringProperty( maData.maSeparator, EXC_CHPROP_LABELSEPARATOR );
- if( maData.maSeparator.Len() == 0 )
- maData.maSeparator = String( sal_Unicode( ' ' ) );
+ maData.maSeparator = rPropSet.GetStringProperty( EXC_CHPROP_LABELSEPARATOR );
+ if( maData.maSeparator.isEmpty() )
+ maData.maSeparator = rtl::OUString(' ');
}
void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 101eb6a..bc7445b 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1264,7 +1264,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
String aToken( aString.GetToken( 0, '\n', nStringIx ) );
if( nToken > 0 )
{
- mxString1->Append( '\0' );
+ mxString1->Append(rtl::OUString(static_cast<sal_Unicode>('\0')));
sFormulaBuf.append( (sal_Unicode) ',' );
}
mxString1->Append( aToken );
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 62490f5..b2a68d4 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -564,7 +564,7 @@ void XclExpStringHelper::AppendString( XclExpString& rXclString, const XclExpRoo
void XclExpStringHelper::AppendChar( XclExpString& rXclString, const XclExpRoot& rRoot, sal_Unicode cChar )
{
if( rRoot.GetBiff() == EXC_BIFF8 )
- rXclString.Append( cChar );
+ rXclString.Append( rtl::OUString(cChar) );
else
rXclString.AppendByte( cChar, rRoot.GetTextEncoding() );
}
@@ -863,7 +863,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
else
{
String aPortionText( mrEE.GetText( aSel ) );
- aPortionText.SearchAndReplaceAll( String( '&' ), String( RTL_CONSTASCII_USTRINGPARAM( "&&" ) ) );
+ aPortionText.SearchAndReplaceAll( rtl::OUString('&'), rtl::OUString("&&") );
// #i17440# space between font height and numbers in text
if( bFontHtChanged && aParaText.Len() && aPortionText.Len() )
{
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 882f8dc..e75f626 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1333,14 +1333,14 @@ void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm )
XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, sal_Unicode cCode ) :
XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET )
{
- Init( String( cCode ) );
+ Init( rtl::OUString(cCode) );
}
XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, const String& rTabName ) :
XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET )
{
// reference to own sheet: \03<sheetname>
- Init( String( EXC_EXTSH_TABNAME ).Append( rTabName ) );
+ Init(rtl::OUString(EXC_EXTSH_TABNAME) + rTabName);
}
void XclExpExternSheet::Save( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 6331865..01384ad 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1119,7 +1119,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
// create API struct for label values, set API label separator
cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol );
rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel );
- String aSep = mxLabelProps ? mxLabelProps->maSeparator : String( sal_Unicode( '\n' ) );
+ String aSep = mxLabelProps ? mxLabelProps->maSeparator : rtl::OUString('\n');
if( aSep.Len() == 0 )
aSep = CREATE_STRING( "; " );
rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index a6bb268..424b91b 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -358,7 +358,7 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl)
// the 1st character must be '#'.
return;
- String aNewUrl(sal_Unicode('#')), aTabName;
+ String aNewUrl(rtl::OUString('#')), aTabName;
bool bInQuote = false;
bool bQuoteTabName = false;
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 7b9846b..034a727 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -560,7 +560,7 @@ void XclImpHFConverter::InsertField( const SvxFieldItem& rFieldItem )
void XclImpHFConverter::InsertLineBreak()
{
ESelection& rSel = GetCurrSel();
- mrEE.QuickInsertText( String( '\n' ), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) );
+ mrEE.QuickInsertText( rtl::OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) );
++rSel.nEndPara;
rSel.nEndPos = 0;
GetCurrInfo().mnHeight += GetCurrMaxLineHeight();
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index a3168c6..66b5e33 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -225,7 +225,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
aFont.SetCharSet( rFontData.GetFontEncoding() );
aFont.SetWeight( rFontData.GetScWeight() );
pPrinter->SetFont( aFont );
- mrData.mnCharWidth = pPrinter->GetTextWidth( String( '0' ) );
+ mrData.mnCharWidth = pPrinter->GetTextWidth( rtl::OUString('0') );
}
if( mrData.mnCharWidth <= 0 )
{
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 0e3d73f..616365c 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -205,12 +205,11 @@ bool ScfPropertySet::GetBoolProperty( const ::rtl::OUString& rPropName ) const
return GetAnyProperty( aAny, rPropName ) && ScUnoHelpFunctions::GetBoolFromAny( aAny );
}
-bool ScfPropertySet::GetStringProperty( String& rValue, const OUString& rPropName ) const
+OUString ScfPropertySet::GetStringProperty( const OUString& rPropName ) const
{
OUString aOUString;
- bool bRet = GetProperty( aOUString, rPropName );
- rValue = aOUString;
- return bRet;
+ GetProperty( aOUString, rPropName );
+ return aOUString;
}
bool ScfPropertySet::GetColorProperty( Color& rColor, const ::rtl::OUString& rPropName ) const
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index f34b9b1..bf308ad 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -178,9 +178,8 @@ public:
@return true = property contains true; false = property contains false or error occurred. */
bool GetBoolProperty( const ::rtl::OUString& rPropName ) const;
- /** Gets the specified Boolean property from the property set.
- @return true, if the passed Boolean variable could be filled with the property value. */
- bool GetStringProperty( String& rValue, const ::rtl::OUString& rPropName ) const;
+ /** Gets the specified Boolean property from the property set. */
+ rtl::OUString GetStringProperty( const ::rtl::OUString& rPropName ) const;
/** Gets the specified color property from the property set.
@return true, if the passed color variable could be filled with the property value. */
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 8b3cda9..14fbb1f 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -889,7 +889,7 @@ struct XclChObjectLink
struct XclChFrLabelProps
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list