[Libreoffice-commits] .: 9 commits - basctl/source basic/source connectivity/inc connectivity/source cppu/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/source idl/source lingucomponent/source linguistic/source lotuswordpro/source oox/source padmin/source reportdesign/source sc/source sd/source sfx2/inc sfx2/source sot/source starmath/source svl/inc svl/source svtools/bmpmaker svtools/source svx/source sw/inc sw/source tools/source unotools/source unusedcode.easy uui/source vcl/headless vcl/source writerfilter/source xmlsecurity/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jul 3 13:26:00 PDT 2012
basctl/source/basicide/basobj2.cxx | 14 -
basctl/source/basicide/iderdll.cxx | 2
basctl/source/basicide/macrodlg.cxx | 6
basctl/source/basicide/moduldl2.cxx | 2
basic/source/basmgr/basmgr.cxx | 36 ++--
basic/source/classes/image.cxx | 2
basic/source/classes/sb.cxx | 16 -
basic/source/comp/parser.cxx | 6
basic/source/runtime/ddectrl.cxx | 2
basic/source/runtime/methods.cxx | 12 -
basic/source/runtime/methods1.cxx | 2
basic/source/runtime/sbdiagnose.cxx | 2
basic/source/runtime/stdobj.cxx | 6
basic/source/sbx/sbxcoll.cxx | 16 -
basic/source/sbx/sbxobj.cxx | 8
connectivity/inc/connectivity/sqlerror.hxx | 14 -
connectivity/source/commontools/sqlerror.cxx | 6
connectivity/source/drivers/dbase/DConnection.cxx | 2
connectivity/source/drivers/dbase/DIndex.cxx | 4
connectivity/source/drivers/dbase/DTable.cxx | 14 -
cppu/source/uno/env_subst.cxx | 5
cui/source/customize/acccfg.cxx | 4
cui/source/customize/cfgutil.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 2
cui/source/dialogs/cuiimapwnd.cxx | 2
cui/source/dialogs/hlinettp.cxx | 6
cui/source/dialogs/hlmailtp.cxx | 6
cui/source/dialogs/hltpbase.cxx | 10 -
cui/source/dialogs/multifil.cxx | 2
cui/source/dialogs/plfilter.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 17 --
cui/source/dialogs/thesdlg.cxx | 4
cui/source/options/doclinkdialog.cxx | 5
cui/source/options/fontsubs.cxx | 4
cui/source/options/optgdlg.cxx | 6
cui/source/options/optinet2.cxx | 2
cui/source/options/optjava.cxx | 2
cui/source/options/optlingu.cxx | 2
cui/source/options/optpath.cxx | 2
cui/source/options/treeopt.cxx | 16 -
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/macroass.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 10 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 6
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/admincontrols.cxx | 2
dbaccess/source/ui/dlg/dbadmin.cxx | 42 ++---
dbaccess/source/ui/dlg/dbfindex.cxx | 4
dbaccess/source/ui/dlg/directsql.cxx | 8
dbaccess/source/ui/dlg/generalpage.cxx | 2
dbaccess/source/ui/dlg/paramdialog.cxx | 2
dbaccess/source/ui/misc/UITools.cxx | 7
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 6
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 10 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
desktop/source/app/app.cxx | 1
desktop/source/app/dispatchwatcher.cxx | 8
editeng/source/items/paraitem.cxx | 4
editeng/source/misc/acorrcfg.cxx | 2
extensions/source/abpilot/abpfinalpage.cxx | 3
extensions/source/bibliography/datman.cxx | 9 -
extensions/source/dbpilots/commonpagesdbp.cxx | 3
extensions/source/propctrlr/browserline.cxx | 2
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/fontdialog.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 5
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/propctrlr/usercontrol.cxx | 2
extensions/source/scanner/sane.cxx | 2
extensions/source/scanner/sanedlg.cxx | 2
filter/source/graphicfilter/icgm/actimpr.cxx | 6
filter/source/msfilter/msdffimp.cxx | 4
filter/source/msfilter/msoleexp.cxx | 2
forms/source/richtext/richtextvclcontrol.cxx | 4
forms/source/solar/control/navtoolbar.cxx | 8
forms/source/xforms/binding.cxx | 2
formula/source/core/api/FormulaCompiler.cxx | 12 -
fpicker/source/office/iodlgimp.cxx | 2
framework/source/fwe/classes/addonmenu.cxx | 6
framework/source/services/license.cxx | 2
framework/source/uiconfiguration/imagemanagerimpl.cxx | 7
framework/source/uielement/macrosmenucontroller.cxx | 12 -
framework/source/uielement/menubarmanager.cxx | 4
idl/source/objects/bastype.cxx | 2
idl/source/objects/module.cxx | 8
idl/source/prj/command.cxx | 8
idl/source/prj/database.cxx | 2
lingucomponent/source/lingutil/lingutil.cxx | 6
linguistic/source/dicimp.cxx | 9 -
linguistic/source/dicimp.hxx | 3
linguistic/source/dlistimp.cxx | 12 -
linguistic/source/lngsvcmgr.cxx | 8
lotuswordpro/source/filter/lwpnumericfmt.cxx | 12 -
lotuswordpro/source/filter/lwpnumericfmt.hxx | 80 ++++-----
lotuswordpro/source/filter/lwptblformula.cxx | 44 ++---
lotuswordpro/source/filter/lwptoc.cxx | 2
oox/source/export/chartexport.cxx | 2
padmin/source/adddlg.cxx | 12 -
padmin/source/padialog.cxx | 2
padmin/source/pamain.cxx | 2
padmin/source/prtsetup.cxx | 2
reportdesign/source/core/api/ReportEngineJFree.cxx | 2
reportdesign/source/ui/dlg/Formula.cxx | 4
reportdesign/source/ui/dlg/GroupExchange.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 2
reportdesign/source/ui/report/DesignView.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 8
reportdesign/source/ui/report/dlgedclip.cxx | 2
sc/source/core/data/dptabres.cxx | 12 -
sc/source/core/data/global.cxx | 2
sc/source/core/tool/addincol.cxx | 2
sc/source/core/tool/cellkeytranslator.cxx | 10 -
sc/source/core/tool/compiler.cxx | 16 -
sc/source/core/tool/defaultsoptions.cxx | 2
sc/source/core/tool/formulaopt.cxx | 2
sc/source/core/tool/printopt.cxx | 2
sc/source/filter/excel/xechart.cxx | 2
sc/source/filter/html/htmlpars.cxx | 8
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 4
sc/source/ui/dbgui/asciiopt.cxx | 4
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/docsh.cxx | 14 -
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/docshell/docsh8.cxx | 2
sc/source/ui/docshell/tablink.cxx | 2
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/miscdlgs/linkarea.cxx | 2
sc/source/ui/unoobj/scdetect.cxx | 28 +--
sc/source/ui/unoobj/styleuno.cxx | 14 -
sc/source/ui/vba/excelvbahelper.cxx | 2
sc/source/ui/vba/vbanames.cxx | 4
sc/source/ui/view/viewfun4.cxx | 2
sd/source/core/drawdoc3.cxx | 4
sd/source/ui/dlg/dlgass.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/docshell/docshel2.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 4
sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx | 2
sd/source/ui/slidesorter/controller/SlsListener.cxx | 8
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 10 -
sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx | 2
sd/source/ui/view/ViewShellBase.cxx | 2
sfx2/inc/sfx2/docfac.hxx | 2
sfx2/inc/sfx2/docfilt.hxx | 16 -
sfx2/inc/sfx2/filedlghelper.hxx | 2
sfx2/inc/sfx2/frmhtmlw.hxx | 2
sfx2/source/appl/appbas.cxx | 2
sfx2/source/appl/appcfg.cxx | 5
sfx2/source/appl/appopen.cxx | 22 +-
sfx2/source/appl/appserv.cxx | 11 -
sfx2/source/appl/appuno.cxx | 12 -
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 10 -
sfx2/source/bastyp/frmhtmlw.cxx | 2
sfx2/source/bastyp/helper.cxx | 2
sfx2/source/control/request.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 14 -
sfx2/source/dialog/filedlgimpl.hxx | 2
sfx2/source/dialog/passwd.cxx | 2
sfx2/source/dialog/printopt.cxx | 2
sfx2/source/dialog/splitwin.cxx | 4
sfx2/source/dialog/taskpane.cxx | 4
sfx2/source/doc/docfac.cxx | 6
sfx2/source/doc/docfile.cxx | 2
sfx2/source/doc/docfilt.cxx | 4
sfx2/source/doc/docvor.cxx | 2
sfx2/source/doc/objcont.cxx | 2
sfx2/source/doc/objserv.cxx | 4
sfx2/source/doc/objstor.cxx | 2
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/menu/mnumgr.cxx | 2
sfx2/source/notify/eventsupplier.cxx | 4
sfx2/source/view/viewfac.cxx | 4
sfx2/source/view/viewfrm.cxx | 4
sfx2/source/view/viewfrm2.cxx | 8
sfx2/source/view/viewsh.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 14 -
starmath/source/cfgitem.cxx | 4
starmath/source/eqnolefilehdr.cxx | 2
starmath/source/format.cxx | 2
starmath/source/mathtype.cxx | 2
starmath/source/smdetect.cxx | 10 -
starmath/source/smdll.cxx | 2
svl/inc/svl/inettype.hxx | 2
svl/source/misc/inettype.cxx | 15 -
svtools/bmpmaker/bmpcore.cxx | 2
svtools/source/contnr/fileview.cxx | 8
svtools/source/contnr/svtreebx.cxx | 2
svtools/source/control/fmtfield.cxx | 2
svtools/source/control/inettbc.cxx | 16 -
svtools/source/control/roadmap.cxx | 4
svtools/source/dialogs/addresstemplate.cxx | 6
svtools/source/dialogs/wizardmachine.cxx | 2
svtools/source/filter/wmf/enhwmf.cxx | 2
svtools/source/misc/ehdl.cxx | 25 +-
svtools/source/misc/imagemgr.cxx | 2
svx/source/dialog/_contdlg.cxx | 8
svx/source/dialog/imapwnd.cxx | 6
svx/source/dialog/optgrid.cxx | 2
svx/source/dialog/pagectrl.cxx | 2
svx/source/dialog/rubydialog.cxx | 2
svx/source/dialog/swframeexample.cxx | 8
svx/source/fmcomp/dbaexchange.cxx | 8
svx/source/fmcomp/dbaobjectex.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 4
svx/source/fmcomp/xmlexchg.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/form/filtnav.cxx | 2
svx/source/form/fmexch.cxx | 6
svx/source/form/fmshell.cxx | 2
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/fmvwimp.cxx | 2
svx/source/tbxctrls/fillctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 4
svx/source/tbxctrls/itemwin.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 7
sw/inc/format.hxx | 3
sw/source/core/access/acctable.cxx | 4
sw/source/core/doc/docnew.cxx | 6
sw/source/core/doc/docnum.cxx | 4
sw/source/core/doc/number.cxx | 6
sw/source/core/docnode/ndtbl.cxx | 3
sw/source/core/docnode/section.cxx | 11 -
sw/source/core/edit/edglss.cxx | 5
sw/source/core/fields/docufld.cxx | 12 -
sw/source/core/fields/expfld.cxx | 5
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/text/portxt.cxx | 8
sw/source/core/tox/tox.cxx | 4
sw/source/core/txtnode/ndtxt.cxx | 7
sw/source/core/txtnode/swfont.cxx | 8
sw/source/core/unocore/unochart.cxx | 4
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unorefmk.cxx | 20 +-
sw/source/core/unocore/unotbl.cxx | 8
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/basflt/iodetect.cxx | 38 ++--
sw/source/filter/html/css1atr.cxx | 4
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlbas.cxx | 3
sw/source/filter/html/htmlcss1.cxx | 12 -
sw/source/filter/html/htmlfly.cxx | 6
sw/source/filter/html/htmlftn.cxx | 6
sw/source/filter/html/htmlplug.cxx | 2
sw/source/filter/html/wrthtml.cxx | 2
sw/source/filter/rtf/swparrtf.cxx | 8
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 12 -
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 8
sw/source/ui/app/apphdl.cxx | 2
sw/source/ui/app/applab.cxx | 6
sw/source/ui/app/docsh.cxx | 25 +-
sw/source/ui/app/docsh2.cxx | 18 +-
sw/source/ui/app/docstyle.cxx | 6
sw/source/ui/app/swdll.cxx | 6
sw/source/ui/app/swmodule.cxx | 2
sw/source/ui/cctrl/actctrl.cxx | 2
sw/source/ui/config/caption.cxx | 2
sw/source/ui/config/optcomp.cxx | 23 +-
sw/source/ui/config/optload.cxx | 2
sw/source/ui/config/optpage.cxx | 22 +-
sw/source/ui/config/uinums.cxx | 2
sw/source/ui/config/viewopt.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/createaddresslistdialog.cxx | 4
sw/source/ui/dbui/dbinsdlg.cxx | 8
sw/source/ui/dbui/dbmgr.cxx | 9 -
sw/source/ui/dbui/dbui.cxx | 6
sw/source/ui/dbui/mailmergehelper.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 10 -
sw/source/ui/dbui/mmconfigitem.cxx | 2
sw/source/ui/dbui/mmdocselectpage.cxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 8
sw/source/ui/dbui/mmmergepage.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 21 +-
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 5
sw/source/ui/dialog/ascfldlg.cxx | 10 -
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/dochdl/gloshdl.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/mailmrge.cxx | 4
sw/source/ui/fldui/fldedt.cxx | 2
sw/source/ui/fldui/fldpage.cxx | 4
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/ui/fldui/javaedit.cxx | 2
sw/source/ui/frmdlg/cption.cxx | 6
sw/source/ui/inc/actctrl.hxx | 2
sw/source/ui/index/cntex.cxx | 2
sw/source/ui/index/cnttab.cxx | 10 -
sw/source/ui/lingu/olmenu.cxx | 6
sw/source/ui/misc/bookmark.cxx | 2
sw/source/ui/misc/glossary.cxx | 5
sw/source/ui/misc/linenum.cxx | 8
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/pggrid.cxx | 6
sw/source/ui/misc/redlndlg.cxx | 2
sw/source/ui/ribbar/inputwin.cxx | 2
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/beziersh.cxx | 2
sw/source/ui/shells/drawsh.cxx | 2
sw/source/ui/shells/drformsh.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/shells/frmsh.cxx | 2
sw/source/ui/shells/grfsh.cxx | 2
sw/source/ui/shells/langhelper.cxx | 19 +-
sw/source/ui/shells/listsh.cxx | 2
sw/source/ui/shells/mediash.cxx | 2
sw/source/ui/shells/navsh.cxx | 2
sw/source/ui/shells/olesh.cxx | 2
sw/source/ui/shells/tabsh.cxx | 2
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 19 +-
sw/source/ui/uiview/pview.cxx | 2
sw/source/ui/uiview/srcview.cxx | 14 -
sw/source/ui/uiview/view.cxx | 2
sw/source/ui/uiview/view0.cxx | 2
sw/source/ui/uiview/view2.cxx | 2
sw/source/ui/uiview/viewprt.cxx | 2
sw/source/ui/uiview/viewsrch.cxx | 2
sw/source/ui/uno/swdet2.cxx | 9 -
sw/source/ui/uno/swdetect.cxx | 14 -
sw/source/ui/uno/unomailmerge.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 14 -
sw/source/ui/utlui/attrdesc.cxx | 4
sw/source/ui/utlui/content.cxx | 24 +-
sw/source/ui/utlui/glbltree.cxx | 4
sw/source/ui/utlui/initui.cxx | 8
sw/source/ui/utlui/navipi.cxx | 7
sw/source/ui/utlui/numfmtlb.cxx | 4
sw/source/ui/utlui/unotools.cxx | 8
sw/source/ui/web/wgrfsh.cxx | 2
sw/source/ui/web/wlistsh.cxx | 2
sw/source/ui/web/wolesh.cxx | 2
sw/source/ui/web/wtabsh.cxx | 2
tools/source/fsys/dirent.cxx | 84 +++++-----
tools/source/fsys/tempfile.cxx | 2
unotools/source/config/accelcfg.cxx | 2
unotools/source/config/lingucfg.cxx | 2
unotools/source/i18n/transliterationwrapper.cxx | 6
unotools/source/misc/fontcvt.cxx | 2
unotools/source/ucbhelper/tempfile.cxx | 6
unusedcode.easy | 3
uui/source/iahndl-ssl.cxx | 2
uui/source/secmacrowarnings.cxx | 4
vcl/headless/svptext.cxx | 6
vcl/source/app/dbggui.cxx | 2
vcl/source/control/button.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 6
writerfilter/source/dmapper/PropertyMapHelper.cxx | 14 +
writerfilter/source/dmapper/PropertyMapHelper.hxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 10 -
362 files changed, 1062 insertions(+), 1127 deletions(-)
New commits:
commit 871111155e302ecaf245003bcd8357e294f8b268
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 3 17:01:15 2012 +0100
Resolves: fdo#51693 use fontconfig font/glyph substitution in headless mode
Change-Id: Ie974be8ae6e9257d92ae4f96b53cb4810efef6d8
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 1eee27a..5399a4e 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -38,6 +38,7 @@
#include <impfont.hxx>
#include <rtl/instance.hxx>
+#include "generic/geninst.h"
#include "generic/genpspgraphics.h"
#include "generic/glyphcache.hxx"
#include "headless/svpgdi.hxx"
@@ -354,6 +355,11 @@ void SvpSalGraphics::GetDevFontList( ImplDevFontList* pDevFontList )
// announce glyphcache fonts
rGC.AnnounceFonts( pDevFontList );
+
+ // register platform specific font substitutions if available
+ SalGenericInstance::RegisterFontSubstitutors( pDevFontList );
+
+ ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
}
// ---------------------------------------------------------------------------
commit 64ca013084cd7d5027b8cc4cd888ca57ba1ec8b5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 3 17:35:12 2012 +0100
useless sObjectKind string
Change-Id: I6f8de91d71df1bb54f5d63d5b38f9422927c7441
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index dbfd558..b6510b6 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -435,15 +435,13 @@ namespace svx
return;
}
- String sObjectKind = (CommandType::TABLE == nObjectType) ? String('1') : String('0');
-
// check if the SQL-statement is modified
::rtl::OUString sCompleteStatement;
try
{
_rxLivingForm->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sCompleteStatement;
}
- catch(Exception&)
+ catch (const Exception&)
{
OSL_FAIL("ODataAccessObjectTransferable::ODataAccessObjectTransferable: could not collect essential form attributes (part two) !");
return;
commit a923bf4217a951ad48db8c9ba32225f4b6846279
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 3 12:21:15 2012 +0100
useless asal_TrueStr string
Change-Id: Icbca4d464aa3b8c0ee1b521b0e42cba2cb07af8d
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 307abf7..0cec85b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -164,7 +164,6 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
{
sal_Bool bRet = sal_False;
SfxItemPool &rPool = GetPool();
- String asal_TrueStr('1');
const sal_uInt16 *pRanges = rSet.GetRanges();
SvtSaveOptions aSaveOptions;
@@ -819,10 +818,10 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
DBG_ASSERT(pItem->ISA(SfxAllEnumItem), "AllEnumItem expected");
const SfxAllEnumItem* pEnumItem = (const SfxAllEnumItem *)pItem;
sal_uInt32 nCount = pEnumItem->GetValueCount();
- String aNoChangeStr( ' ' );
+ rtl::OUString aNoChangeStr( ' ' );
for( sal_uInt32 nPath=0; nPath<nCount; ++nPath )
{
- String sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath);
+ rtl::OUString sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath);
if ( sValue != aNoChangeStr )
{
switch( nPath )
commit 8d98e380a2309273c2d5c74cd6c9acffa44c9438
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 2 20:34:38 2012 +0100
fix broken indent
Change-Id: Ie11ad33f1d61d4abd1d40eaeda714993c3e2b295
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index e008261..3b6e9cd 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1590,52 +1590,52 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
strcat(ret_val,ext);
- if ( FSYS_KIND_FILE == eKind )
+ if ( FSYS_KIND_FILE == eKind )
+ {
+ SvFileStream aStream( String( ret_val, osl_getThreadTextEncoding()),
+ STREAM_WRITE|STREAM_SHARE_DENYALL );
+ if ( aStream.IsOpen() )
+ {
+ aStream.Seek( STREAM_SEEK_TO_END );
+ if ( 0 == aStream.Tell() )
{
- SvFileStream aStream( String( ret_val, osl_getThreadTextEncoding()),
- STREAM_WRITE|STREAM_SHARE_DENYALL );
- if ( aStream.IsOpen() )
- {
- aStream.Seek( STREAM_SEEK_TO_END );
- if ( 0 == aStream.Tell() )
- {
- aRet = DirEntry( String( ret_val, osl_getThreadTextEncoding()));
- break;
- }
- aStream.Close();
- }
+ aRet = DirEntry( String( ret_val, osl_getThreadTextEncoding()));
+ break;
}
- else
+ aStream.Close();
+ }
+ }
+ else
+ {
+ // Redirect
+ String aRetVal(ret_val, osl_getThreadTextEncoding());
+ String aRedirected (aRetVal);
+ if ( FSYS_KIND_DIR == eKind )
+ {
+ if (0 == _mkdir(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr()))
{
- // Redirect
- String aRetVal(ret_val, osl_getThreadTextEncoding());
- String aRedirected (aRetVal);
- if ( FSYS_KIND_DIR == eKind )
- {
- if (0 == _mkdir(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr()))
- {
- aRet = DirEntry( aRetVal );
- break;
- }
- }
- else
- {
+ aRet = DirEntry( aRetVal );
+ break;
+ }
+ }
+ else
+ {
#if defined(UNX)
- if (access(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr(), F_OK))
- {
- aRet = DirEntry( aRetVal );
- break;
- }
+ if (access(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr(), F_OK))
+ {
+ aRet = DirEntry( aRetVal );
+ break;
+ }
#else
- struct stat aStat;
- if (stat(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr(), &aStat))
- {
- aRet = DirEntry( aRetVal );
- break;
- }
-#endif
- }
+ struct stat aStat;
+ if (stat(rtl::OUStringToOString(aRedirected, osl_getThreadTextEncoding()).getStr(), &aStat))
+ {
+ aRet = DirEntry( aRetVal );
+ break;
}
+#endif
+ }
+ }
}
delete[] ret_val;
@@ -1655,9 +1655,9 @@ const DirEntry &DirEntry::operator[]( sal_uInt16 nParentLevel ) const
{
DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
- //TPF: maybe to be implemented (FastFSys)
+ //TPF: maybe to be implemented (FastFSys)
- const DirEntry *pRes = this;
+ const DirEntry *pRes = this;
while ( pRes && nParentLevel-- )
pRes = pRes->pParent;
commit bccf34c19ae022b67565e212fa4ec0d5213947de
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 2 16:02:38 2012 +0100
ditch String::CreateFromAscii
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 471becd..ac384bb 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -324,15 +324,15 @@ namespace
aName += pMethod->GetName();
// language
- String aLanguage = String::CreateFromAscii("Basic");
+ rtl::OUString aLanguage("Basic");
// location
- String aLocation;
+ rtl::OUString aLocation;
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
if ( aDocument.isDocument() )
{
// document basic
- aLocation = String::CreateFromAscii("document");
+ aLocation = rtl::OUString("document");
if ( rxLimitToDocument.is() )
{
@@ -366,17 +366,17 @@ namespace
else
{
// application basic
- aLocation = String::CreateFromAscii("application");
+ aLocation = rtl::OUString("application");
}
// script URL
if ( !bError )
{
- aScriptURL = String::CreateFromAscii("vnd.sun.star.script:");
+ aScriptURL = rtl::OUString("vnd.sun.star.script:");
aScriptURL += aName;
- aScriptURL += String::CreateFromAscii("?language=");
+ aScriptURL += rtl::OUString("?language=");
aScriptURL += aLanguage;
- aScriptURL += String::CreateFromAscii("&location=");
+ aScriptURL += rtl::OUString("&location=");
aScriptURL += aLocation;
}
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 9018f3a..d46c797 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -135,7 +135,7 @@ BasicIDEDLL::BasicIDEDLL()
SfxModule* pMod = BASIC_MOD();
SfxObjectFactory& rFactory = BasicDocShell::Factory();
- rFactory.SetDocumentServiceName( String::CreateFromAscii( "com.sun.star.script.BasicIDE" ) );
+ rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.script.BasicIDE") );
BasicDocShell::RegisterInterface( pMod );
BasicIDEShell::RegisterFactory( SVX_INTERFACE_BASIDE_VIEWSH );
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 761be97..bd0f6fe 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -354,7 +354,7 @@ SbMethod* MacroChooser::CreateMacro()
String aLibName( aDesc.GetLibName() );
if ( !aLibName.Len() )
- aLibName = String::CreateFromAscii( "Standard" );
+ aLibName = rtl::OUString("Standard");
aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
@@ -522,8 +522,6 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
{
- static String aSpaceStr = String::CreateFromAscii(" ");
-
// Is also called if deselected!
// Two function calls in every SelectHdl because
// there's no separate DeselectHDL.
@@ -537,7 +535,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
if ( pModule )
{
String aStr = aMacrosInTxtBaseStr;
- aStr += aSpaceStr;
+ aStr += rtl::OUString(" ");
aStr += pModule->GetName();
aMacrosInTxt.SetText( aStr );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index bf7d036..6c9aacd 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1532,7 +1532,7 @@ void LibPage::SetCurLib()
ImpInsertLibEntry( aLibName, i );
}
- SvLBoxEntry* pEntry_ = aLibBox.FindEntry( String::CreateFromAscii( "Standard" ) );
+ SvLBoxEntry* pEntry_ = aLibBox.FindEntry( rtl::OUString("Standard") );
if ( !pEntry_ )
pEntry_ = aLibBox.GetEntry( 0 );
aLibBox.SetCurEntry( pEntry_ );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index f5ca16c..8fa93f5 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -101,13 +101,13 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper;
// Version 2
// + sal_Bool bReference
-static const char* szStdLibName = "Standard";
+static const char szStdLibName[] = "Standard";
static const char szBasicStorage[] = "StarBASIC";
-static const char* szOldManagerStream = "BasicManager";
+static const char szOldManagerStream[] = "BasicManager";
static const char szManagerStream[] = "BasicManager2";
-static const char* szImbedded = "LIBIMBEDDED";
-static const char* szCryptingKey = "CryptedBasic";
-static const char* szScriptLanguage = "StarBasic";
+static const char szImbedded[] = "LIBIMBEDDED";
+static const char szCryptingKey[] = "CryptedBasic";
+static const char szScriptLanguage[] = "StarBasic";
TYPEINIT1( BasicManager, SfxBroadcaster );
DBG_NAME( BasicManager );
@@ -555,8 +555,8 @@ BasicLibInfo::BasicLibInfo()
bDoLoad = sal_False;
bFoundInPath = sal_False;
mxScriptCont = NULL;
- aStorageName = String::CreateFromAscii(szImbedded);
- aRelStorageName = String::CreateFromAscii(szImbedded);
+ aStorageName = rtl::OUString(szImbedded);
+ aRelStorageName = rtl::OUString(szImbedded);
}
BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
@@ -632,8 +632,8 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
pStdLibInfo = CreateLibInfo();
pStdLibInfo->SetLib( pStdLib );
StarBASICRef xStdLib = pStdLibInfo->GetLib();
- xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
- pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
+ xStdLib->SetName( rtl::OUString(szStdLibName) );
+ pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) );
xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
xStdLib->SetModified( sal_False );
}
@@ -682,7 +682,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
else
{
ImpCreateStdLib( pParentFromStdLib );
- if ( rStorage.IsStream( String::CreateFromAscii(szOldManagerStream) ) )
+ if ( rStorage.IsStream( rtl::OUString(szOldManagerStream) ) )
LoadOldBasicManager( rStorage );
}
}
@@ -816,8 +816,8 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr
BasicLibInfo* pStdLibInfo = CreateLibInfo();
pStdLibInfo->SetLib( pSLib );
StarBASICRef xStdLib = pStdLibInfo->GetLib();
- xStdLib->SetName( String::CreateFromAscii(szStdLibName));
- pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
+ xStdLib->SetName(rtl::OUString(szStdLibName));
+ pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) );
pSLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
// Save is only necessary if basic has changed
@@ -835,8 +835,8 @@ void BasicManager::ImpMgrNotLoaded( const String& rStorageName )
BasicLibInfo* pStdLibInfo = CreateLibInfo();
pStdLibInfo->SetLib( new StarBASIC( NULL, mbDocMgr ) );
StarBASICRef xStdLib = pStdLibInfo->GetLib();
- xStdLib->SetName( String::CreateFromAscii(szStdLibName) );
- pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
+ xStdLib->SetName( rtl::OUString(szStdLibName) );
+ pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) );
xStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
xStdLib->SetModified( sal_False );
}
@@ -847,8 +847,8 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
BasicLibInfo* pStdLibInfo = CreateLibInfo();
StarBASIC* pStdLib = new StarBASIC( pParentFromStdLib, mbDocMgr );
pStdLibInfo->SetLib( pStdLib );
- pStdLib->SetName( String::CreateFromAscii(szStdLibName) );
- pStdLibInfo->SetLibName( String::CreateFromAscii(szStdLibName) );
+ pStdLib->SetName( rtl::OUString(szStdLibName) );
+ pStdLibInfo->SetLibName( rtl::OUString(szStdLibName) );
pStdLib->SetFlag( SBX_DONTSTORE | SBX_EXTSEARCH );
}
@@ -944,7 +944,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
SotStorageStreamRef xManagerStream = rStorage.OpenSotStream
- ( String::CreateFromAscii(szOldManagerStream), eStreamReadMode );
+ ( rtl::OUString(szOldManagerStream), eStreamReadMode );
String aStorName( rStorage.GetName() );
DBG_ASSERT( aStorName.Len(), "No Storage Name!" );
@@ -1287,7 +1287,7 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, s
else
{
pLibInfo->GetLib()->SetModified( sal_True ); // Must be saved after Add!
- pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Save in BasicManager-Storage
+ pLibInfo->SetStorageName( rtl::OUString(szImbedded) ); // Save in BasicManager-Storage
}
}
else
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 5aecb53..57ca034 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -474,7 +474,7 @@ String SbiImage::GetString( short nId ) const
if( nLen == 1 )
{
// Force length 1 and make char 0 afterwards
- String aNullCharStr( String::CreateFromAscii( " " ) );
+ String aNullCharStr( rtl::OUString(" ") );
aNullCharStr.SetChar( 0, 0 );
return aNullCharStr;
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 79fc969..c18d0ea 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1915,10 +1915,10 @@ BasicCollection::BasicCollection( const XubString& rClass )
{
if( !nCountHash )
{
- nCountHash = MakeHashCode( String::CreateFromAscii( pCountStr ) );
- nAddHash = MakeHashCode( String::CreateFromAscii( pAddStr ) );
- nItemHash = MakeHashCode( String::CreateFromAscii( pItemStr ) );
- nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemoveStr ) );
+ nCountHash = MakeHashCode( rtl::OUString::createFromAscii( pCountStr ) );
+ nAddHash = MakeHashCode( rtl::OUString::createFromAscii( pAddStr ) );
+ nItemHash = MakeHashCode( rtl::OUString::createFromAscii( pItemStr ) );
+ nRemoveHash = MakeHashCode( rtl::OUString::createFromAscii( pRemoveStr ) );
}
Initialize();
@@ -1940,14 +1940,14 @@ void BasicCollection::Initialize()
SetFlag( SBX_FIXED );
ResetFlag( SBX_WRITE );
SbxVariable* p;
- p = Make( String::CreateFromAscii( pCountStr ), SbxCLASS_PROPERTY, SbxINTEGER );
+ p = Make( rtl::OUString::createFromAscii( pCountStr ), SbxCLASS_PROPERTY, SbxINTEGER );
p->ResetFlag( SBX_WRITE );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pAddStr ), SbxCLASS_METHOD, SbxEMPTY );
+ p = Make( rtl::OUString::createFromAscii( pAddStr ), SbxCLASS_METHOD, SbxEMPTY );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pItemStr ), SbxCLASS_METHOD, SbxVARIANT );
+ p = Make( rtl::OUString::createFromAscii( pItemStr ), SbxCLASS_METHOD, SbxVARIANT );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY );
+ p = Make( rtl::OUString::createFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY );
p->SetFlag( SBX_DONTSTORE );
if ( !xAddInfo.Is() )
{
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 61a55da..1af42ef 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -820,7 +820,7 @@ void SbiParser::Option()
void addStringConst( SbiSymPool& rPool, const char* pSym, const String& rStr )
{
- SbiConstDef* pConst = new SbiConstDef( String::CreateFromAscii( pSym ) );
+ SbiConstDef* pConst = new SbiConstDef( rtl::OUString::createFromAscii( pSym ) );
pConst->SetType( SbxSTRING );
pConst->Set( rStr );
rPool.Add( pConst );
@@ -828,7 +828,7 @@ void addStringConst( SbiSymPool& rPool, const char* pSym, const String& rStr )
inline void addStringConst( SbiSymPool& rPool, const char* pSym, const char* pStr )
{
- addStringConst( rPool, pSym, String::CreateFromAscii( pStr ) );
+ addStringConst( rPool, pSym, rtl::OUString::createFromAscii( pStr ) );
}
void SbiParser::AddConstants( void )
@@ -848,7 +848,7 @@ void SbiParser::AddConstants( void )
addStringConst( aPublics, "vbVerticalTab", "\x0B" );
// Force length 1 and make char 0 afterwards
- String aNullCharStr( String::CreateFromAscii( " " ) );
+ String aNullCharStr( rtl::OUString(" ") );
aNullCharStr.SetChar( 0, 0 );
addStringConst( aPublics, "vbNullChar", aNullCharStr );
}
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index b31330c..47f8716 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -72,7 +72,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData,
{
- aData = String::CreateFromAscii( (char*)(const void*)*pData );
+ aData = rtl::OUString::createFromAscii( (const char*)(const void*)*pData );
return 1;
}
)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 4f6680c..7050093 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -446,7 +446,7 @@ RTLFUNC(CurDir)
}
char* pBuffer = new char[ _MAX_PATH ];
if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 )
- rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) );
+ rPar.Get(0)->PutString( rtl::OUString::createFromAscii( pBuffer ) );
else
StarBASIC::Error( SbERR_NO_DEVICE );
delete [] pBuffer;
@@ -465,7 +465,7 @@ RTLFUNC(CurDir)
}
if( getcwd( pMem, nSize-1 ) != NULL )
{
- rPar.Get(0)->PutString( String::CreateFromAscii(pMem) );
+ rPar.Get(0)->PutString( rtl::OUString::createFromAscii(pMem) );
delete [] pMem;
return;
}
@@ -877,7 +877,7 @@ RTLFUNC(Hex)
snprintf( aBuffer, sizeof(aBuffer), "%X", pArg->GetInteger() );
else
snprintf( aBuffer, sizeof(aBuffer), "%lX", static_cast<long unsigned int>(pArg->GetLong()) );
- rPar.Get(0)->PutString( String::CreateFromAscii( aBuffer ) );
+ rPar.Get(0)->PutString( rtl::OUString::createFromAscii( aBuffer ) );
}
}
@@ -1300,7 +1300,7 @@ RTLFUNC(Oct)
snprintf( aBuffer, sizeof(aBuffer), "%o", pArg->GetInteger() );
else
snprintf( aBuffer, sizeof(aBuffer), "%lo", static_cast<long unsigned int>(pArg->GetLong()) );
- rPar.Get(0)->PutString( String::CreateFromAscii( aBuffer ) );
+ rPar.Get(0)->PutString( rtl::OUString::createFromAscii( aBuffer ) );
}
}
@@ -1767,7 +1767,7 @@ RTLFUNC(CDateToIso)
implGetDateYear( aDate ),
implGetDateMonth( aDate ),
implGetDateDay( aDate ) );
- String aRetStr = String::CreateFromAscii( Buffer );
+ String aRetStr = rtl::OUString::createFromAscii( Buffer );
rPar.Get(0)->PutString( aRetStr );
}
else
@@ -2107,7 +2107,7 @@ RTLFUNC(Time)
char buf[ 20 ];
snprintf( buf, sizeof(buf), "%02d:%02d:%02d",
aTime.GetHour(), aTime.GetMin(), aTime.GetSec() );
- aRes = String::CreateFromAscii( buf );
+ aRes = rtl::OUString::createFromAscii( buf );
}
else
{
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 19f4823..0e418cc 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1252,7 +1252,7 @@ RTLFUNC(Environ)
osl_getThreadTextEncoding()));
const char* pEnvStr = getenv(aByteStr.getStr());
if ( pEnvStr )
- aResult = String::CreateFromAscii( pEnvStr );
+ aResult = rtl::OUString::createFromAscii( pEnvStr );
rPar.Get(0)->PutString( aResult );
}
diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx
index d54aea3..95d2332 100644
--- a/basic/source/runtime/sbdiagnose.cxx
+++ b/basic/source/runtime/sbdiagnose.cxx
@@ -61,7 +61,7 @@ void DbgReportAssertion( const sal_Char* i_assertionMessage )
SbxArrayRef const xArguments( new SbxArray( SbxVARIANT ) );
SbxVariableRef const xMessageText = new SbxVariable( SbxSTRING );
- xMessageText->PutString( String::CreateFromAscii( i_assertionMessage ) );
+ xMessageText->PutString( rtl::OUString::createFromAscii(i_assertionMessage) );
xArguments->Put( xMessageText, 1 );
ErrCode const nError = xAssertionChannelBasic->Call( sCaptureFunctionName, xArguments );
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 89a244f..2f95d51 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -731,7 +731,7 @@ SbiStdObject::SbiStdObject( const String& r, StarBASIC* pb ) : SbxObject( r )
if( !p->nHash )
while( p->nArgs != -1 )
{
- String aName_ = String::CreateFromAscii( p->pName );
+ String aName_ = rtl::OUString::createFromAscii( p->pName );
p->nHash = SbxVariable::MakeHashCode( aName_ );
p += ( p->nArgs & _ARGSMASK ) + 1;
}
@@ -807,7 +807,7 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
short nType = ( p->nArgs & _TYPEMASK );
if( p->nArgs & _CONST )
nAccess |= SBX_CONST;
- String aName_ = String::CreateFromAscii( p->pName );
+ String aName_ = rtl::OUString::createFromAscii( p->pName );
SbxClassType eCT = SbxCLASS_OBJECT;
if( nType & _PROPERTY )
eCT = SbxCLASS_PROPERTY;
@@ -878,7 +878,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx )
for( short i = 0; i < nPar; i++ )
{
p++;
- String aName_ = String::CreateFromAscii( p->pName );
+ String aName_ = rtl::OUString::createFromAscii( p->pName );
sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
if( p->nArgs & _OPT )
nFlags_ |= SBX_OPTIONAL;
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index c5868fd..8bcde7d 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -50,10 +50,10 @@ SbxCollection::SbxCollection( const XubString& rClass )
pAdd = GetSbxRes( STRING_ADDMETH );
pItem = GetSbxRes( STRING_ITEMMETH );
pRemove = GetSbxRes( STRING_REMOVEMETH );
- nCountHash = MakeHashCode( String::CreateFromAscii( pCount ) );
- nAddHash = MakeHashCode( String::CreateFromAscii( pAdd ) );
- nItemHash = MakeHashCode( String::CreateFromAscii( pItem ) );
- nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemove ) );
+ nCountHash = MakeHashCode( rtl::OUString::createFromAscii( pCount ) );
+ nAddHash = MakeHashCode( rtl::OUString::createFromAscii( pAdd ) );
+ nItemHash = MakeHashCode( rtl::OUString::createFromAscii( pItem ) );
+ nRemoveHash = MakeHashCode( rtl::OUString::createFromAscii( pRemove ) );
}
Initialize();
// For Access on itself
@@ -86,14 +86,14 @@ void SbxCollection::Initialize()
SetFlag( SBX_FIXED );
ResetFlag( SBX_WRITE );
SbxVariable* p;
- p = Make( String::CreateFromAscii( pCount ), SbxCLASS_PROPERTY, SbxINTEGER );
+ p = Make( rtl::OUString::createFromAscii( pCount ), SbxCLASS_PROPERTY, SbxINTEGER );
p->ResetFlag( SBX_WRITE );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pAdd ), SbxCLASS_METHOD, SbxEMPTY );
+ p = Make( rtl::OUString::createFromAscii( pAdd ), SbxCLASS_METHOD, SbxEMPTY );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pItem ), SbxCLASS_METHOD, SbxOBJECT );
+ p = Make( rtl::OUString::createFromAscii( pItem ), SbxCLASS_METHOD, SbxOBJECT );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pRemove ), SbxCLASS_METHOD, SbxEMPTY );
+ p = Make( rtl::OUString::createFromAscii( pRemove ), SbxCLASS_METHOD, SbxEMPTY );
p->SetFlag( SBX_DONTSTORE );
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 9038679..443412b 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -51,8 +51,8 @@ SbxObject::SbxObject( const XubString& rClass )
{
pNameProp = GetSbxRes( STRING_NAMEPROP );
pParentProp = GetSbxRes( STRING_PARENTPROP );
- nNameHash = MakeHashCode( String::CreateFromAscii( pNameProp ) );
- nParentHash = MakeHashCode( String::CreateFromAscii( pParentProp ) );
+ nNameHash = MakeHashCode( rtl::OUString::createFromAscii( pNameProp ) );
+ nParentHash = MakeHashCode( rtl::OUString::createFromAscii( pParentProp ) );
}
SbxObject::Clear();
SbxObject::SetName( rClass );
@@ -129,9 +129,9 @@ void SbxObject::Clear()
pProps = new SbxArray;
pObjs = new SbxArray( SbxOBJECT );
SbxVariable* p;
- p = Make( String::CreateFromAscii( pNameProp ), SbxCLASS_PROPERTY, SbxSTRING );
+ p = Make( rtl::OUString::createFromAscii( pNameProp ), SbxCLASS_PROPERTY, SbxSTRING );
p->SetFlag( SBX_DONTSTORE );
- p = Make( String::CreateFromAscii( pParentProp ), SbxCLASS_PROPERTY, SbxOBJECT );
+ p = Make( rtl::OUString::createFromAscii( pParentProp ), SbxCLASS_PROPERTY, SbxOBJECT );
p->ResetFlag( SBX_WRITE );
p->SetFlag( SBX_DONTSTORE );
pDfltProp = NULL;
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index bc0d23d..aa88ae2 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection)
ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver)
{
DBG_CTOR(ODbaseConnection,NULL);
- m_aFilenameExtension = String::CreateFromAscii("dbf");
+ m_aFilenameExtension = rtl::OUString("dbf");
}
//-----------------------------------------------------------------------------
ODbaseConnection::~ODbaseConnection()
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index b56395e..7285bb0 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -376,7 +376,7 @@ void ODbaseIndex::createINFEntry()
{
// synchronize inf-file
String sEntry = m_Name;
- sEntry += String::CreateFromAscii(".ndx");
+ sEntry += rtl::OUString(".ndx");
::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
@@ -435,7 +435,7 @@ sal_Bool ODbaseIndex::DropImpl()
sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
rtl::OString aKeyName;
String sEntry = m_Name;
- sEntry += String::CreateFromAscii(".ndx");
+ sEntry += rtl::OUString(".ndx");
// delete entries from the inf file
for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 63e249f..d051f3f 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -511,9 +511,9 @@ void ODbaseTable::construct()
// nyi: Ugly for Unix and Mac!
if ( m_aHeader.db_typ == FoxProMemo || VisualFoxPro == m_aHeader.db_typ || VisualFoxProAuto == m_aHeader.db_typ ) // foxpro uses another extension
- aURL.SetExtension(String::CreateFromAscii("fpt"));
+ aURL.SetExtension(rtl::OUString("fpt"));
else
- aURL.SetExtension(String::CreateFromAscii("dbt"));
+ aURL.SetExtension(rtl::OUString("dbt"));
// If the memo file isn't found, the data will be displayed anyhow.
// However, updates can't be done
@@ -677,7 +677,7 @@ void ODbaseTable::refreshIndexes()
INetURLObject aURL;
aURL.SetURL(getEntry(m_pConnection,m_Name));
- aURL.setExtension(String::CreateFromAscii("inf"));
+ aURL.setExtension(rtl::OUString("inf"));
Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
aInfFile.SetGroup(dBASE_III_GROUP);
sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
@@ -1090,7 +1090,7 @@ sal_Bool ODbaseTable::CreateImpl()
if (bMemoFile)
{
String aExt = aURL.getExtension();
- aURL.setExtension(String::CreateFromAscii("dbt")); // extension for memo file
+ aURL.setExtension(rtl::OUString("dbt")); // extension for memo file
Content aMemo1Content(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>());
sal_Bool bMemoAlreadyExists = sal_False;
@@ -1435,7 +1435,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem
{
if (_bHasMemoFields)
{ // delete the memo fields
- aURL.setExtension(String::CreateFromAscii("dbt"));
+ aURL.setExtension(rtl::OUString("dbt"));
bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
}
@@ -1455,7 +1455,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem
{
}
}
- aURL.setExtension(String::CreateFromAscii("inf"));
+ aURL.setExtension(rtl::OUString("inf"));
// as the inf file does not necessarily exist, we aren't allowed to use UCBContentHelper::Kill
try
@@ -2348,7 +2348,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::
renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension());
if ( HasMemoFields() )
{ // delete the memo fields
- String sExt = String::CreateFromAscii("dbt");
+ rtl::OUString sExt("dbt");
renameFile(m_pConnection,m_Name,newName,sExt);
}
}
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 6ad0c36..a727e41 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1455,7 +1455,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
// change te description of the radio button, which switch to the module
// dependend accelerator configuration
String sButtonText = aModuleButton.GetText();
- sButtonText.SearchAndReplace(String::CreateFromAscii("$(MODULE)"), m_sModuleUIName);
+ sButtonText.SearchAndReplace(rtl::OUString("$(MODULE)"), m_sModuleUIName);
aModuleButton.SetText(sButtonText);
if (m_xModule.is())
@@ -1540,7 +1540,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand)
}
else
{
- String aRet( String::CreateFromAscii("Symbols: ") );
+ String aRet(rtl::OUString("Symbols: "));
xub_StrLen nPos = sCommand.SearchAscii(".uno:InsertSymbol?Symbols:string=");
if ( nPos == 0 )
{
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index dc4571a..85f353d 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -948,7 +948,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
}
Any value =
- xPropSet->getPropertyValue( String::CreateFromAscii( "URI" ) );
+ xPropSet->getPropertyValue( rtl::OUString("URI") );
value >>= uri;
String* pScriptURI = new String( uri );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index ca780f8..4587092 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -523,7 +523,7 @@ IMPL_LINK_NOARG(SvxCharMapData, CharHighlightHdl)
snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast<unsigned>(cChar) );
if( cChar < 0x0100 )
snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(cChar) );
- aText = String::CreateFromAscii( aBuf );
+ aText = rtl::OUString::createFromAscii(aBuf);
}
aCharCodeText.SetText( aText );
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 3374d13..63b83b4 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -86,7 +86,7 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT
maCbbTargets.InsertEntry( *rTargetList[ i ] );
if( !rTarget.Len() )
- maCbbTargets.SetText( String::CreateFromAscii( "_self" ) );
+ maCbbTargets.SetText( rtl::OUString("_self") );
else
maCbbTargets.SetText( rTarget );
}
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 8957a14..b310ddb 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -346,10 +346,8 @@ void SvxHyperlinkInternetTp::RemoveImproperProtocol(const String& aProperScheme)
String SvxHyperlinkInternetTp::GetSchemeFromButtons() const
{
if( maRbtLinktypFTP.IsChecked() )
- {
- return String::CreateFromAscii( INET_FTP_SCHEME );
- }
- return String::CreateFromAscii( INET_HTTP_SCHEME );
+ return rtl::OUString(INET_FTP_SCHEME);
+ return rtl::OUString(INET_HTTP_SCHEME);
}
INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 476ab9a..49b43f7 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -250,10 +250,8 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const String& aProperScheme)
String SvxHyperlinkMailTp::GetSchemeFromButtons() const
{
if( maRbtNews.IsChecked() )
- {
- return String::CreateFromAscii( INET_NEWS_SCHEME );
- }
- return String::CreateFromAscii( INET_MAILTO_SCHEME );
+ return rtl::OUString(INET_NEWS_SCHEME);
+ return rtl::OUString(INET_MAILTO_SCHEME);
}
INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 33533a1..4a1a2ec 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -531,23 +531,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL )
{
if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) )
{
- aStrScheme = String::CreateFromAscii( INET_HTTP_SCHEME );
+ aStrScheme = rtl::OUString( INET_HTTP_SCHEME );
}
else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) )
{
- aStrScheme = String::CreateFromAscii( INET_HTTPS_SCHEME );
+ aStrScheme = rtl::OUString( INET_HTTPS_SCHEME );
}
else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) )
{
- aStrScheme = String::CreateFromAscii( INET_FTP_SCHEME );
+ aStrScheme = rtl::OUString( INET_FTP_SCHEME );
}
else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) )
{
- aStrScheme = String::CreateFromAscii( INET_MAILTO_SCHEME );
+ aStrScheme = rtl::OUString( INET_MAILTO_SCHEME );
}
else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) )
{
- aStrScheme = String::CreateFromAscii( INET_NEWS_SCHEME );
+ aStrScheme = rtl::OUString( INET_NEWS_SCHEME );
}
}
else
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index ac3bf0d..3137db1 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -58,7 +58,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
if ( IsClassPathMode() )
{
aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
- aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+ aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") );
}
if ( aDlg.Execute() == ERRCODE_NONE )
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index ff68160..587a10d 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -104,7 +104,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
if ( aType.Len() )
{
- aText += String::CreateFromAscii( " (" );
+ aText += rtl::OUString( " (" );
aText += aType;
aText += ')';
pPluginNames[nIndex] = aText;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 3a8b075..3a71808 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -535,7 +535,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag
// must be a neater way to deal with the strings than as above
// append the language to the dialog title
String winTitle( GetText() );
- winTitle.SearchAndReplace( String::CreateFromAscii( "%MACROLANG" ), m_sLanguage );
+ winTitle.SearchAndReplace( rtl::OUString( "%MACROLANG" ), m_sLanguage );
SetText( winTitle );
aScriptsBox.SetSelectHdl( LINK( this, SvxScriptOrgDialog, ScriptSelectHdl ) );
@@ -614,8 +614,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
return;
}
- ::rtl::OUString sName;
- sName = String::CreateFromAscii("Editable") ;
+ ::rtl::OUString sName("Editable") ;
if ( getBoolProperty( xProps, sName ) )
{
@@ -626,7 +625,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
aEditButton.Disable();
}
- sName = String::CreateFromAscii("Deletable") ;
+ sName = rtl::OUString("Deletable") ;
if ( getBoolProperty( xProps, sName ) )
{
@@ -637,7 +636,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
aDelButton.Disable();
}
- sName = String::CreateFromAscii("Creatable") ;
+ sName = rtl::OUString("Creatable") ;
if ( getBoolProperty( xProps, sName ) )
{
@@ -648,7 +647,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
aCreateButton.Disable();
}
- sName = String::CreateFromAscii("Renamable") ;
+ sName = rtl::OUString("Renamable") ;
if ( getBoolProperty( xProps, sName ) )
{
@@ -765,7 +764,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
mspNode.set( mspUserData->GetNode() , UNO_QUERY );
pParent = aScriptsBox.GetParent( pParent );
}
- xProp->getPropertyValue( String::CreateFromAscii("URI" ) ) >>= tmpString;
+ xProp->getPropertyValue( rtl::OUString("URI" ) ) >>= tmpString;
const String scriptURL( tmpString );
if ( mspNode.is() )
@@ -1211,10 +1210,10 @@ sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >&
String SvxScriptOrgDialog::getListOfChildren( Reference< browse::XBrowseNode > node, int depth )
{
String result;
- result.Append( String::CreateFromAscii( "\n" ) );
+ result.Append( rtl::OUString( "\n" ) );
for( int i=0;i<=depth;i++ )
{
- result.Append( String::CreateFromAscii( "\t" ) );
+ result.Append( rtl::OUString( "\t" ) );
}
result.Append( String( node->getName() ) );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4c47b37..c8cb1b1 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -63,8 +63,6 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-#define A2S(x) String::CreateFromAscii( x )
-
// class LookUpComboBox_Impl --------------------------------------------------
LookUpComboBox_Impl::LookUpComboBox_Impl(
@@ -208,7 +206,7 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St
if (bIsHeader && nVal >= 0)
{
aText = String::CreateFromInt32( nVal );
- aText += A2S( ". " );
+ aText += rtl::OUString(". ");
}
pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column
aText += rText;
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 320385c..a672523 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -71,7 +71,7 @@ namespace svx
FreeResource();
- String sTemp = String::CreateFromAscii("*.odb");
+ rtl::OUString sTemp("*.odb");
m_aURL.SetFilter(sTemp);
m_aName.SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) );
@@ -171,8 +171,7 @@ namespace svx
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
- static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
if ( pFilter )
{
aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9bbe165..191799f 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -124,8 +124,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
aCheckLB.SvxSimpleTable::SetTabs( aStaticTabs, MAP_PIXEL );
String sHeader(sHeader1);
- String sTab(String::CreateFromAscii("\t"));
- String sTabSpace(String::CreateFromAscii("\t "));
+ rtl::OUString sTab("\t");
+ rtl::OUString sTabSpace("\t ");
sHeader += sTab;
sHeader += sHeader2;
sHeader += sTabSpace;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 99e49f6..6317c83 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -347,7 +347,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++ )
{
- String* pData = new String( String::CreateFromAscii( aHelpFormatNames[i] ) );
+ String* pData = new String( rtl::OUString::createFromAscii( aHelpFormatNames[i] ) );
aHelpFormatLB.SetEntryData( i, pData );
}
}
@@ -1287,7 +1287,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
const String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) );
String aUILang(aStr);
- aUILang += String::CreateFromAscii(" - ");
+ aUILang += rtl::OUString(" - ");
aUILang += pLanguageTable->GetString( Application::GetSettings().GetUILanguage(), true );
aUserInterfaceLB.InsertEntry(aUILang);
@@ -1361,7 +1361,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM );
// insert SYSTEM entry
String aDefaultCurr(aStr);
- aDefaultCurr += String::CreateFromAscii(" - ");
+ aDefaultCurr += rtl::OUString(" - ");
aDefaultCurr += rCurr.GetBankSymbol();
aCurrencyLB.InsertEntry( aDefaultCurr );
// all currencies
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index dfd413a..a8ab0d1 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1457,7 +1457,7 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
rtl::OUString sUrl;
::utl::LocalFileHelper::ConvertPhysicalNameToURL(sPath, sUrl);
aHelper.SetDisplayDirectory(sUrl);
- aHelper.AddFilter( m_sDefaultFilterName, String::CreateFromAscii("*"));
+ aHelper.AddFilter( m_sDefaultFilterName, rtl::OUString("*"));
if ( ERRCODE_NONE == aHelper.Execute() )
{
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 843514b..52b5c4b 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -910,7 +910,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
{
sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
- aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+ aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") );
String sFolder;
if ( m_aPathList.GetSelectEntryCount() > 0 )
{
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a131b39..a321349 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -387,7 +387,7 @@ static const char * aEidToPropName[] =
static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId )
{
DBG_ASSERT( (unsigned int) eEntryId < SAL_N_ELEMENTS(aEidToPropName), "index out of range" );
- return String::CreateFromAscii( aEidToPropName[ (int) eEntryId ] );
+ return rtl::OUString::createFromAscii( aEidToPropName[ (int) eEntryId ] );
}
// class OptionsUserData -------------------------------------------------
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 4c0f03b..d2b5a5f 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -142,7 +142,7 @@ static String getCfgName_Impl( sal_uInt16 _nHandle )
if ( Hdl2CfgMap_Impl[ nIndex ].m_nHandle == _nHandle )
{
// config name found
- sCfgName = String::CreateFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName );
+ sCfgName = rtl::OUString::createFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName );
break;
}
++nIndex;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95a52c6..533e8fe 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1307,9 +1307,9 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
nMinTrail = 2;
if (xProp.is())
{
- xProp->getPropertyValue( String::CreateFromAscii(
+ xProp->getPropertyValue( rtl::OUString(
UPN_HYPH_MIN_LEADING) ) >>= nMinLead;
- xProp->getPropertyValue( String::CreateFromAscii(
+ xProp->getPropertyValue( rtl::OUString(
UPN_HYPH_MIN_TRAILING) ) >>= nMinTrail;
}
aHyphen.GetMinLead() = (sal_uInt8)nMinLead;
@@ -1340,7 +1340,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
sal_Bool bVal = sal_False;
if (xProp.is())
{
- xProp->getPropertyValue( String::CreateFromAscii( UPN_IS_SPELL_AUTO) ) >>= bVal;
+ xProp->getPropertyValue( rtl::OUString( UPN_IS_SPELL_AUTO) ) >>= bVal;
}
pRet->Put(SfxBoolItem(SID_AUTOSPELL_CHECK, bVal));
@@ -1489,10 +1489,10 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
if (xProp.is())
{
xProp->setPropertyValue(
- String::CreateFromAscii(UPN_HYPH_MIN_LEADING),
+ rtl::OUString(UPN_HYPH_MIN_LEADING),
makeAny((sal_Int16) pHyphenItem->GetMinLead()) );
xProp->setPropertyValue(
- String::CreateFromAscii(UPN_HYPH_MIN_TRAILING),
+ rtl::OUString(UPN_HYPH_MIN_TRAILING),
makeAny((sal_Int16) pHyphenItem->GetMinTrail()) );
}
bSaveSpellCheck = sal_True;
@@ -1528,7 +1528,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
if (xProp.is())
{
xProp->setPropertyValue(
- String::CreateFromAscii(UPN_IS_SPELL_AUTO),
+ rtl::OUString(UPN_IS_SPELL_AUTO),
makeAny(bOnlineSpelling) );
}
}
@@ -1702,7 +1702,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
}
#ifdef DBG_UTIL
- AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
+ AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Interner Test"), nGroup );
#endif
}
@@ -1718,7 +1718,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
}
#ifdef DBG_UTIL
- AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
+ AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Interner Test"), nGroup );
#endif
}
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index ae72075..0547aa8 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -683,7 +683,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5));
int ay = int(floor((float)aOrigPixelSize.Height() /
((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
- sTemp += UniString::CreateFromAscii(" ");
+ sTemp += rtl::OUString(" ");
sTemp += CUI_RESSTR( STR_PPI );
String sPPI = UniString::CreateFromInt32(ax);
if (abs(ax - ay) > 1) {
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e61b687..d2cdb02 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -335,13 +335,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
if( sScriptURI.CompareToAscii( "vnd.sun.star.script:", 20 ) == COMPARE_EQUAL )
{
pThis->aTbl.Insert(
- nEvent, SvxMacro( sScriptURI, String::CreateFromAscii( SVX_MACRO_LANGUAGE_SF ) ) );
+ nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_SF ) ) );
}
else
{
OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" );
pThis->aTbl.Insert(
- nEvent, SvxMacro( sScriptURI, String::CreateFromAscii( SVX_MACRO_LANGUAGE_STARBASIC ) ) );
+ nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) );
}
}
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index ad0b4e6..d28d582 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2011,7 +2011,7 @@ void SbaXDataBrowserController::ExecuteSearch()
if ( pFact )
{
::std::vector< String > aContextNames;
- aContextNames.push_back( String::CreateFromAscii("Standard") );
+ aContextNames.push_back( rtl::OUString("Standard") );
pDialog = pFact->CreateFmSearchDialog(getBrowserView(), sInitialText, aContextNames, 0, LINK(this, SbaXDataBrowserController, OnSearchContextRequest));
}
OSL_ENSURE( pDialog, "SbaXDataBrowserController::ExecuteSearch: could not get the search dialog!" );
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 4e37c56..082fae1 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -965,7 +965,7 @@ void SbaGridControl::SetBrowserAttrs()
);
if (!xDialog.is())
{
- ShowServiceNotAvailableError(this, String::CreateFromAscii("com.sun.star.form.ControlFontDialog"), sal_True);
+ ShowServiceNotAvailableError(this, rtl::OUString("com.sun.star.form.ControlFontDialog"), sal_True);
return;
}
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index f8e781b..2759864 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -972,11 +972,11 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
pNumType = new OPropListBoxCtrl( this, STR_HELP_NUMERIC_TYPE, FIELD_PROPERTY_NUMTYPE, WB_DROPDOWN );
pNumType->SetDropDownLineCount(5);
- pNumType->InsertEntry( String::CreateFromAscii("Byte") );
- pNumType->InsertEntry( String::CreateFromAscii("SmallInt") );
- pNumType->InsertEntry( String::CreateFromAscii("Integer") );
- pNumType->InsertEntry( String::CreateFromAscii("Single") );
- pNumType->InsertEntry( String::CreateFromAscii("Double") );
+ pNumType->InsertEntry( rtl::OUString("Byte") );
+ pNumType->InsertEntry( rtl::OUString("SmallInt") );
+ pNumType->InsertEntry( rtl::OUString("Integer") );
+ pNumType->InsertEntry( rtl::OUString("Single") );
+ pNumType->InsertEntry( rtl::OUString("Double") );
pNumType->SelectEntryPos(2);
InitializeControl(pNumType,HID_TAB_ENT_NUMTYP,true);
break;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index cda3037..a0d53c4 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -132,7 +132,7 @@ namespace
if ( _pPortNumber )
{
- sNewUrl += String::CreateFromAscii(":");
+ sNewUrl += rtl::OUString::createFromAscii(":");
sNewUrl += String::CreateFromInt32(_pPortNumber->GetValue());
}
@@ -524,7 +524,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
if ( sDatabaseName.Len() )
{
- sNewUrl += String::CreateFromAscii("/");
+ sNewUrl += rtl::OUString::createFromAscii("/");
sNewUrl += sDatabaseName;
}
}
@@ -543,7 +543,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
sDatabaseName = pCollection->cutPrefix( pUrlItem->GetValue() );
if ( sDatabaseName.Len() )
{
- sNewUrl += String::CreateFromAscii(":");
+ sNewUrl += rtl::OUString::createFromAscii(":");
sNewUrl += sDatabaseName;
}
}
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 957aa84..a04d977 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -464,9 +464,9 @@ DBG_NAME(OTextConnectionHelper)
{
String sExtension;
if (m_aRBAccessTextFiles.IsChecked())
- sExtension = String::CreateFromAscii("txt");
+ sExtension = rtl::OUString("txt");
else if (m_aRBAccessCSVFiles.IsChecked())
- sExtension = String::CreateFromAscii("csv");
+ sExtension = rtl::OUString("csv");
else
{
sExtension = m_aETOwnExtension.GetText();
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index e19f921..3f859db 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -169,7 +169,7 @@ namespace dbaui
m_aControlDependencies.enableOnRadioCheck( m_aNamedPipeRadio, m_aNamedPipe );
m_aControlDependencies.addController( ::svt::PDialogController(
- new TextResetOperatorController( m_aHostName, String::CreateFromAscii( "localhost" ) )
+ new TextResetOperatorController( m_aHostName, rtl::OUString("localhost") )
) );
// sockets are available on Unix systems only, named pipes only on Windows
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 1a37952..7c36e19 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -328,26 +328,26 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
// create and initialize the defaults
_rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1];
SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults
- *pCounter++ = new SfxStringItem(DSID_NAME, String());
- *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String());
- *pCounter++ = new SfxStringItem(DSID_CONNECTURL, String());
+ *pCounter++ = new SfxStringItem(DSID_NAME, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CONNECTURL, rtl::OUString());
*pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1));
*pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection);
*pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False);
*pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False);
- *pCounter++ = new SfxStringItem(DSID_USER, String());
- *pCounter++ = new SfxStringItem(DSID_PASSWORD, String());
- *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, String());
- *pCounter++ = new SfxStringItem(DSID_CHARSET, String());
+ *pCounter++ = new SfxStringItem(DSID_USER, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_PASSWORD, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CHARSET, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False);
*pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False);
*pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False);
- *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, String());
+ *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_THOUSANDSDELIMITER, String());
- *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, String::CreateFromAscii("txt"));
+ *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, rtl::OUString("txt"));
*pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True);
*pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False);
*pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100);
@@ -356,16 +356,16 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
*pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False);
*pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20);
*pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20);
- *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, String());
- *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, String());
+ *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False);
- *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, String());
- *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, String());
+ *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, rtl::OUString());
*pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389);
*pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100);
*pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False);
- *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, String());
- *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, String());
+ *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, rtl::OUString());
+ *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False);
*pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False);
*pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306);
@@ -377,15 +377,15 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
*pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True);
*pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True);
*pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False);
- *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, String());
+ *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False);
- *pCounter++ = new SfxStringItem(DSID_DATABASENAME, String());
+ *pCounter++ = new SfxStringItem(DSID_DATABASENAME, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True);
*pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True);
*pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False);
- *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, String());
+ *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, rtl::OUString());
*pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True);
- *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, String());
+ *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, rtl::OUString());
*pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT );
*pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100);
*pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False );
@@ -457,7 +457,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
};
OSL_ENSURE(sizeof(aItemInfos)/sizeof(aItemInfos[0]) == DSID_LAST_ITEM_ID,"Invalid Ids!");
- _rpPool = new SfxItemPool(String::CreateFromAscii("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
+ _rpPool = new SfxItemPool(rtl::OUString("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
aItemInfos, _rppDefaults);
_rpPool->FreezeIdRanges();
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 747ac1f..2d8d4b2 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -360,7 +360,7 @@ void ODbaseIndexDialog::Init()
OTableInfo& rTabInfo = m_aTableInfoList.back();
// open the INF file
- aURL.setExtension(String::CreateFromAscii("inf"));
+ aURL.setExtension(rtl::OUString::createFromAscii("inf"));
OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL);
Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) );
aInfFile.SetGroup( aGroupIdent );
@@ -471,7 +471,7 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
}
aURL.SetSmartURL(aDsn);
aURL.Append(aTableName);
- aURL.setExtension(String::CreateFromAscii("inf"));
+ aURL.setExtension(rtl::OUString::createFromAscii("inf"));
OFileNotation aTransformer(aURL.GetURLNoPass(), OFileNotation::N_URL);
Config aInfFile( aTransformer.get(OFileNotation::N_SYSTEM) );
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 6fdbc05..5c917f4 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -226,7 +226,7 @@ DBG_NAME(DirectSQLDialog)
OSL_ENSURE(xStatement.is(), "DirectSQLDialog::implExecuteStatement: no statement returned by the connection!");
// clear the output box
- m_aOutput.SetText(String::CreateFromAscii(""));
+ m_aOutput.SetText(rtl::OUString());
if (xStatement.is())
{
if (::rtl::OUString(_rStatement).toAsciiUpperCase().compareTo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT")),6)==0 && m_pShowOutput->IsChecked())
@@ -287,9 +287,9 @@ DBG_NAME(DirectSQLDialog)
void DirectSQLDialog::addStatusText(const String& _rMessage)
{
String sAppendMessage = String::CreateFromInt32(m_nStatusCount++);
- sAppendMessage += String::CreateFromAscii(": ");
+ sAppendMessage += rtl::OUString(": ");
sAppendMessage += _rMessage;
- sAppendMessage += String::CreateFromAscii("\n\n");
+ sAppendMessage += rtl::OUString("\n\n");
String sCompleteMessage = m_aStatus.GetText();
sCompleteMessage += sAppendMessage;
@@ -302,7 +302,7 @@ DBG_NAME(DirectSQLDialog)
void DirectSQLDialog::addOutputText(const String& _rMessage)
{
String sAppendMessage = _rMessage;
- sAppendMessage += String::CreateFromAscii("\n");
+ sAppendMessage += rtl::OUString("\n");
String sCompleteMessage = m_aOutput.GetText();
sCompleteMessage += sAppendMessage;
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index c87eed4..34939b9 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -597,7 +597,7 @@ namespace dbaui
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0, ::String::CreateFromAscii("sdatabase") );
+ 0, rtl::OUString::createFromAscii("sdatabase") );
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 840a86e..d5f5acc 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -222,7 +222,7 @@ DBG_NAME(OParameterDialog)
LocalResourceAccess aDummy(DLG_PARAMETERS, RSC_MODALDIALOG);
sMessage = String(ModuleRes(STR_COULD_NOT_CONVERT_PARAM));
}
- sMessage.SearchAndReplaceAll(String::CreateFromAscii("$name$"), sName);
+ sMessage.SearchAndReplaceAll(rtl::OUString("$name$"), sName);
ErrorBox(NULL, WB_OK, sMessage).Execute();
m_aParam.GrabFocus();
return 1L;
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 000ff80..e2af63d 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -926,7 +926,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent,
new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO)
};
- SfxItemPool* pPool = new SfxItemPool(String::CreateFromAscii("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults);
+ SfxItemPool* pPool = new SfxItemPool(rtl::OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults);
pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why
pPool->FreezeIdRanges(); // the same
@@ -1007,8 +1007,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent,
//------------------------------------------------------------------------------
const SfxFilter* getStandardDatabaseFilter()
{
- static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
return pFilter;
}
@@ -1401,7 +1400,7 @@ sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText
{
SolarMutexGuard aGuard;
String aMsg = String(ModuleRes(_nText));
- aMsg.SearchAndReplace(String::CreateFromAscii("%1"),String(_sName));
+ aMsg.SearchAndReplace(rtl::OUString("%1"),String(_sName));
OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query);
if ( _bAll )
{
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 60ddd34..4b3078b 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -242,7 +242,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
m_aTypeControl.Show();
m_aTypeControl.Init();
- m_etAuto.SetText(String::CreateFromAscii("10"));
+ m_etAuto.SetText(rtl::OUString("10"));
m_etAuto.SetDecimalDigits(0);
m_pbAuto.SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl));
m_lbColumnNames.EnableMultiSelection(sal_True);
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 02bd3f6..0e9d406 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -941,9 +941,9 @@ namespace
aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
aWorkStr += ::dbtools::quoteName(aQuote, aColumnName);
}
- aWorkStr += ::rtl::OUString(' ');
- aWorkStr += String::CreateFromAscii( ";ASC;DESC" ).GetToken( (sal_uInt16)eOrder );
- aWorkStr += ::rtl::OUString(',');
+ aWorkStr += rtl::OUString(' ');
+ aWorkStr += rtl::OUString( ";ASC;DESC" ).getToken( (sal_uInt16)eOrder, ';' );
+ aWorkStr += rtl::OUString(',');
}
}
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 5d1c492..b7a07cf 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -50,8 +50,8 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::accessibility;
-const String g_strOne = String::CreateFromAscii("1");
-const String g_strZero = String::CreateFromAscii("0");
+#define g_strOne rtl::OUString("1")
+#define g_strZero rtl::OUString("0")
#define DEFAULT_QUERY_COLS 20
#define DEFAULT_SIZE GetTextWidth(g_strZero) * 30
@@ -1122,9 +1122,9 @@ sal_Bool OSelectionBrowseBox::SaveModified()
case DataType::CLOB:
if(aText.GetChar(0) != '\'' || aText.GetChar(aText.Len() -1) != '\'')
{
- aText.SearchAndReplaceAll(String::CreateFromAscii("'"),String::CreateFromAscii("''"));
- String aTmp(String::CreateFromAscii("'"));
- (aTmp += aText) += String::CreateFromAscii("'");
+ aText.SearchAndReplaceAll(rtl::OUString("'"), rtl::OUString("''"));
+ String aTmp(rtl::OUString("'"));
+ (aTmp += aText) += rtl::OUString("'");
aText = aTmp;
}
break;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index a67519e..eb67823 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -242,7 +242,7 @@ namespace dbaui
LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE );
sObjectType = String( ModuleRes( (sal_uInt16)( _nCommandType + 1 ) ) );
}
- sMessageText.SearchAndReplace( String::CreateFromAscii( "$object$" ), sObjectType );
+ sMessageText.SearchAndReplace( rtl::OUString("$object$"), sObjectType );
return sMessageText;
}
}
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index b2c817d..fe295b1 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -108,8 +108,12 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
}
if( pSfxFilter )
- aFilter = ( nFlags == SFX_FILTER_EXPORT ) ? pSfxFilter->GetFilterName() :
- pSfxFilter->GetServiceName();
+ {
+ if (nFlags == SFX_FILTER_EXPORT)
+ aFilter = pSfxFilter->GetFilterName();
+ else
+ aFilter = pSfxFilter->GetServiceName();
+ }
delete pMedium;
return aFilter;
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index e306b89..4549274 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -607,7 +607,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
}
}
- rText.SearchAndReplace( String::CreateFromAscii( "%1" ), String::CreateFromInt32( GetValue() ) );
+ rText.SearchAndReplace( rtl::OUString("%1"), String::CreateFromInt32( GetValue() ) );
return ePres;
}
@@ -679,7 +679,7 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
}
}
- rText.SearchAndReplace( String::CreateFromAscii( "%1" ), String::CreateFromInt32( GetValue() ) );
+ rText.SearchAndReplace( rtl::OUString("%1"), String::CreateFromInt32( GetValue() ) );
return ePres;
}
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index bdfcf4c..3c17047 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -62,7 +62,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
{
*pS = sAutoPath.GetToken( n, ';' );
INetURLObject aPath( *pS );
- aPath.insertName( String::CreateFromAscii("acor") );
+ aPath.insertName(rtl::OUString("acor"));
*pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI);
}
pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath );
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 4df3508..1fbc68c 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -47,8 +47,7 @@ namespace abp
const SfxFilter* lcl_getBaseFilter()
{
- static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
return pFilter;
}
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 9be49b7..58dd7e4 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -96,7 +96,6 @@ using namespace ::com::sun::star::lang;
using namespace ::ucb;
#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar)
-#define C2S(cChar) String::CreateFromAscii(cChar)
Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
{
@@ -198,7 +197,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm)
catch (const Exception& e)
{
#ifdef DBG_UTIL
- String sMsg(String::CreateFromAscii("::getColumns : catched an exception ("));
+ String sMsg(rtl::OUString("::getColumns : catched an exception ("));
sMsg += String(e.Message);
sMsg.AppendAscii(") ...");
OSL_FAIL(rtl::OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr());
@@ -420,7 +419,7 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl));
String sTitle = GetText();
- sTitle.SearchAndReplace(C2S("%1"), pDatMan->getActiveDataTable(), 0);
+ sTitle.SearchAndReplace(rtl::OUString("%1"), pDatMan->getActiveDataTable(), 0);
SetText(sTitle);
aListBoxes[0] = &aIdentifierLB;
@@ -1520,7 +1519,7 @@ void BibDataManager::SetMeAsUidListener()
Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
const ::rtl::OUString* pFields = aFields.getConstArray();
sal_Int32 nCount=aFields.getLength();
- String StrUID(C2S(STR_UID));
+ rtl::OUString StrUID(STR_UID);
::rtl::OUString theFieldName;
for( sal_Int32 i=0; i<nCount; i++ )
{
@@ -1564,7 +1563,7 @@ void BibDataManager::RemoveMeAsUidListener()
Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
const ::rtl::OUString* pFields = aFields.getConstArray();
sal_Int32 nCount=aFields.getLength();
- String StrUID(C2S(STR_UID));
+ rtl::OUString StrUID(STR_UID);
::rtl::OUString theFieldName;
for( sal_Int32 i=0; i<nCount; i++ )
{
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 9efd6fd..4c3cc2b 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -205,8 +205,7 @@ namespace dbp
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
- static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
if ( pFilter )
{
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 8166123..4d119cc 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -401,7 +401,7 @@ namespace pcr
rpButton = new PushButton( m_pTheParent, WB_NOPOINTERFOCUS );
rpButton->SetGetFocusHdl( LINK( this, OBrowserLine, OnButtonFocus ) );
rpButton->SetClickHdl( LINK( this, OBrowserLine, OnButtonClicked ) );
- rpButton->SetText( String::CreateFromAscii( "..." ) );
+ rpButton->SetText(rtl::OUString("..."));
}
rpButton->Show();
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 76ebdd2..46fadd4 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -558,7 +558,7 @@ namespace pcr
{
// find a nice name for it
String sBaseName( PcrRes( RID_STR_BINDING_UI_NAME ) );
- sBaseName += String::CreateFromAscii( " " );
+ sBaseName += rtl::OUString(" ");
String sNewName;
sal_Int32 nNumber = 1;
do
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 707e6d7..66cd10d 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -548,7 +548,7 @@ namespace pcr
{ SID_ATTR_CHAR_FONTLIST, 0 }
};
- _rpPool = new SfxItemPool(String::CreateFromAscii("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID,
+ _rpPool = new SfxItemPool(rtl::OUString("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID,
aItemInfos, _rppDefaults);
_rpPool->FreezeIdRanges();
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5cd7b37..f757ca7 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2893,7 +2893,7 @@ namespace pcr
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0,
- ::String::CreateFromAscii("sdatabase"));
+ rtl::OUString("sdatabase"));
::rtl::OUString sDataSource;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource );
@@ -2903,8 +2903,7 @@ namespace pcr
// is considered to be potentially expensive
aFileDlg.SetDisplayDirectory( sDataSource );
- const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
- const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
+ const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
if ( pFilter )
{
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index f42f186..253ff93 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -725,7 +725,7 @@ namespace pcr
getTypedControlWindow()->SelectEntry( aRgbCol );
if ( !getTypedControlWindow()->IsEntrySelected( aRgbCol ) )
{ // the given color is not part of the list -> insert a new entry with the hex code of the color
- String aStr = String::CreateFromAscii("0x");
+ String aStr = rtl::OUString("0x");
aStr += MakeHexStr(nColor,8);
getTypedControlWindow()->InsertEntry( aRgbCol, aStr );
getTypedControlWindow()->SelectEntry( aRgbCol );
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 1144e83..4eb64df 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -325,7 +325,7 @@ namespace pcr
:ONumericControl( pParent, nWinStyle )
{
getTypedControlWindow()->SetUnit( FUNIT_CUSTOM );
- getTypedControlWindow()->SetCustomUnitText( String::CreateFromAscii( " ms" ) );
+ getTypedControlWindow()->SetCustomUnitText(rtl::OUString(" ms"));
getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) );
}
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 0bc0231..3ace08b 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -1003,7 +1003,7 @@ String Sane::GetOptionUnitName( int n )
SANE_Unit nUnit = mppOptions[n]->unit;
size_t nUnitAsSize = (size_t)nUnit;
if( nUnitAsSize > SAL_N_ELEMENTS( ppUnits ) )
- aText = String::CreateFromAscii( "[unknown units]" );
+ aText = rtl::OUString("[unknown units]");
else
aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() );
return aText;
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index ef2e0b1..ba44645 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -289,7 +289,7 @@ void SaneDlg::InitFields()
else // SANE_UNIT_PIXEL
{
pField->SetValue( (int)fValue, FUNIT_CUSTOM );
- pField->SetCustomUnitText( String::CreateFromAscii( "Pixel" ) );
+ pField->SetCustomUnitText(rtl::OUString("Pixel"));
}
switch( i ) {
case 0: maTopLeft.X() = (int)fValue;break;
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 3945451..37ab1d6 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -386,7 +386,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty
if ( pFontEntry )
{
nFontType = pFontEntry->nFontType;
- aFontDescriptor.Name = String::CreateFromAscii( (char*)pFontEntry->pFontName );
+ aFontDescriptor.Name = rtl::OUString::createFromAscii( (const char*)pFontEntry->pFontName );
}
aFontDescriptor.Height = ( sal_Int16 )( ( mpCGM->pElement->nCharacterHeight * (double)1.50 ) );
if ( nFontType & 1 )
@@ -880,7 +880,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) ));
if( aFirstQuery >>= xText )
{
- String aStr( String::CreateFromAscii( pString ) );
+ String aStr( rtl::OUString::createFromAscii( pString ) );
uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() );
{
@@ -945,7 +945,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla
uno::Any aFirstQuery( aShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0)) );
if( aFirstQuery >>= xText )
{
- String aStr( String::CreateFromAscii( pString ) );
+ String aStr( rtl::OUString::createFromAscii( pString ) );
uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() );
if ( aXTextCursor.is() )
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 88c5278..152d65e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7086,7 +7086,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS
const char* pName = GetInternalServerName_Impl( aStgNm );
String sStarName;
if ( pName )
- sStarName = String::CreateFromAscii( pName );
+ sStarName = rtl::OUString::createFromAscii( pName );
else if ( nConvertFlags )
{
static struct _ObjImpType
@@ -7138,7 +7138,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS
if ( aStgNm == aTypeName )
{
- sStarName = String::CreateFromAscii( pArr->pFactoryNm );
+ sStarName = rtl::OUString::createFromAscii( pArr->pFactoryNm );
break;
}
}
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 0ba8b7e..2120742 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -183,7 +183,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
// flags for checking if conversion is wanted at all (SaveOptions?!)
if( GetFlags() & pArr->nFlag )
{
- pExpFilter = SfxFilterMatcher().GetFilter4FilterName(String::CreateFromAscii(pArr->pFilterNm));
+ pExpFilter = SfxFilterMatcher().GetFilter4FilterName(rtl::OUString::createFromAscii(pArr->pFilterNm));
break;
}
}
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 043aeff..f264f77 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -252,8 +252,8 @@ namespace frm
for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i )
{
aFP.AddFilter(
- String::CreateFromAscii( aExportFormats[i].pDescription ),
- String::CreateFromAscii( aExportFormats[i].pExtension ) );
+ rtl::OUString::createFromAscii( aExportFormats[i].pDescription ),
+ rtl::OUString::createFromAscii( aExportFormats[i].pExtension ) );
}
ErrCode nResult = aFP.Execute();
if ( nResult == 0 )
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index ad23014..ae62547 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -66,9 +66,9 @@ namespace frm
static String getLabelString( sal_uInt16 _nResId )
{
- String sLabel = String::CreateFromAscii( " " );
+ String sLabel = rtl::OUString( " " );
sLabel += String( FRM_RES_STRING( _nResId ) );
- sLabel += String::CreateFromAscii( " " );
+ sLabel += rtl::OUString( " " );
return sLabel;
}
@@ -643,11 +643,11 @@ namespace frm
break;
case FormFeature::MoveAbsolute:
- sItemText = String::CreateFromAscii( "12345678" );
+ sItemText = rtl::OUString( "12345678" );
break;
case FormFeature::TotalRecords:
- sItemText = String::CreateFromAscii( "123456" );
+ sItemText = rtl::OUString( "123456" );
break;
}
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index ae5c11e..c9d47c5 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -1028,7 +1028,7 @@ void Binding::_checkBindingID()
{
// no binding ID? then make one up!
OUString sIDPrefix = getResource( RID_STR_XFORMS_BINDING_UI_NAME );
- sIDPrefix += String::CreateFromAscii( " " );
+ sIDPrefix += rtl::OUString(" ");
sal_Int32 nNumber = 0;
OUString sName;
do
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index b817c45..e2e3059 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -183,12 +183,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = String::CreateFromAscii(",");
+ rStr = rtl::OUString(",");
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = String::CreateFromAscii(";");
+ rStr = rtl::OUString(";");
return true;
}
}
@@ -197,12 +197,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = String::CreateFromAscii(",");
+ rStr = rtl::OUString(",");
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = String::CreateFromAscii(";");
+ rStr = rtl::OUString(";");
return true;
}
}
@@ -211,12 +211,12 @@ bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = String::CreateFromAscii(";");
+ rStr = rtl::OUString(";");
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = String::CreateFromAscii("|");
+ rStr = rtl::OUString("|");
return true;
}
}
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 01b3a94..3cccb59 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -356,7 +356,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
{
String sName = _pFilterDesc->GetName();
if ( _pFilterDesc->isGroupSeparator() )
- sName = String::CreateFromAscii( "------------------------------------------" );
+ sName = rtl::OUString( "------------------------------------------" );
else
sName = _pFilterDesc->GetName();
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 1afe4c2..afe39ba 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -198,15 +198,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
PopupMenu* pHelpMenu = pMergeMenuBar->GetPopupMenu( SID_HELPMENU );
if ( !pHelpMenu )
{
- sal_uInt16 nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" ));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list