[Libreoffice-commits] .: 10 commits - basctl/source cppcanvas/source cui/source dbaccess/source editeng/source framework/source reportdesign/source sc/source svl/inc svl/qa svl/source svtools/source svx/inc sw/source tools/bootstrp tools/inc tools/source unusedcode.easy vbahelper/inc vbahelper/source vcl/source vcl/unx vcl/win writerfilter/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 26 04:34:05 PDT 2012
basctl/source/dlged/dlged.cxx | 4
cppcanvas/source/mtfrenderer/emfplus.cxx | 54
cui/source/customize/cfg.cxx | 10
cui/source/inc/dialmgr.hxx | 5
dbaccess/source/ui/browser/brwctrlr.cxx | 6
editeng/source/editeng/edtspell.cxx | 2
editeng/source/editeng/impedit4.cxx | 6
editeng/source/items/frmitems.cxx | 2
editeng/source/items/paraitem.cxx | 2
framework/source/accelerators/acceleratorconfiguration.cxx | 26
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 12
framework/source/services/autorecovery.cxx | 22
framework/source/services/mediatypedetectionhelper.cxx | 4
reportdesign/source/core/api/ReportDefinition.cxx | 4
sc/source/core/data/dptabres.cxx | 14
sc/source/ui/vba/vbaapplication.cxx | 5
sc/source/ui/vba/vbaapplication.hxx | 2
sc/source/ui/vba/vbaassistant.cxx | 5
sc/source/ui/vba/vbaassistant.hxx | 2
sc/source/ui/vba/vbaaxes.cxx | 5
sc/source/ui/vba/vbaaxes.hxx | 2
sc/source/ui/vba/vbaaxis.cxx | 5
sc/source/ui/vba/vbaaxis.hxx | 2
sc/source/ui/vba/vbaaxistitle.cxx | 5
sc/source/ui/vba/vbaaxistitle.hxx | 2
sc/source/ui/vba/vbaborders.cxx | 10
sc/source/ui/vba/vbaborders.hxx | 2
sc/source/ui/vba/vbacharacters.cxx | 5
sc/source/ui/vba/vbacharacters.hxx | 2
sc/source/ui/vba/vbachart.cxx | 5
sc/source/ui/vba/vbachart.hxx | 2
sc/source/ui/vba/vbachartobject.cxx | 5
sc/source/ui/vba/vbachartobject.hxx | 2
sc/source/ui/vba/vbachartobjects.cxx | 5
sc/source/ui/vba/vbachartobjects.hxx | 2
sc/source/ui/vba/vbacharttitle.cxx | 5
sc/source/ui/vba/vbacharttitle.hxx | 2
sc/source/ui/vba/vbacomment.cxx | 5
sc/source/ui/vba/vbacomment.hxx | 2
sc/source/ui/vba/vbacomments.cxx | 5
sc/source/ui/vba/vbacomments.hxx | 2
sc/source/ui/vba/vbadialog.cxx | 5
sc/source/ui/vba/vbadialog.hxx | 2
sc/source/ui/vba/vbadialogs.cxx | 5
sc/source/ui/vba/vbadialogs.hxx | 2
sc/source/ui/vba/vbafiledialog.cxx | 5
sc/source/ui/vba/vbafiledialog.hxx | 2
sc/source/ui/vba/vbafiledialogselecteditems.cxx | 7
sc/source/ui/vba/vbafiledialogselecteditems.hxx | 2
sc/source/ui/vba/vbafilesearch.cxx | 5
sc/source/ui/vba/vbafilesearch.hxx | 2
sc/source/ui/vba/vbafont.cxx | 5
sc/source/ui/vba/vbafont.hxx | 2
sc/source/ui/vba/vbaformat.cxx | 5
sc/source/ui/vba/vbaformat.hxx | 2
sc/source/ui/vba/vbaformatcondition.cxx | 5
sc/source/ui/vba/vbaformatcondition.hxx | 2
sc/source/ui/vba/vbaformatconditions.cxx | 5
sc/source/ui/vba/vbaformatconditions.hxx | 2
sc/source/ui/vba/vbafoundfiles.cxx | 5
sc/source/ui/vba/vbafoundfiles.hxx | 2
sc/source/ui/vba/vbaglobals.cxx | 5
sc/source/ui/vba/vbaglobals.hxx | 2
sc/source/ui/vba/vbainterior.cxx | 5
sc/source/ui/vba/vbainterior.hxx | 2
sc/source/ui/vba/vbamenu.cxx | 6
sc/source/ui/vba/vbamenu.hxx | 2
sc/source/ui/vba/vbamenubar.cxx | 6
sc/source/ui/vba/vbamenubar.hxx | 2
sc/source/ui/vba/vbamenubars.cxx | 6
sc/source/ui/vba/vbamenubars.hxx | 2
sc/source/ui/vba/vbamenuitem.cxx | 6
sc/source/ui/vba/vbamenuitem.hxx | 2
sc/source/ui/vba/vbamenuitems.cxx | 6
sc/source/ui/vba/vbamenuitems.hxx | 2
sc/source/ui/vba/vbamenus.cxx | 6
sc/source/ui/vba/vbamenus.hxx | 2
sc/source/ui/vba/vbaname.cxx | 5
sc/source/ui/vba/vbaname.hxx | 2
sc/source/ui/vba/vbanames.cxx | 5
sc/source/ui/vba/vbanames.hxx | 2
sc/source/ui/vba/vbaoleobject.cxx | 6
sc/source/ui/vba/vbaoleobject.hxx | 2
sc/source/ui/vba/vbaoleobjects.cxx | 6
sc/source/ui/vba/vbaoleobjects.hxx | 2
sc/source/ui/vba/vbaoutline.cxx | 5
sc/source/ui/vba/vbaoutline.hxx | 2
sc/source/ui/vba/vbapagebreak.cxx | 15
sc/source/ui/vba/vbapagebreak.hxx | 6
sc/source/ui/vba/vbapagebreaks.cxx | 10
sc/source/ui/vba/vbapagebreaks.hxx | 4
sc/source/ui/vba/vbapagesetup.cxx | 5
sc/source/ui/vba/vbapagesetup.hxx | 2
sc/source/ui/vba/vbapivotcache.cxx | 6
sc/source/ui/vba/vbapivotcache.hxx | 2
sc/source/ui/vba/vbapivottable.cxx | 5
sc/source/ui/vba/vbapivottable.hxx | 2
sc/source/ui/vba/vbapivottables.cxx | 5
sc/source/ui/vba/vbapivottables.hxx | 2
sc/source/ui/vba/vbarange.cxx | 7
sc/source/ui/vba/vbarange.hxx | 2
sc/source/ui/vba/vbastyle.cxx | 6
sc/source/ui/vba/vbastyle.hxx | 2
sc/source/ui/vba/vbastyles.cxx | 5
sc/source/ui/vba/vbastyles.hxx | 2
sc/source/ui/vba/vbatextframe.cxx | 5
sc/source/ui/vba/vbatextframe.hxx | 2
sc/source/ui/vba/vbatitle.hxx | 5
sc/source/ui/vba/vbavalidation.cxx | 5
sc/source/ui/vba/vbavalidation.hxx | 2
sc/source/ui/vba/vbawindow.cxx | 5
sc/source/ui/vba/vbawindow.hxx | 2
sc/source/ui/vba/vbawindows.cxx | 5
sc/source/ui/vba/vbawindows.hxx | 2
sc/source/ui/vba/vbaworkbook.cxx | 5
sc/source/ui/vba/vbaworkbook.hxx | 2
sc/source/ui/vba/vbaworkbooks.cxx | 5
sc/source/ui/vba/vbaworkbooks.hxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 6
sc/source/ui/vba/vbaworksheet.hxx | 2
sc/source/ui/vba/vbaworksheets.cxx | 5
sc/source/ui/vba/vbaworksheets.hxx | 2
sc/source/ui/vba/vbawsfunction.cxx | 5
sc/source/ui/vba/vbawsfunction.hxx | 2
svl/inc/svl/cntwall.hxx | 10
svl/inc/svl/httpcook.hxx | 8
svl/inc/svl/itempool.hxx | 4
svl/inc/svl/poolitem.hxx | 13
svl/inc/svl/urihelper.hxx | 13
svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx | 395 ----
svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx | 73
svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx | 239 --
svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx | 801 ----------
svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx | 206 --
svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx | 738 ---------
svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx | 87 -
svl/qa/complex/ConfigItems/helper/UserOptTest.cxx | 269 ---
svl/qa/complex/ConfigItems/helper/UserOptTest.hxx | 73
svl/source/inc/poolio.hxx | 4
svl/source/items/cntwall.cxx | 4
svl/source/items/ctypeitm.cxx | 3
svl/source/items/itempool.cxx | 8
svl/source/items/macitem.cxx | 4
svl/source/items/poolio.cxx | 14
svl/source/items/poolitem.cxx | 17
svl/source/items/sfontitm.cxx | 4
svl/source/items/slstitm.cxx | 2
svl/source/items/stritem.cxx | 3
svl/source/misc/urihelper.cxx | 80
svtools/source/config/accessibilityoptions.cxx | 14
svtools/source/inc/configitems/accessibilityoptions_const.hxx | 51
svx/inc/svx/dialmgr.hxx | 3
sw/source/ui/vba/vbaaddin.cxx | 5
sw/source/ui/vba/vbaaddin.hxx | 2
sw/source/ui/vba/vbaaddins.cxx | 5
sw/source/ui/vba/vbaaddins.hxx | 2
sw/source/ui/vba/vbaapplication.cxx | 5
sw/source/ui/vba/vbaapplication.hxx | 2
sw/source/ui/vba/vbaautotextentry.cxx | 10
sw/source/ui/vba/vbaautotextentry.hxx | 4
sw/source/ui/vba/vbabookmark.cxx | 5
sw/source/ui/vba/vbabookmark.hxx | 2
sw/source/ui/vba/vbabookmarks.cxx | 5
sw/source/ui/vba/vbabookmarks.hxx | 2
sw/source/ui/vba/vbaborders.cxx | 11
sw/source/ui/vba/vbaborders.hxx | 2
sw/source/ui/vba/vbacell.cxx | 5
sw/source/ui/vba/vbacell.hxx | 2
sw/source/ui/vba/vbacells.cxx | 5
sw/source/ui/vba/vbacells.hxx | 2
sw/source/ui/vba/vbacheckbox.cxx | 5
sw/source/ui/vba/vbacheckbox.hxx | 2
sw/source/ui/vba/vbacolumn.cxx | 5
sw/source/ui/vba/vbacolumn.hxx | 2
sw/source/ui/vba/vbacolumns.cxx | 5
sw/source/ui/vba/vbacolumns.hxx | 2
sw/source/ui/vba/vbadialog.cxx | 5
sw/source/ui/vba/vbadialog.hxx | 2
sw/source/ui/vba/vbadialogs.cxx | 5
sw/source/ui/vba/vbadialogs.hxx | 2
sw/source/ui/vba/vbadocument.cxx | 6
sw/source/ui/vba/vbadocument.hxx | 2
sw/source/ui/vba/vbadocumentproperties.cxx | 17
sw/source/ui/vba/vbadocumentproperties.hxx | 4
sw/source/ui/vba/vbadocuments.cxx | 5
sw/source/ui/vba/vbadocuments.hxx | 2
sw/source/ui/vba/vbafield.cxx | 10
sw/source/ui/vba/vbafield.hxx | 4
sw/source/ui/vba/vbafind.cxx | 5
sw/source/ui/vba/vbafind.hxx | 2
sw/source/ui/vba/vbafont.cxx | 5
sw/source/ui/vba/vbafont.hxx | 2
sw/source/ui/vba/vbaformfield.cxx | 5
sw/source/ui/vba/vbaformfield.hxx | 2
sw/source/ui/vba/vbaformfields.cxx | 5
sw/source/ui/vba/vbaformfields.hxx | 2
sw/source/ui/vba/vbaframe.cxx | 5
sw/source/ui/vba/vbaframe.hxx | 2
sw/source/ui/vba/vbaframes.cxx | 5
sw/source/ui/vba/vbaframes.hxx | 2
sw/source/ui/vba/vbaglobals.cxx | 5
sw/source/ui/vba/vbaglobals.hxx | 2
sw/source/ui/vba/vbaheaderfooter.cxx | 5
sw/source/ui/vba/vbaheaderfooter.hxx | 2
sw/source/ui/vba/vbaheadersfooters.cxx | 5
sw/source/ui/vba/vbaheadersfooters.hxx | 2
sw/source/ui/vba/vbalistformat.cxx | 5
sw/source/ui/vba/vbalistformat.hxx | 2
sw/source/ui/vba/vbalistgalleries.cxx | 5
sw/source/ui/vba/vbalistgalleries.hxx | 2
sw/source/ui/vba/vbalistgallery.cxx | 5
sw/source/ui/vba/vbalistgallery.hxx | 2
sw/source/ui/vba/vbalistlevel.cxx | 5
sw/source/ui/vba/vbalistlevel.hxx | 2
sw/source/ui/vba/vbalistlevels.cxx | 5
sw/source/ui/vba/vbalistlevels.hxx | 2
sw/source/ui/vba/vbalisttemplate.cxx | 5
sw/source/ui/vba/vbalisttemplate.hxx | 2
sw/source/ui/vba/vbalisttemplates.cxx | 5
sw/source/ui/vba/vbalisttemplates.hxx | 2
sw/source/ui/vba/vbaoptions.cxx | 6
sw/source/ui/vba/vbaoptions.hxx | 2
sw/source/ui/vba/vbapagesetup.cxx | 5
sw/source/ui/vba/vbapagesetup.hxx | 2
sw/source/ui/vba/vbapane.cxx | 5
sw/source/ui/vba/vbapane.hxx | 2
sw/source/ui/vba/vbapanes.cxx | 5
sw/source/ui/vba/vbapanes.hxx | 2
sw/source/ui/vba/vbaparagraph.cxx | 10
sw/source/ui/vba/vbaparagraph.hxx | 4
sw/source/ui/vba/vbaparagraphformat.cxx | 5
sw/source/ui/vba/vbaparagraphformat.hxx | 2
sw/source/ui/vba/vbarange.cxx | 6
sw/source/ui/vba/vbarange.hxx | 2
sw/source/ui/vba/vbareplacement.cxx | 5
sw/source/ui/vba/vbareplacement.hxx | 2
sw/source/ui/vba/vbarevision.cxx | 5
sw/source/ui/vba/vbarevision.hxx | 2
sw/source/ui/vba/vbarevisions.cxx | 5
sw/source/ui/vba/vbarevisions.hxx | 2
sw/source/ui/vba/vbarow.cxx | 5
sw/source/ui/vba/vbarow.hxx | 2
sw/source/ui/vba/vbarows.cxx | 5
sw/source/ui/vba/vbarows.hxx | 2
sw/source/ui/vba/vbasection.cxx | 5
sw/source/ui/vba/vbasection.hxx | 2
sw/source/ui/vba/vbasections.cxx | 5
sw/source/ui/vba/vbasections.hxx | 2
sw/source/ui/vba/vbaselection.cxx | 5
sw/source/ui/vba/vbaselection.hxx | 2
sw/source/ui/vba/vbastyle.cxx | 5
sw/source/ui/vba/vbastyle.hxx | 2
sw/source/ui/vba/vbastyles.cxx | 5
sw/source/ui/vba/vbastyles.hxx | 2
sw/source/ui/vba/vbasystem.cxx | 5
sw/source/ui/vba/vbasystem.hxx | 2
sw/source/ui/vba/vbatable.cxx | 5
sw/source/ui/vba/vbatable.hxx | 2
sw/source/ui/vba/vbatableofcontents.cxx | 5
sw/source/ui/vba/vbatableofcontents.hxx | 2
sw/source/ui/vba/vbatables.cxx | 5
sw/source/ui/vba/vbatables.hxx | 2
sw/source/ui/vba/vbatablesofcontents.cxx | 5
sw/source/ui/vba/vbatablesofcontents.hxx | 2
sw/source/ui/vba/vbatabstop.cxx | 5
sw/source/ui/vba/vbatabstop.hxx | 2
sw/source/ui/vba/vbatabstops.cxx | 5
sw/source/ui/vba/vbatabstops.hxx | 2
sw/source/ui/vba/vbatemplate.cxx | 5
sw/source/ui/vba/vbatemplate.hxx | 2
sw/source/ui/vba/vbavariable.cxx | 5
sw/source/ui/vba/vbavariable.hxx | 2
sw/source/ui/vba/vbavariables.cxx | 5
sw/source/ui/vba/vbavariables.hxx | 2
sw/source/ui/vba/vbaview.cxx | 5
sw/source/ui/vba/vbaview.hxx | 2
sw/source/ui/vba/vbawindow.cxx | 5
sw/source/ui/vba/vbawindow.hxx | 2
sw/source/ui/vba/vbawrapformat.cxx | 5
sw/source/ui/vba/vbawrapformat.hxx | 2
tools/bootstrp/cppdep.cxx | 2
tools/inc/tools/table.hxx | 3
tools/source/memtools/table.cxx | 15
unusedcode.easy | 17
vbahelper/inc/vbahelper/vbaapplicationbase.hxx | 2
vbahelper/inc/vbahelper/vbadocumentbase.hxx | 2
vbahelper/inc/vbahelper/vbahelperinterface.hxx | 9
vbahelper/inc/vbahelper/vbashape.hxx | 2
vbahelper/inc/vbahelper/vbashaperange.hxx | 2
vbahelper/inc/vbahelper/vbashapes.hxx | 2
vbahelper/inc/vbahelper/vbatextframe.hxx | 2
vbahelper/inc/vbahelper/vbawindowbase.hxx | 2
vbahelper/source/msforms/vbabutton.cxx | 5
vbahelper/source/msforms/vbabutton.hxx | 2
vbahelper/source/msforms/vbacheckbox.cxx | 5
vbahelper/source/msforms/vbacheckbox.hxx | 2
vbahelper/source/msforms/vbacombobox.cxx | 6
vbahelper/source/msforms/vbacombobox.hxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 5
vbahelper/source/msforms/vbacontrol.hxx | 2
vbahelper/source/msforms/vbaframe.hxx | 2
vbahelper/source/msforms/vbaimage.cxx | 5
vbahelper/source/msforms/vbaimage.hxx | 2
vbahelper/source/msforms/vbalabel.cxx | 5
vbahelper/source/msforms/vbalabel.hxx | 2
vbahelper/source/msforms/vbalistbox.cxx | 5
vbahelper/source/msforms/vbalistbox.hxx | 2
vbahelper/source/msforms/vbamultipage.cxx | 6
vbahelper/source/msforms/vbamultipage.hxx | 2
vbahelper/source/msforms/vbapages.cxx | 5
vbahelper/source/msforms/vbapages.hxx | 2
vbahelper/source/msforms/vbaprogressbar.cxx | 5
vbahelper/source/msforms/vbaprogressbar.hxx | 2
vbahelper/source/msforms/vbaradiobutton.cxx | 5
vbahelper/source/msforms/vbaradiobutton.hxx | 2
vbahelper/source/msforms/vbascrollbar.cxx | 5
vbahelper/source/msforms/vbascrollbar.hxx | 2
vbahelper/source/msforms/vbaspinbutton.cxx | 5
vbahelper/source/msforms/vbaspinbutton.hxx | 2
vbahelper/source/msforms/vbasystemaxcontrol.cxx | 5
vbahelper/source/msforms/vbasystemaxcontrol.hxx | 2
vbahelper/source/msforms/vbatextbox.cxx | 5
vbahelper/source/msforms/vbatextbox.hxx | 2
vbahelper/source/msforms/vbatogglebutton.cxx | 5
vbahelper/source/msforms/vbatogglebutton.hxx | 2
vbahelper/source/msforms/vbauserform.cxx | 5
vbahelper/source/msforms/vbauserform.hxx | 2
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 7
vbahelper/source/vbahelper/vbacolorformat.cxx | 6
vbahelper/source/vbahelper/vbacolorformat.hxx | 2
vbahelper/source/vbahelper/vbacommandbar.cxx | 11
vbahelper/source/vbahelper/vbacommandbar.hxx | 4
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 17
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 6
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 11
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx | 4
vbahelper/source/vbahelper/vbacommandbars.cxx | 6
vbahelper/source/vbahelper/vbacommandbars.hxx | 2
vbahelper/source/vbahelper/vbadocumentbase.cxx | 5
vbahelper/source/vbahelper/vbafillformat.cxx | 6
vbahelper/source/vbahelper/vbafillformat.hxx | 2
vbahelper/source/vbahelper/vbalineformat.cxx | 6
vbahelper/source/vbahelper/vbalineformat.hxx | 2
vbahelper/source/vbahelper/vbapictureformat.cxx | 6
vbahelper/source/vbahelper/vbapictureformat.hxx | 2
vbahelper/source/vbahelper/vbashape.cxx | 6
vbahelper/source/vbahelper/vbashaperange.cxx | 5
vbahelper/source/vbahelper/vbashapes.cxx | 6
vbahelper/source/vbahelper/vbatextframe.cxx | 5
vbahelper/source/vbahelper/vbawindowbase.cxx | 5
vcl/source/control/combobox.cxx | 4
vcl/source/control/lstbox.cxx | 2
vcl/source/gdi/jobset.cxx | 4
vcl/source/window/mnemonic.cxx | 7
vcl/unx/generic/app/i18n_ic.cxx | 2
vcl/win/source/window/salframe.cxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7
xmloff/source/draw/ximpstyl.cxx | 28
xmloff/source/draw/ximpstyl.hxx | 2
359 files changed, 741 insertions(+), 3863 deletions(-)
New commits:
commit e443216ce2eeb2d4c7463bb019eed32f5ca4ad1c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 26 10:18:32 2012 +0100
readUnicodeString can just return the string
seeing as no-one checks the return value, we don't need
the intermediate temporary string
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index c90e0f2..446d5ca 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -213,7 +213,7 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
SdrLayerAdmin& rAdmin = pDlgEdModel->GetLayerAdmin();
rAdmin.NewLayer( rAdmin.GetControlLayerName() );
- rAdmin.NewLayer( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ) );
+ rAdmin.NewLayer( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenLayer")) );
pDlgEdPage = new DlgEdPage( *pDlgEdModel );
pDlgEdModel->InsertPage( pDlgEdPage );
@@ -270,7 +270,7 @@ void DlgEditor::SetWindow( Window* pWindow_ )
pDlgEdView = new DlgEdView( pDlgEdModel, pWindow_, this );
pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0));
- pDlgEdView->SetLayerVisible( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), sal_False );
+ pDlgEdView->SetLayerVisible( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenLayer")), sal_False );
pDlgEdView->SetMoveSnapOnlyTopLeft( sal_True );
pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4c92728..53e58df 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -748,17 +748,19 @@ namespace cppcanvas
filter.ImportGraphic (graphic, String (), mfStream);
// debug code - write the stream to debug file /tmp/emf-stream.emf
- EMFP_DEBUG(mfStream.Seek(0);
- static int emfp_debug_stream_numnber = 0;
- UniString emfp_debug_filename = UniString::CreateFromAscii( "/tmp/emf-embedded-stream" );
- emfp_debug_filename.Append( UniString::CreateFromInt32( emfp_debug_stream_numnber++ ));
- emfp_debug_filename.Append( UniString::CreateFromAscii( ".emf" ));
-
- SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC );
-
- mfStream >> file;
- file.Flush();
- file.Close());
+ EMFP_DEBUG(
+ mfStream.Seek(0);
+ static int emfp_debug_stream_numnber = 0;
+ rtl::OUString emfp_debug_filename("/tmp/emf-embedded-stream");
+ emfp_debug_filename += rtl::OUString::valueOf(emfp_debug_stream_numnber++);
+ emfp_debug_filename += rtl::OUString(".emf");
+
+ SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC );
+
+ mfStream >> file;
+ file.Flush();
+ file.Close()
+ );
}
}
};
@@ -766,33 +768,33 @@ namespace cppcanvas
struct EMFPFont : public EMFPObject
{
sal_uInt32 version;
- float emSize;
- sal_uInt32 sizeUnit;
- sal_Int32 fontFlags;
- rtl::OUString family;
+ float emSize;
+ sal_uInt32 sizeUnit;
+ sal_Int32 fontFlags;
+ rtl::OUString family;
void Read (SvMemoryStream &s)
{
sal_uInt32 header;
- sal_uInt32 reserved;
- sal_uInt32 length;
+ sal_uInt32 reserved;
+ sal_uInt32 length;
s >> header >> emSize >> sizeUnit >> fontFlags >> reserved >> length;
- OSL_ASSERT( ( header >> 12 ) == 0xdbc01 );
+ OSL_ASSERT( ( header >> 12 ) == 0xdbc01 );
EMFP_DEBUG (printf ("EMF+\tfont\nEMF+\theader: 0x%08x version: 0x%08x size: %f unit: 0x%08x\n",(unsigned int) header >> 12, (unsigned int)header & 0x1fff, emSize, (unsigned int)sizeUnit));
EMFP_DEBUG (printf ("EMF+\tflags: 0x%08x reserved: 0x%08x length: 0x%08x\n", (unsigned int)fontFlags, (unsigned int)reserved, (unsigned int)length));
- if( length > 0 && length < 0x4000 ) {
- sal_Unicode *chars = (sal_Unicode *) alloca( sizeof( sal_Unicode ) * length );
+ if( length > 0 && length < 0x4000 ) {
+ sal_Unicode *chars = (sal_Unicode *) alloca( sizeof( sal_Unicode ) * length );
- for( sal_uInt32 i = 0; i < length; i++ )
- s >> chars[ i ];
+ for( sal_uInt32 i = 0; i < length; i++ )
+ s >> chars[ i ];
- family = ::rtl::OUString( chars, length );
- EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
- }
+ family = ::rtl::OUString( chars, length );
+ EMFP_DEBUG (printf ("EMF+\tfamily: %s\n", rtl::OUStringToOString( family, RTL_TEXTENCODING_UTF8).getStr()));
+ }
}
};
@@ -893,7 +895,7 @@ namespace cppcanvas
rState.isFillColorSet = true;
rState.isLineColorSet = false;
- SET_FILL_COLOR(brushIndexOrColor);
+ SET_FILL_COLOR(brushIndexOrColor);
pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) );
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 29d3eef..9737fbb 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -34,9 +34,9 @@
// forward ---------------------------------------------------------------
-#define CUI_MGR() (*CuiResMgr::GetResMgr())
+#define CUI_MGR() (*CuiResMgr::GetResMgr())
#define CUI_RES(i) ResId(i,CUI_MGR())
-#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSTR(i) ResId::toString(ResId(i,CUI_MGR()))
class ResMgr;
struct CuiResMgr
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index a2340aa..2963f12 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -601,7 +601,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
{
SfxItemPool* pPool = &pImpEE->GetEditDoc().GetItemPool();
while ( pPool->GetSecondaryPool() &&
- !pPool->GetName().EqualsAscii( "EditEngineItemPool" ) )
+ !pPool->GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EditEngineItemPool")) )
{
pPool = pPool->GetSecondaryPool();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index e8c2c1b..5a23d62 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -169,12 +169,14 @@ EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel )
// The SvRTF parser expects the Which-mapping passed on in the pool, not
// dependant on a secondary.
SfxItemPool* pPool = &aEditDoc.GetItemPool();
- while ( pPool->GetSecondaryPool() && !pPool->GetName().EqualsAscii( "EditEngineItemPool" ) )
+ while (pPool->GetSecondaryPool() && !pPool->GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EditEngineItemPool")))
{
pPool = pPool->GetSecondaryPool();
}
- DBG_ASSERT( pPool && pPool->GetName().EqualsAscii( "EditEngineItemPool" ), "ReadRTF: no EditEnginePool!" );
+
+ DBG_ASSERT(pPool && pPool->GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EditEngineItemPool")),
+ "ReadRTF: no EditEnginePool!");
EditRTFParserRef xPrsr = new EditRTFParser( rInput, aSel, *pPool, this );
SvParserState eState = xPrsr->CallParser();
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index c2dbce8..3cca643 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -4108,7 +4108,7 @@ SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich )
{
aColor = rItem.GetColor();
- if( rItem.GetBitmapURL().Len() )
+ if (!rItem.GetBitmapURL().isEmpty())
{
pStrLink = new String( rItem.GetBitmapURL() );
SetGraphicPos( WallpaperStyle2GraphicPos((WallpaperStyle)rItem.GetStyle() ) );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 36986d1..d7736d1 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1197,7 +1197,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
const SfxItemPool *pPool = SfxItemPool::GetStoringPool();
const bool bStoreDefTabs = pPool
- && pPool->GetName().EqualsAscii("SWG")
+ && pPool->GetName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SWG"))
&& ::IsDefaultItem( this );
const short nTabs = Count();
diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index 5e78286..8e3bfd1 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -40,9 +40,9 @@ class SvStream;
class SVL_DLLPUBLIC CntWallpaperItem : public SfxPoolItem
{
private:
- UniString _aURL;
+ rtl::OUString _aURL;
Color _nColor;
- sal_uInt16 _nStyle;
+ sal_uInt16 _nStyle;
public:
TYPEINFO();
@@ -64,13 +64,13 @@ public:
virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 );
- void SetBitmapURL( const UniString& rURL ) { _aURL = rURL; }
+ void SetBitmapURL( const rtl::OUString& rURL ) { _aURL = rURL; }
void SetColor( Color nColor ) { _nColor = nColor; }
void SetStyle( sal_uInt16 nStyle ) { _nStyle = nStyle; }
- const UniString& GetBitmapURL() const { return _aURL; }
+ const rtl::OUString& GetBitmapURL() const { return _aURL; }
Color GetColor() const { return _nColor; }
- sal_uInt16 GetStyle() const { return _nStyle; }
+ sal_uInt16 GetStyle() const { return _nStyle; }
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx
index 40bf4e4..2da2668 100644
--- a/svl/inc/svl/httpcook.hxx
+++ b/svl/inc/svl/httpcook.hxx
@@ -106,10 +106,10 @@ struct CntHTTPCookie
void read (SvStream& rStrm, bool bUnicode)
{
- SfxPoolItem::readUnicodeString(rStrm, m_aName, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aValue, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aDomain, bUnicode);
- SfxPoolItem::readUnicodeString(rStrm, m_aPath, bUnicode);
+ m_aName = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
+ m_aValue = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
+ m_aDomain = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
+ m_aPath = SfxPoolItem::readUnicodeString(rStrm, bUnicode);
sal_uInt32 nValue = 0;
rStrm >> nValue;
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index 91389cf..15e88e9 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -144,7 +144,7 @@ protected:
public:
SfxItemPool( const SfxItemPool &rPool,
sal_Bool bCloneStaticDefaults = sal_False );
- SfxItemPool( const UniString &rName,
+ SfxItemPool( const rtl::OUString &rName,
sal_uInt16 nStart, sal_uInt16 nEnd,
const SfxItemInfo *pItemInfos,
SfxPoolItem **pDefaults = 0,
@@ -173,7 +173,7 @@ public:
const IntlWrapper * pIntlWrapper
= 0 ) const;
virtual SfxItemPool* Clone() const;
- const UniString& GetName() const;
+ const rtl::OUString& GetName() const;
virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 );
virtual void Remove( const SfxPoolItem& );
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 3e41732..bcc96c1 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -245,7 +245,7 @@ public:
@return True if the string was successfuly read and reconstructed.
*/
- static bool readByteString(SvStream & rStream, UniString & rString);
+ static rtl::OUString readByteString(SvStream & rStream);
/** Write a byte string representation of a Unicode string into a stream.
@@ -255,7 +255,7 @@ public:
@param rString Some Unicode string.
*/
static void writeByteString(SvStream & rStream,
- UniString const & rString);
+ const rtl::OUString& rString);
/** Read in a Unicode string from either a streamed Unicode or byte string
representation.
@@ -263,15 +263,12 @@ public:
@param rStream Some (input) stream. If bUnicode is false, its
Stream/TargetCharSets must be set to correct values!
- @param rString On success, returns the reconstructed Unicode string.
-
@param bUnicode Whether to read in a stream Unicode (true) or byte
string (false) representation.
- @return True if the string was successfuly read and reconstructed.
+ @return On success, returns the reconstructed Unicode string.
*/
- static bool readUnicodeString(SvStream & rStream, UniString & rString,
- bool bUnicode);
+ static rtl::OUString readUnicodeString(SvStream & rStream, bool bUnicode);
/** Write a Unicode string representation of a Unicode string into a
stream.
@@ -281,7 +278,7 @@ public:
@param rString Some Unicode string.
*/
static void writeUnicodeString(SvStream & rStream,
- UniString const & rString);
+ const rtl::OUString& rString);
private:
SfxPoolItem& operator=( const SfxPoolItem& ); // n.i.!!
diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx
index 61be9f6..087222f 100644
--- a/svl/inc/svl/urihelper.hxx
+++ b/svl/inc/svl/urihelper.hxx
@@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star {
} } }
namespace rtl { class OUString; }
class CharClass;
-class UniString;
//============================================================================
namespace URIHelper {
@@ -61,9 +60,9 @@ namespace URIHelper {
existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
if you want to generate file URLs without checking for their existence.
*/
-SVL_DLLPUBLIC UniString
+SVL_DLLPUBLIC rtl::OUString
SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
- UniString const & rTheRelURIRef,
+ rtl::OUString const & rTheRelURIRef,
Link const & rMaybeFileHdl = Link(),
bool bCheckFileExists = true,
bool bIgnoreFragment = false,
@@ -133,8 +132,8 @@ SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative(
rtl::OUString const & baseUriReference, rtl::OUString const & uriReference);
//============================================================================
-SVL_DLLPUBLIC UniString
-FindFirstURLInText(UniString const & rText,
+SVL_DLLPUBLIC rtl::OUString
+FindFirstURLInText(rtl::OUString const & rText,
xub_StrLen & rBegin,
xub_StrLen & rEnd,
CharClass const & rCharClass,
@@ -170,8 +169,8 @@ FindFirstURLInText(UniString const & rText,
@return The input URI with any password component removed.
*/
-SVL_DLLPUBLIC UniString
-removePassword(UniString const & rURI,
+SVL_DLLPUBLIC rtl::OUString
+removePassword(rtl::OUString const & rURI,
INetURLObject::EncodeMechanism eEncodeMechanism
= INetURLObject::WAS_ENCODED,
INetURLObject::DecodeMechanism eDecodeMechanism
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 7c2cfc6..d59792e 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -77,7 +77,7 @@ struct SfxItemPool_Impl
SfxBroadcaster aBC;
std::vector<SfxPoolItemArray_Impl*> maPoolItems;
std::vector<SfxItemPoolUser*> maSfxItemPoolUsers; /// ObjectUser section
- UniString aName;
+ rtl::OUString aName;
SfxPoolItem** ppPoolDefaults;
SfxPoolItem** ppStaticDefaults;
SfxItemPool* mpMaster;
@@ -98,7 +98,7 @@ struct SfxItemPool_Impl
bool bStreaming; // in Load() bzw. Store()
bool mbPersistentRefCounts;
- SfxItemPool_Impl( SfxItemPool* pMaster, const UniString& rName, sal_uInt16 nStart, sal_uInt16 nEnd )
+ SfxItemPool_Impl( SfxItemPool* pMaster, const rtl::OUString& rName, sal_uInt16 nStart, sal_uInt16 nEnd )
: maPoolItems(nEnd - nStart + 1, static_cast<SfxPoolItemArray_Impl*>(NULL))
, aName(rName)
, ppPoolDefaults(new SfxPoolItem* [nEnd - nStart + 1])
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 76660e0..3eb89d8 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -54,7 +54,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn
{
// Okay, data were stored by CntWallpaperItem.
- readUnicodeString(rStream, _aURL, nVersion >= 1);
+ _aURL = readUnicodeString(rStream, nVersion >= 1);
// !!! Color stream operators do not work - they discard any
// transparency info !!!
_nColor.Read( rStream, sal_True );
@@ -76,7 +76,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn
}
// Read SfxWallpaperItem's string member _aURL.
- readUnicodeString(rStream, _aURL, false);
+ _aURL = readUnicodeString(rStream, false);
// "Read" SfxWallpaperItem's string member _aFilter.
read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index d34c1db..bb8fc94 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -83,8 +83,7 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream,
{
// CntContentTypeItem used to be derived from CntStringItem, so take that
// into account:
- UniString aValue;
- readUnicodeString(rStream, aValue, nItemVersion >= 1);
+ rtl::OUString aValue = readUnicodeString(rStream, nItemVersion >= 1);
sal_uInt32 nMagic = 0;
rStream >> nMagic;
if (nMagic == CNTSTRINGITEM_STREAM_MAGIC)
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 7de7e80..ff495f2 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -103,10 +103,10 @@ SfxBroadcaster& SfxItemPool::BC()
SfxItemPool::SfxItemPool
(
- UniString const & rName, /* Name des Pools zur Idetifikation
+ const rtl::OUString& rName, /* Name des Pools zur Idetifikation
im File-Format */
- sal_uInt16 nStartWhich, /* erste Which-Id des Pools */
- sal_uInt16 nEndWhich, /* letzte Which-Id des Pools */
+ sal_uInt16 nStartWhich, /* erste Which-Id des Pools */
+ sal_uInt16 nEndWhich, /* letzte Which-Id des Pools */
const SfxItemInfo* pInfos, /* SID-Map und Item-Flags */
SfxPoolItem** pDefaults, /* Pointer auf statische Defaults,
wird direkt vom Pool referenziert,
@@ -452,7 +452,7 @@ void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric )
pImp->eDefMetric = eNewMetric;
}
-const UniString& SfxItemPool::GetName() const
+const rtl::OUString& SfxItemPool::GetName() const
{
return pImp->aName;
}
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index c2c4101..32bbad8 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -142,8 +142,8 @@ SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, sal_uInt16 nVersion )
sal_uInt16 nCurKey, eType = STARBASIC;
String aLibName, aMacName;
rStrm >> nCurKey;
- SfxPoolItem::readByteString(rStrm, aLibName);
- SfxPoolItem::readByteString(rStrm, aMacName);
+ aLibName = SfxPoolItem::readByteString(rStrm);
+ aMacName = SfxPoolItem::readByteString(rStrm);
if( SVX_MACROTBL_VERSION40 <= nVersion )
rStrm >> eType;
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 02eb7f4..92e1d7e 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -559,7 +559,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
// Einzel-Header
int bOwnPool = sal_True;
- UniString aExternName;
+ rtl::OUString aExternName;
{
// Header-Record suchen
SfxMiniRecordReader aPoolHeaderRec( &rStream, SFX_ITEMPOOL_REC_HEADER );
@@ -571,7 +571,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
// Header-lesen
rStream >> pImp->nLoadingVersion;
- SfxPoolItem::readByteString(rStream, aExternName);
+ aExternName = SfxPoolItem::readByteString(rStream);
bOwnPool = aExternName == pImp->aName;
//! solange wir keine fremden Pools laden k"onnen
@@ -714,7 +714,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
// wenn nicht own-Pool, dann kein Name
if ( aExternName != pImp->aName )
- pImp->aName.Erase();
+ pImp->aName = rtl::OUString();
pImp->bStreaming = sal_False;
return rStream;
@@ -743,10 +743,10 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
}
sal_uInt32 nAttribSize(0);
int bOwnPool = sal_True;
- UniString aExternName;
+ rtl::OUString aExternName;
if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 2 )
rStream >> pImp->nLoadingVersion;
- SfxPoolItem::readByteString(rStream, aExternName);
+ aExternName = SfxPoolItem::readByteString(rStream);
bOwnPool = aExternName == pImp->aName;
pImp->bStreaming = sal_True;
@@ -1020,7 +1020,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
}
if ( aExternName != pImp->aName )
- pImp->aName.Erase();
+ pImp->aName = rtl::OUString();
pImp->bStreaming = sal_False;
return rStream;
@@ -1092,7 +1092,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
// auf jeden Fall aufgel"ost werden.
if ( !pRefPool )
pRefPool = this;
- bool bResolvable = pRefPool->GetName().Len() > 0;
+ bool bResolvable = !pRefPool->GetName().isEmpty();
if ( !bResolvable )
{
// Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 05ed277..c1275fc 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -185,34 +185,29 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
//============================================================================
// static
-bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString)
+rtl::OUString SfxPoolItem::readByteString(SvStream& rStream)
{
- rString = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
- return rStream.GetError() == ERRCODE_NONE;
+ return rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
}
//============================================================================
// static
-void SfxPoolItem::writeByteString(SvStream & rStream,
- UniString const & rString)
+void SfxPoolItem::writeByteString(SvStream & rStream, const rtl::OUString& rString)
{
rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet());
}
//============================================================================
// static
-bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString,
- bool bUnicode)
+rtl::OUString SfxPoolItem::readUnicodeString(SvStream & rStream, bool bUnicode)
{
- rString = rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 :
+ return rStream.ReadUniOrByteString(bUnicode ? RTL_TEXTENCODING_UCS2 :
rStream.GetStreamCharSet());
- return rStream.GetError() == ERRCODE_NONE;
}
//============================================================================
// static
-void SfxPoolItem::writeUnicodeString(SvStream & rStream,
- UniString const & rString)
+void SfxPoolItem::writeUnicodeString(SvStream & rStream, const rtl::OUString& rString)
{
rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2);
}
diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx
index 0013671..1077c93 100644
--- a/svl/source/items/sfontitm.cxx
+++ b/svl/source/items/sfontitm.cxx
@@ -77,8 +77,8 @@ SfxPoolItem * SfxFontItem::Create(SvStream & rStream, sal_uInt16) const
SfxFontItem * pItem = new SfxFontItem(Which());
{
VersionCompat aFontCompat(rStream, STREAM_READ);
- readByteString(rStream, pItem->m_aName);
- readByteString(rStream, pItem->m_aStyleName);
+ pItem->m_aName = readByteString(rStream);
+ pItem->m_aStyleName = readByteString(rStream);
rStream >> pItem->m_aSize;
sal_Int16 nCharSet = 0;
rStream >> nCharSet;
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 7b86ab3..d12ab3e 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -102,7 +102,7 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, SvStream& rStream ) :
String aStr;
for( i=0; i < nEntryCount; i++ )
{
- readByteString(rStream, aStr);
+ aStr = readByteString(rStream);
pImp->aList.push_back(aStr);
}
}
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index a5fed05..e4d36a2 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.cxx
@@ -41,8 +41,7 @@ TYPEINIT1_AUTOFACTORY(SfxStringItem, CntUnencodedStringItem)
SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream):
CntUnencodedStringItem(which)
{
- UniString aValue;
- readByteString(rStream, aValue);
+ UniString aValue = readByteString(rStream);
SetValue(aValue);
}
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 00ca51a..d8485db 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -71,9 +71,9 @@ using namespace com::sun::star;
//
//============================================================================
-UniString
+rtl::OUString
URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
- UniString const & rTheRelURIRef,
+ rtl::OUString const & rTheRelURIRef,
Link const & rMaybeFileHdl,
bool bCheckFileExists,
bool bIgnoreFragment,
@@ -84,7 +84,7 @@ URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
INetURLObject::FSysStyle eStyle)
{
// Backwards compatibility:
- if (rTheRelURIRef.Len() != 0 && rTheRelURIRef.GetChar(0) == '#')
+ if (!rTheRelURIRef.isEmpty() && rTheRelURIRef[0] == '#')
return rTheRelURIRef;
INetURLObject aAbsURIRef;
@@ -508,8 +508,8 @@ sal_uInt32 scanDomain(UniString const & rStr, xub_StrLen * pPos,
}
-UniString
-URIHelper::FindFirstURLInText(UniString const & rText,
+rtl::OUString
+URIHelper::FindFirstURLInText(rtl::OUString const & rText,
xub_StrLen & rBegin,
xub_StrLen & rEnd,
CharClass const & rCharClass,
@@ -517,8 +517,8 @@ URIHelper::FindFirstURLInText(UniString const & rText,
rtl_TextEncoding eCharset,
INetURLObject::FSysStyle eStyle)
{
- if (!(rBegin <= rEnd && rEnd <= rText.Len()))
- return UniString();
+ if (!(rBegin <= rEnd && rEnd <= rText.getLength()))
+ return rtl::OUString();
// Search for the first substring of [rBegin..rEnd[ that matches any of the
// following productions (for which the appropriate style bit is set in
@@ -588,7 +588,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
bool bBoundary2 = true;
for (xub_StrLen nPos = rBegin; nPos != rEnd; nPos = nextChar(rText, nPos))
{
- sal_Unicode c = rText.GetChar(nPos);
+ sal_Unicode c = rText[nPos];
if (bBoundary1)
{
if (INetMIME::isAlpha(c))
@@ -599,13 +599,13 @@ URIHelper::FindFirstURLInText(UniString const & rText,
rEnd));
if (eScheme == INET_PROT_FILE) // 2nd
{
- while (rText.GetChar(i++) != ':') ;
+ while (rText[i++] != ':') ;
xub_StrLen nPrefixEnd = i;
xub_StrLen nUriEnd = i;
while (i != rEnd
&& checkWChar(rCharClass, rText, &i, &nUriEnd, true,
true)) ;
- if (i != nPrefixEnd && rText.GetChar(i) == '#')
+ if (i != nPrefixEnd && rText[i] == '#')
{
++i;
while (i != rEnd
@@ -629,12 +629,12 @@ URIHelper::FindFirstURLInText(UniString const & rText,
}
else if (eScheme != INET_PROT_NOT_VALID) // 1st
{
- while (rText.GetChar(i++) != ':') ;
+ while (rText[i++] != ':') ;
xub_StrLen nPrefixEnd = i;
xub_StrLen nUriEnd = i;
while (i != rEnd
&& checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
- if (i != nPrefixEnd && rText.GetChar(i) == '#')
+ if (i != nPrefixEnd && rText[i] == '#')
{
++i;
while (i != rEnd
@@ -642,7 +642,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
}
if (nUriEnd != nPrefixEnd
&& (isBoundary1(rCharClass, rText, nUriEnd, rEnd)
- || rText.GetChar(nUriEnd) == '\\'))
+ || rText[nUriEnd] == '\\'))
{
INetURLObject aUri(UniString(rText, nPos,
nUriEnd - nPos),
@@ -662,37 +662,37 @@ URIHelper::FindFirstURLInText(UniString const & rText,
i = nPos;
sal_uInt32 nLabels = scanDomain(rText, &i, rEnd);
if (nLabels >= 3
- && rText.GetChar(nPos + 3) == '.'
- && (((rText.GetChar(nPos) == 'w'
- || rText.GetChar(nPos) == 'W')
- && (rText.GetChar(nPos + 1) == 'w'
- || rText.GetChar(nPos + 1) == 'W')
- && (rText.GetChar(nPos + 2) == 'w'
- || rText.GetChar(nPos + 2) == 'W'))
- || ((rText.GetChar(nPos) == 'f'
- || rText.GetChar(nPos) == 'F')
- && (rText.GetChar(nPos + 1) == 't'
- || rText.GetChar(nPos + 1) == 'T')
- && (rText.GetChar(nPos + 2) == 'p'
- || rText.GetChar(nPos + 2) == 'P'))))
+ && rText[nPos + 3] == '.'
+ && (((rText[nPos] == 'w'
+ || rText[nPos] == 'W')
+ && (rText[nPos + 1] == 'w'
+ || rText[nPos + 1] == 'W')
+ && (rText[nPos + 2] == 'w'
+ || rText[nPos + 2] == 'W'))
+ || ((rText[nPos] == 'f'
+ || rText[nPos] == 'F')
+ && (rText[nPos + 1] == 't'
+ || rText[nPos + 1] == 'T')
+ && (rText[nPos + 2] == 'p'
+ || rText[nPos + 2] == 'P'))))
// (note that rText.GetChar(nPos + 3) is guaranteed to be
// valid)
{
xub_StrLen nUriEnd = i;
- if (i != rEnd && rText.GetChar(i) == '/')
+ if (i != rEnd && rText[i] == '/')
{
nUriEnd = ++i;
while (i != rEnd
&& checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
}
- if (i != rEnd && rText.GetChar(i) == '#')
+ if (i != rEnd && rText[i] == '#')
{
++i;
while (i != rEnd
&& checkWChar(rCharClass, rText, &i, &nUriEnd)) ;
}
if (isBoundary1(rCharClass, rText, nUriEnd, rEnd)
- || rText.GetChar(nUriEnd) == '\\')
+ || rText[nUriEnd] == '\\')
{
INetURLObject aUri(UniString(rText, nPos,
nUriEnd - nPos),
@@ -709,9 +709,9 @@ URIHelper::FindFirstURLInText(UniString const & rText,
}
if ((eStyle & INetURLObject::FSYS_DOS) != 0 && rEnd - nPos >= 3
- && rText.GetChar(nPos + 1) == ':'
- && (rText.GetChar(nPos + 2) == '/'
- || rText.GetChar(nPos + 2) == '\\')) // 7th, 8th
+ && rText[nPos + 1] == ':'
+ && (rText[nPos + 2] == '/'
+ || rText[nPos + 2] == '\\')) // 7th, 8th
{
i = nPos + 3;
xub_StrLen nUriEnd = i;
@@ -736,12 +736,12 @@ URIHelper::FindFirstURLInText(UniString const & rText,
}
}
else if ((eStyle & INetURLObject::FSYS_DOS) != 0 && rEnd - nPos >= 2
- && rText.GetChar(nPos) == '\\'
- && rText.GetChar(nPos + 1) == '\\') // 6th
+ && rText[nPos] == '\\'
+ && rText[nPos + 1] == '\\') // 6th
{
xub_StrLen i = nPos + 2;
sal_uInt32 nLabels = scanDomain(rText, &i, rEnd);
- if (nLabels >= 1 && i != rEnd && rText.GetChar(i) == '\\')
+ if (nLabels >= 1 && i != rEnd && rText[i] == '\\')
{
xub_StrLen nUriEnd = ++i;
while (i != rEnd
@@ -771,7 +771,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
bool bDot = false;
for (xub_StrLen i = nPos + 1; i != rEnd; ++i)
{
- sal_Unicode c2 = rText.GetChar(i);
+ sal_Unicode c2 = rText[i];
if (INetMIME::isAtomChar(c2))
bDot = false;
else if (bDot)
@@ -807,7 +807,7 @@ URIHelper::FindFirstURLInText(UniString const & rText,
bBoundary2 = isBoundary2(rCharClass, rText, nPos, rEnd);
}
rBegin = rEnd;
- return UniString();
+ return rtl::OUString();
}
//============================================================================
@@ -816,8 +816,8 @@ URIHelper::FindFirstURLInText(UniString const & rText,
//
//============================================================================
-UniString
-URIHelper::removePassword(UniString const & rURI,
+rtl::OUString
+URIHelper::removePassword(rtl::OUString const & rURI,
INetURLObject::EncodeMechanism eEncodeMechanism,
INetURLObject::DecodeMechanism eDecodeMechanism,
rtl_TextEncoding eCharset)
@@ -825,7 +825,7 @@ URIHelper::removePassword(UniString const & rURI,
INetURLObject aObj(rURI, eEncodeMechanism, eCharset);
return aObj.HasError() ?
rURI :
- String(aObj.GetURLNoPass(eDecodeMechanism, eCharset));
+ aObj.GetURLNoPass(eDecodeMechanism, eCharset);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx
index 2dbe32f..41c4028 100644
--- a/svx/inc/svx/dialmgr.hxx
+++ b/svx/inc/svx/dialmgr.hxx
@@ -43,8 +43,7 @@ struct SVX_DLLPUBLIC DialogsResMgr
#define DIALOG_MGR() (*DialogsResMgr::GetResMgr())
#define SVX_RES(i) ResId(i,DIALOG_MGR())
-#define SVX_RESSTR(i) UniString(ResId(i,DIALOG_MGR()))
-#define SVX_RESSSTR(i) String(ResId(i,DIALOG_MGR()))
+#define SVX_RESSTR(i) ResId::toString(ResId(i,DIALOG_MGR()))
#endif
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 5d64d15..4035d58 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5503,7 +5503,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam;
LRESULT nRet = 0;
SalSurroundingTextRequestEvent aEvt;
- aEvt.maText = UniString();
+ aEvt.maText = rtl::OUString();
aEvt.mnStart = aEvt.mnEnd = 0;
UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ), IGP_SETCOMPSTR );
@@ -5557,7 +5557,7 @@ static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam )
WinSalFrame* pFrame = GetWindowPtr( hWnd );
LPRECONVERTSTRING pReconvertString = (LPRECONVERTSTRING) lParam;
SalSurroundingTextRequestEvent aEvt;
- aEvt.maText = UniString();
+ aEvt.maText = rtl::OUString();
aEvt.mnStart = aEvt.mnEnd = 0;
pFrame->CallCallback( SALEVENT_SURROUNDINGTEXTREQUEST, (void*)&aEvt );
commit 723613ab5ca5e59387dcba63d31bdb66b88035c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Mar 26 09:31:11 2012 +0100
need seen for seperate CUI_RESSSTR
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index de3ed22..a941f4f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2581,7 +2581,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
SvxConfigEntry* pMenuData = GetTopLevelSelection();
String aNewName( stripHotKey( pMenuData->GetName() ) );
- String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU );
@@ -2639,7 +2639,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
case ID_ADD_SUBMENU:
{
String aNewName;
- String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME );
+ String aDesc = CUI_RESSTR( RID_SVXSTR_SUBMENU_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU );
@@ -2685,7 +2685,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
(SvxConfigEntry*) pActEntry->GetUserData();
String aNewName( stripHotKey( pEntry->GetName() ) );
- String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM );
@@ -3318,7 +3318,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
case ID_RENAME:
{
String aNewName( stripHotKey( pToolbar->GetName() ) );
- String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR );
@@ -3409,7 +3409,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
(SvxConfigEntry*) pActEntry->GetUserData();
String aNewName( stripHotKey( pEntry->GetName() ) );
- String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME );
+ String aDesc = CUI_RESSTR( RID_SVXSTR_LABEL_NEW_NAME );
SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc );
pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM );
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index de8931e..29d3eef 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -37,7 +37,6 @@
#define CUI_MGR() (*CuiResMgr::GetResMgr())
#define CUI_RES(i) ResId(i,CUI_MGR())
#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR()))
-#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR()))
class ResMgr;
struct CuiResMgr
commit 8a539e49c4fba49bbd810a90747e1993e69a9942
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 25 21:15:20 2012 +0100
ditch some UniStrings and intermediate temporaries
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index c68923c..bd30c2b 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2179,7 +2179,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
HANDLE_SQL_ERRORS(
xParser->setOrder(::rtl::OUString()); xParser->appendOrderByColumn(xField, bSortUp),
bParserSuccess,
- UniString(ModuleRes(SBA_BROWSER_SETTING_ORDER)),
+ ResId::toString(ModuleRes(SBA_BROWSER_SETTING_ORDER)),
"SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
)
@@ -2251,7 +2251,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
HANDLE_SQL_ERRORS(
xParser->appendHavingClauseByColumn(xField,sal_True,nOp),
bParserSuccess,
- UniString(ModuleRes(SBA_BROWSER_SETTING_FILTER)),
+ ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)),
"SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
)
}
@@ -2260,7 +2260,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
HANDLE_SQL_ERRORS(
xParser->appendFilterByColumn(xField,sal_True,nOp),
bParserSuccess,
- UniString(ModuleRes(SBA_BROWSER_SETTING_FILTER)),
+ ResId::toString(ModuleRes(SBA_BROWSER_SETTING_FILTER)),
"SbaXDataBrowserController::Execute : caught an exception while composing the new filter !"
)
}
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 3848cf0..ef9e3a2 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -95,8 +95,8 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(
OUString& rUrl = rSeq[i];
INetContentType eType = INetContentTypes::GetContentTypeFromURL( rUrl );
- UniString aType( INetContentTypes::GetContentType( eType ) );
- if( aType.Len() )
+ rtl::OUString aType( INetContentTypes::GetContentType( eType ) );
+ if (!aType.isEmpty())
{
rUrl = aType;
bModified = sal_True;
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 6ce9cf2..61e4c16 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -756,8 +756,8 @@ void OReportDefinition::init()
m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM );
SdrLayerAdmin& rAdmin = m_pImpl->m_pReportModel->GetLayerAdmin();
rAdmin.NewStandardLayer(RPT_LAYER_FRONT);
- rAdmin.NewLayer(UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "back" ) ), RPT_LAYER_BACK );
- rAdmin.NewLayer( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), RPT_LAYER_HIDDEN );
+ rAdmin.NewLayer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("back")), RPT_LAYER_BACK);
+ rAdmin.NewLayer(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenLayer")), RPT_LAYER_HIDDEN);
m_pImpl->m_pUndoManager = new ::dbaui::UndoManager( *this, m_aMutex );
m_pImpl->m_pReportModel->SetSdrUndoManager( &m_pImpl->m_pUndoManager->GetSfxUndoManager() );
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 50165d1..c5677cd 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -76,7 +76,7 @@ sal_Bool CppDep::Search(const rtl::OString &rFileName)
SvFileStream aFile;
rtl::OString aReadLine;
- UniString suFileName(rtl::OStringToOUString(rFileName, osl_getThreadTextEncoding()));
+ rtl::OUString suFileName(rtl::OStringToOUString(rFileName, osl_getThreadTextEncoding()));
aFile.Open( suFileName, STREAM_READ );
while ( aFile.ReadLine( aReadLine ))
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 86a9b48..ad33e82 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1167,7 +1167,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
// Breite
if ( nColumns )
- aSz.Width() = nColumns * GetTextWidth( UniString( 'X' ) );
+ aSz.Width() = nColumns * GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('X')));
else
aSz.Width() = aMinSz.Width();
@@ -1190,7 +1190,7 @@ Size ComboBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
{
- long nCharWidth = GetTextWidth( UniString( 'x' ) );
+ long nCharWidth = GetTextWidth(rtl::OUString(static_cast<sal_Unicode>('x')));
if ( !IsDropDownBox() )
{
Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 9d2f7aa..c7729c4 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1424,7 +1424,7 @@ Size ListBox::CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
{
- long nCharWidth = GetTextWidth( UniString( 'x' ) );
+ long nCharWidth = GetTextWidth( rtl::OUString(static_cast<sal_Unicode>('x')) );
if ( !IsDropDownBox() )
{
Size aOutSz = mpImplLB->GetMainWindow()->GetOutputSizePixel();
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 2415500..dfe78b2 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -306,8 +306,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
rJobSetup.mpData = new ImplJobSetup;
ImplJobSetup* pJobData = rJobSetup.mpData;
- pJobData->maPrinterName = UniString( pData->cPrinterName, aStreamEncoding );
- pJobData->maDriver = UniString( pData->cDriverName, aStreamEncoding );
+ pJobData->maPrinterName = UniString(pData->cPrinterName, aStreamEncoding);
+ pJobData->maDriver = UniString(pData->cDriverName, aStreamEncoding);
// Sind es unsere neuen JobSetup-Daten?
if ( nSystem == JOBSET_FILE364_SYSTEM ||
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 21e7cbd..daeae8b 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -295,10 +295,9 @@ sal_Bool MnemonicGenerator::CreateMnemonic( XubString& rKey )
if ( maMnemonics[nMnemonicIndex] )
{
maMnemonics[nMnemonicIndex] = 0;
- UniString aStr( '(' );
- aStr += MNEMONIC_CHAR;
- aStr += c;
- aStr += ')';
+ rtl::OUString aStr = rtl::OUStringBuffer().
+ append('(').append(MNEMONIC_CHAR).append(c).
+ append(')').makeStringAndClear();
nIndex = rKey.Len();
if( nIndex >= 2 )
{
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index fad955c..0ee7073 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -577,7 +577,7 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
aTextEvent.mnTime = 0;
aTextEvent.mpTextAttr = 0;
aTextEvent.mnCursorPos = nLength;
- aTextEvent.maText = UniString(pText, nLength);
+ aTextEvent.maText = rtl::OUString(pText, nLength);
aTextEvent.mnCursorFlags = 0;
aTextEvent.mnDeltaStart = 0;
aTextEvent.mbOnlyCursor = False;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8d81873..5ba7ddc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2404,10 +2404,9 @@ void DomainMapper_Impl::handleToc
if( lcl_FindInCommand( pContext->GetCommand(), 'o', sValue ))
{
bFromOutline = true;
- UniString sParam( sValue );
- xub_StrLen nIndex = 0;
- sParam.GetToken( 0, '-', nIndex );
- nMaxLevel = sal_Int16( sParam.Copy( nIndex ).ToInt32( ) );
+ sal_Int32 nIndex = 0;
+ sValue.getToken( 0, '-', nIndex );
+ nMaxLevel = static_cast<sal_Int16>(nIndex != -1 ? sValue.copy(nIndex).toInt32() : 0);
}
// \p Defines the separator between the table entry and its page number
if( lcl_FindInCommand( pContext->GetCommand(), 'p', sValue ))
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 2d65bbb..780917f 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1284,15 +1284,23 @@ void SdXMLStylesContext::EndElement()
//
void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const
{
- UniString sPrefix(rMaster.GetDisplayName());
- sPrefix += sal_Unicode('-');
+ const uno::Reference<container::XNameAccess>& rStyleFamilies =
+ GetSdImport().GetLocalDocStyleFamilies();
- if(GetSdImport().GetLocalDocStyleFamilies().is() && GetSdImport().GetLocalDocStyleFamilies()->hasByName(rMaster.GetDisplayName())) try
+ if (!rStyleFamilies.is())
+ return;
+
+ if (!rStyleFamilies->hasByName(rMaster.GetDisplayName()))
+ return;
+
+ try
{
- uno::Reference< container::XNameAccess > xMasterPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW );
+ rtl::OUString sPrefix(rMaster.GetDisplayName());
+ sPrefix += rtl::OUString(static_cast<sal_Unicode>('-'));
ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix);
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
OSL_FAIL( "xmloff::SdXMLStylesContext::SetMasterPageStyles(), exception caught!" );
}
@@ -1309,8 +1317,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const
const OUString sGraphicStyleName(OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")));
uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW );
- UniString aPrefix;
- ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, aPrefix);
+ ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, rtl::OUString());
}
catch( uno::Exception& )
{
@@ -1325,8 +1332,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const
const OUString sCellStyleName(OUString(RTL_CONSTASCII_USTRINGPARAM("cell")));
uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW );
- UniString aPrefix;
- ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, aPrefix);
+ ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, rtl::OUString());
}
catch( uno::Exception& )
{
@@ -1337,9 +1343,9 @@ void SdXMLStylesContext::ImpSetCellStyles() const
//////////////////////////////////////////////////////////////////////////////
// help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles()
//
-void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const UniString& rPrefix) const
+void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const rtl::OUString& rPrefix) const
{
- xub_StrLen nPrefLen(rPrefix.Len());
+ sal_Int32 nPrefLen(rPrefix.getLength());
sal_uInt32 a;
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index fc8cfcf..f166c89 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -213,7 +213,7 @@ class SdXMLStylesContext : public SvXMLStylesContext
void ImpSetGraphicStyles() const;
void ImpSetCellStyles() const;
void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles,
- sal_uInt16 nFamily, const UniString& rPrefix) const;
+ sal_uInt16 nFamily, const rtl::OUString& rPrefix) const;
protected:
virtual SvXMLStyleContext* CreateStyleChildContext(
commit ad5c3b475306241fac55058aa390053f596f83d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 25 20:37:07 2012 +0100
callcatcher: update list, Table::Seek gone
diff --git a/unusedcode.easy b/unusedcode.easy
index 8f2dd53..eb72ea1 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -304,7 +304,6 @@ SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
SystemChildWindow::SystemChildWindow(Window*, ResId const&)
-Table::Seek(void*)
TempFile::IsValid() const
TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
commit 70eb5c15e89409c22dbcdd7c49fa6271cc535d6b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 25 00:43:57 2012 +0000
callcatcher: shiny unused method reduction from to-stl conversions
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
index ec0c82c..ec6927e 100644
--- a/tools/inc/tools/table.hxx
+++ b/tools/inc/tools/table.hxx
@@ -68,7 +68,6 @@ public:
sal_uIntPtr SearchKey( sal_uIntPtr nKey, sal_uIntPtr* pPos = NULL ) const;
void* Seek( sal_uIntPtr nKey );
- void* Seek( void* p );
void* First();
void* Last();
void* Next();
@@ -129,8 +128,6 @@ public: \
\
Type Seek( sal_uIntPtr nKey ) \
{ return (Type)Table::Seek( nKey ); } \
- Type Seek( Type p ) \
- { return (Type)Table::Seek( (void*)p ); } \
Type First() { return (Type)Table::First(); } \
Type Last() { return (Type)Table::Last(); } \
Type Next() { return (Type)Table::Next(); } \
diff --git a/tools/source/memtools/table.cxx b/tools/source/memtools/table.cxx
index 3586c27..9a55fb7 100644
--- a/tools/source/memtools/table.cxx
+++ b/tools/source/memtools/table.cxx
@@ -294,21 +294,6 @@ void* Table::Seek( sal_uIntPtr nKey )
return NULL;
}
-// -----------------------------------------------------------------------
-
-void* Table::Seek( void* p )
-{
- sal_uIntPtr nKey = GetKey( p );
-
- // Ist Key vorhanden, dann als aktuellen Eintrag setzen
- if ( nKey != TABLE_ENTRY_NOTFOUND )
- return Seek( nKey );
- else
- return NULL;
-}
-
-// -----------------------------------------------------------------------
-
void* Table::First()
{
// Testen, ob ein Eintrag vorhanden ist
diff --git a/unusedcode.easy b/unusedcode.easy
index 8fcb6b3..8f2dd53 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -74,6 +74,7 @@ ScDBCollection::AnonDBs::size() const
ScDPItemData::ScDPItemData(rtl::OUString const*)
ScDPItemData::SetErrorString(rtl::OUString const&)
ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
+ScDPObject::HasGroups() const
ScDocRowHeightUpdater::TabRanges::TabRanges()
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
@@ -236,10 +237,6 @@ SwInsDBColumns::Insert(SwInsDBColumn* const*, unsigned short)
SwInsDBColumns::Insert(SwInsDBColumns const*, unsigned short, unsigned short)
SwInsDBColumns::Remove(SwInsDBColumn* const&, unsigned short)
SwInsDBColumns::Remove(unsigned short, unsigned short)
-SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short)
-SwLRects::Replace(SwLineRect const&, unsigned short)
-SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short)
-SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const&, void*), void*)
SwMailMergeChildWindow::GetChildWindowId()
SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
SwOutlineNodes::Insert(SwNode* const*, unsigned short)
@@ -307,6 +304,7 @@ SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
SystemChildWindow::SystemChildWindow(Window*, ResId const&)
+Table::Seek(void*)
TempFile::IsValid() const
TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
@@ -381,11 +379,6 @@ _MergePos::Remove(_CmpLPt const&, unsigned short)
_MergePos_SAR::Replace(_CmpLPt const&, unsigned short)
_MergePos_SAR::Replace(_CmpLPt const*, unsigned short, unsigned short)
_MergePos_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_CmpLPt const&, void*), void*)
-_SaveFlyArr::Insert(_SaveFlyArr const*, unsigned short, unsigned short, unsigned short)
-_SaveFlyArr::Remove(unsigned short, unsigned short)
-_SaveFlyArr::Replace(_SaveFly const&, unsigned short)
-_SaveFlyArr::Replace(_SaveFly const*, unsigned short, unsigned short)
-_SaveFlyArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(_SaveFly const&, void*), void*)
_SetGetExpFlds::Insert(_SetGetExpFld* const&, unsigned short&)
_SetGetExpFlds::Insert(_SetGetExpFld* const*, unsigned short)
_SetGetExpFlds::Insert(_SetGetExpFlds const*, unsigned short, unsigned short)
@@ -410,13 +403,6 @@ _SwRedlineTbl::Insert(SwRedline* const*, unsigned short)
_SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short)
_SwRedlineTbl::Remove(SwRedline* const&, unsigned short)
_WPXTabStop::_WPXTabStop(double, WPXTabAlignment, unsigned short, unsigned char)
-_ZSortFlys::Insert(_ZSortFly const&, unsigned short&)
-_ZSortFlys::Insert(_ZSortFly const*, unsigned short)
-_ZSortFlys::Insert(_ZSortFlys const*, unsigned short, unsigned short)
-_ZSortFlys::Remove(_ZSortFly const&, unsigned short)
-_ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
-_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
-_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&, double const&)
basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, double const&)
commit 4eb52acf4e47ae659b1a3688e16e75509ab70597
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 25 00:38:05 2012 +0000
WaE: compile under product and dbgutil modes
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 3b59f51..ec74d43 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2871,24 +2871,24 @@ void ScDPResultDimension::LateInitFrom(
bool bLateInitAllMembers= bIsDataLayout || rParams.GetInitAllChild() || bShowEmpty;
- if ( !bLateInitAllMembers )
+ if ( !bLateInitAllMembers )
{
ResultMembers* pMembers = pResultData->GetDimResultMembers(nDimSource, pThisDim, pThisLevel);
bLateInitAllMembers = pMembers->IsHasHideDetailsMembers();
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "%s", aDimensionName.GetBuffer() );
- if ( pMembers->IsHasHideDetailsMembers() )
- OSL_TRACE( "HasHideDetailsMembers" );
+ OSL_TRACE( "%s", aDimensionName.getStr() );
+ if ( pMembers->IsHasHideDetailsMembers() )
+ OSL_TRACE( "HasHideDetailsMembers" );
#endif
- pMembers->SetHasHideDetailsMembers( false );
+ pMembers->SetHasHideDetailsMembers( false );
}
- bool bNewAllMembers =(!rParams.IsRow()) || nPos == 0 || bLateInitAllMembers ;
+ bool bNewAllMembers = (!rParams.IsRow()) || nPos == 0 || bLateInitAllMembers;
if (bNewAllMembers )
{
// global order is used to initialize aMembers, so it doesn't have to be looked at later
- if ( !bInitialized )
+ if ( !bInitialized )
{ //init all members
const ScMemberSortOrder& rGlobalOrder = pThisLevel->GetGlobalOrder();
commit d41b5a88bd4fdff79975d0a64a56d6aae2be1f22
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Mar 24 14:00:06 2012 +0000
reduce over use of static OUStrings
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2c74008..ca210b8 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -73,12 +73,8 @@
namespace framework
{
- const ::rtl::OUString CFG_ENTRY_PRIMARY(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeys"));
- const ::rtl::OUString CFG_ENTRY_SECONDARY(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeys"));
- const ::rtl::OUString CFG_ENTRY_GLOBAL(RTL_CONSTASCII_USTRINGPARAM("Global"));
- const ::rtl::OUString CFG_ENTRY_MODULES(RTL_CONSTASCII_USTRINGPARAM("Modules"));
- const ::rtl::OUString CFG_PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command"));
-
+ const char CFG_ENTRY_SECONDARY[] = "SecondaryKeys";
+ const char CFG_PROP_COMMAND[] = "Command";
#ifdef fpc
#error "Who exports this define? I use it as namespace alias ..."
@@ -1245,14 +1241,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
- if ( sGlobalModules.equals(CFG_ENTRY_GLOBAL) )
+ if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
{
::rtl::OUString sModule;
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
if ( !sKey.isEmpty() && !sPath.isEmpty() )
reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey);
}
- else if ( sGlobalModules.equals(CFG_ENTRY_MODULES) )
+ else if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
{
::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath);
@@ -1487,9 +1483,9 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
else
m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- if ( m_sGlobalOrModules.equals(CFG_ENTRY_GLOBAL) )
+ if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
- else if ( m_sGlobalOrModules.equals(CFG_ENTRY_MODULES) )
+ else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
{
css::uno::Reference< css::container::XNameContainer > xModules;
xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1532,9 +1528,9 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
else
m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- if ( m_sGlobalOrModules.equals(CFG_ENTRY_GLOBAL) )
+ if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
- else if ( m_sGlobalOrModules.equals(CFG_ENTRY_MODULES) )
+ else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) )
{
css::uno::Reference< css::container::XNameAccess > xModules;
xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules;
@@ -1554,7 +1550,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
css::uno::Reference< css::container::XNameContainer > xContainer;
m_xCfg->getByName(sPrimarySecondary) >>= xAccess;
- if ( sGlobalModules.equals(CFG_ENTRY_GLOBAL) )
+ if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) )
xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer;
else
{
@@ -1602,14 +1598,14 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr
xCommand->getByName(sLocale) >>= sCommand;
}
- if (sPrimarySecondary.equals(CFG_ENTRY_PRIMARY))
+ if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_PRIMARY)))
{
if (sCommand.isEmpty())
m_aPrimaryReadCache.removeKey(aKeyEvent);
else
m_aPrimaryReadCache.setKeyCommandPair(aKeyEvent, sCommand);
}
- else if (sPrimarySecondary.equals(CFG_ENTRY_SECONDARY))
+ else if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_SECONDARY)))
{
if (sCommand.isEmpty())
m_aSecondaryReadCache.removeKey(aKeyEvent);
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 1b34cb1..13c1a94 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -73,16 +73,10 @@
namespace framework
{
-//-----------------------------------------------
-// Accelerators.xcu
-extern const ::rtl::OUString CFG_ENTRY_PRIMARY;
-extern const ::rtl::OUString CFG_ENTRY_SECONDARY;
-
-extern const ::rtl::OUString CFG_ENTRY_GLOBAL;
-extern const ::rtl::OUString CFG_ENTRY_MODULES;
-
-extern const ::rtl::OUString CFG_PROP_COMMAND;
+const char CFG_ENTRY_PRIMARY[] = "PrimaryKeys";
+const char CFG_ENTRY_GLOBAL[] = "Global";
+const char CFG_ENTRY_MODULES[] = "Modules";
/** "global" type to make accelerator presets unique, so they can be used
in combination with the salhelper::SingletonRef mechanism! */
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 9edec64..73f6ac6 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -199,17 +199,17 @@ static const ::rtl::OUString CMD_DO_SESSION_RESTORE(RTL_CONSTASCII_USTRINGPARAM(
static const ::rtl::OUString CMD_DO_DISABLE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM("/disableRecovery")); // disable recovery and auto save (!) temp. for this office session
static const ::rtl::OUString CMD_DO_SET_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("/setAutoSaveState")); // disable/enable auto save (not crash save) for this office session
-static const ::rtl::OUString REFERRER_USER(RTL_CONSTASCII_USTRINGPARAM("private:user"));
+static const char REFERRER_USER[] = "private:user";
-static const ::rtl::OUString PROP_DISPATCH_ASYNCHRON(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron"));
-static const ::rtl::OUString PROP_PROGRESS(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator"));
-static const ::rtl::OUString PROP_SAVEPATH(RTL_CONSTASCII_USTRINGPARAM("SavePath"));
-static const ::rtl::OUString PROP_ENTRY_ID(RTL_CONSTASCII_USTRINGPARAM("EntryID"));
-static const ::rtl::OUString PROP_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState"));
+static const char PROP_DISPATCH_ASYNCHRON[] = "DispatchAsynchron";
+static const char PROP_PROGRESS[] = "StatusIndicator";
+static const char PROP_SAVEPATH[] = "SavePath";
+static const char PROP_ENTRY_ID[] = "EntryID";
+static const char PROP_AUTOSAVE_STATE[] = "AutoSaveState";
-static const ::rtl::OUString OPERATION_START(RTL_CONSTASCII_USTRINGPARAM("start"));
-static const ::rtl::OUString OPERATION_STOP(RTL_CONSTASCII_USTRINGPARAM("stop"));
-static const ::rtl::OUString OPERATION_UPDATE(RTL_CONSTASCII_USTRINGPARAM("update"));
+static const char OPERATION_START[] = "start";
+static const char OPERATION_STOP[] = "stop";
+static const char OPERATION_UPDATE[] = "update";
static const sal_Int32 MIN_DISCSPACE_DOCSAVE = 5; // [MB]
static const sal_Int32 MIN_DISCSPACE_CONFIGSAVE = 1; // [MB]
@@ -2483,7 +2483,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
::comphelper::MediaDescriptor lDescriptor;
// its an UI feature - so the "USER" itself must be set as referer
- lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= REFERRER_USER;
+ lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= ::rtl::OUString(REFERRER_USER);
lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString();
// recovered documents are loaded hidden, and shown all at once, later
@@ -2930,7 +2930,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(
aEvent.FeatureURL.Complete = AutoRecovery::implst_getJobDescription(eJob);
aEvent.FeatureDescriptor = sEventType;
- if (sEventType.equals(OPERATION_UPDATE) && pInfo)
+ if (pInfo && sEventType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OPERATION_UPDATE)))
{
// pack rInfo for transport via UNO
::comphelper::NamedValueCollection aInfo;
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index ddec78f..8885258 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1787,11 +1787,10 @@ double SAL_CALL ScVbaApplication::InchesToPoints( double Inches ) throw (uno::Ru
return MetricField::ConvertDoubleValue( Inches, 0, 0, FUNIT_INCH, FUNIT_POINT );
}
-rtl::OUString&
+rtl::OUString
ScVbaApplication::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 8481690..ad8c833 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -141,7 +141,7 @@ public:
virtual double SAL_CALL InchesToPoints( double Inches ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif /* SC_VBA_APPLICATION_HXX */
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 3c91b9c..80132d6 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -113,11 +113,10 @@ ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::Runt
return m_sName;
}
-rtl::OUString&
+rtl::OUString
ScVbaAssistant::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index 8490927..01662cb 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -64,7 +64,7 @@ public:
virtual ::rtl::OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index ae182c8..2ecc2ef 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -183,11 +183,10 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource)
return aSource; // pass through ( it's already an XAxis object
}
-rtl::OUString&
+rtl::OUString
ScVbaAxes::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index f135f8e..702c7be 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -44,7 +44,7 @@ public:
css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException );
};
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 28dbc8a..0c3ff43 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -647,11 +647,10 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx
oShapeHelper->setLeft( left );
}
-rtl::OUString&
+rtl::OUString
ScVbaAxis::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index f139828..ea03f5e 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -94,7 +94,7 @@ public:
virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx
index cc5b0d7..f2d9dde 100644
--- a/sc/source/ui/vba/vbaaxistitle.cxx
+++ b/sc/source/ui/vba/vbaaxistitle.cxx
@@ -34,11 +34,10 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen
{
}
-rtl::OUString&
+rtl::OUString
ScVbaAxisTitle::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx
index 0360e40..f461fa7 100644
--- a/sc/source/ui/vba/vbaaxistitle.hxx
+++ b/sc/source/ui/vba/vbaaxistitle.hxx
@@ -39,7 +39,7 @@ class ScVbaAxisTitle : public AxisTitleBase
public:
ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 7fbe157..4671989 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -152,10 +152,9 @@ private:
}
ScVbaBorder(); // no impl
protected:
- virtual rtl::OUString& getServiceImplName()
+ virtual rtl::OUString getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder"));
}
virtual css::uno::Sequence<rtl::OUString> getServiceNames()
{
@@ -555,11 +554,10 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run
}
-rtl::OUString&
+rtl::OUString
ScVbaBorders::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index 0164328..0dd088d 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -69,7 +69,7 @@ public:
virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException);
virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException);
// xxxxBASE
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 2b163af..d5ec109 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -116,11 +116,10 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException)
}
-rtl::OUString&
+rtl::OUString
ScVbaCharacters::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index b9711fc..31dc9b2 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -67,7 +67,7 @@ public:
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index db9d23e..f706b3c 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -1062,11 +1062,10 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro
}
-rtl::OUString&
+rtl::OUString
ScVbaChart::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChart") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChart"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index e984ecf..43409be 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -95,7 +95,7 @@ public:
virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 4a02bda..da5086d 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -137,11 +137,10 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException)
return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart );
}
-rtl::OUString&
+rtl::OUString
ScVbaChartObject::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index 5b54069..24616bd 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -64,7 +64,7 @@ public:
virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException );
virtual void Activate() throw ( css::script::BasicErrorException );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 869311d..1a790d6 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -174,11 +174,10 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaChartObjects::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index ee0b7b1..832621b 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -69,7 +69,7 @@ public:
// ScVbaCollectionBaseImpl
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// ChartObjects_BASE
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx
index 09f6787..ebeb212 100644
--- a/sc/source/ui/vba/vbacharttitle.cxx
+++ b/sc/source/ui/vba/vbacharttitle.cxx
@@ -34,11 +34,10 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar
{
}
-rtl::OUString&
+rtl::OUString
ScVbaChartTitle::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx
index db0f3e3..c8cc6d3 100644
--- a/sc/source/ui/vba/vbacharttitle.hxx
+++ b/sc/source/ui/vba/vbacharttitle.hxx
@@ -39,7 +39,7 @@ class ScVbaChartTitle : public ChartTitleBase
public:
ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index bfb5d62..bce3c19 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -229,11 +229,10 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
return sAnnoText;
}
-rtl::OUString&
+rtl::OUString
ScVbaComment::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComment") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComment"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 81670dc..352d782 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -74,7 +74,7 @@ public:
virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx
index c4c290d..7557efc 100644
--- a/sc/source/ui/vba/vbacomments.cxx
+++ b/sc/source/ui/vba/vbacomments.cxx
@@ -97,11 +97,10 @@ ScVbaComments::getElementType() throw (uno::RuntimeException)
return excel::XComment::static_type(0);
}
-rtl::OUString&
+rtl::OUString
ScVbaComments::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComments") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComments"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx
index 8b65a3c..fb578eb 100644
--- a/sc/source/ui/vba/vbacomments.hxx
+++ b/sc/source/ui/vba/vbacomments.hxx
@@ -55,7 +55,7 @@ public:
// ScVbaComments_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
private:
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 493d6b8..5477dfd 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -85,11 +85,10 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
return rtl::OUString();
}
-rtl::OUString&
+rtl::OUString
ScVbaDialog::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index 9a33693..3bde7a7 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -44,7 +44,7 @@ public:
// Methods
virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
static sal_Int32 GetSupportedDialogCount();
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index c64babe..f196ee2 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -46,11 +46,10 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
return uno::Any( aDialog );
}
-rtl::OUString&
+rtl::OUString
ScVbaDialogs::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 70c818f..cda36dd 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -50,7 +50,7 @@ public:
// XDialogs
virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx
index cb4917d..7ae0a9e 100644
--- a/sc/source/ui/vba/vbafiledialog.cxx
+++ b/sc/source/ui/vba/vbafiledialog.cxx
@@ -54,11 +54,10 @@ ScVbaFileDialog::~ScVbaFileDialog()
}
}
-rtl::OUString&
+rtl::OUString
ScVbaFileDialog::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFileDialog") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFileDialog"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbafiledialog.hxx b/sc/source/ui/vba/vbafiledialog.hxx
index ac905f5..16ed4de 100644
--- a/sc/source/ui/vba/vbafiledialog.hxx
+++ b/sc/source/ui/vba/vbafiledialog.hxx
@@ -46,7 +46,7 @@ public:
virtual ~ScVbaFileDialog() ;
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
//XFileDialog
virtual css::uno::Reference< ov::XFileDialogSelectedItems > SAL_CALL getSelectedItems() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.cxx b/sc/source/ui/vba/vbafiledialogselecteditems.cxx
index 547841a..21fa2e7 100644
--- a/sc/source/ui/vba/vbafiledialogselecteditems.cxx
+++ b/sc/source/ui/vba/vbafiledialogselecteditems.cxx
@@ -40,12 +40,11 @@ VbaFileDialogSelectedItems::VbaFileDialogSelectedItems( const css::uno::Referenc
}
-rtl::OUString& VbaFileDialogSelectedItems::getServiceImplName()
+rtl::OUString VbaFileDialogSelectedItems::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFileDialogSelectedItems") );
- return sImplName;
-
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFileDialogSelectedItems"));
}
+
css::uno::Sequence<rtl::OUString> VbaFileDialogSelectedItems::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.hxx b/sc/source/ui/vba/vbafiledialogselecteditems.hxx
index b43364d..030242a 100644
--- a/sc/source/ui/vba/vbafiledialogselecteditems.hxx
+++ b/sc/source/ui/vba/vbafiledialogselecteditems.hxx
@@ -50,7 +50,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
protected:
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
private:
};
diff --git a/sc/source/ui/vba/vbafilesearch.cxx b/sc/source/ui/vba/vbafilesearch.cxx
index 928ed9a..f526011 100644
--- a/sc/source/ui/vba/vbafilesearch.cxx
+++ b/sc/source/ui/vba/vbafilesearch.cxx
@@ -225,10 +225,9 @@ Reference< XFoundFiles > SAL_CALL ScVbaFileSearch::getFoundFiles() throw (css::u
return xFoundFiles;
}
-rtl::OUString& ScVbaFileSearch::getServiceImplName()
+rtl::OUString ScVbaFileSearch::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFileSearch") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFileSearch"));
}
css::uno::Sequence< rtl::OUString > ScVbaFileSearch::getServiceNames()
diff --git a/sc/source/ui/vba/vbafilesearch.hxx b/sc/source/ui/vba/vbafilesearch.hxx
index 33e9caa..f89fd11 100644
--- a/sc/source/ui/vba/vbafilesearch.hxx
+++ b/sc/source/ui/vba/vbafilesearch.hxx
@@ -71,7 +71,7 @@ public:
virtual void SAL_CALL NewSearch( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence< rtl::OUString > getServiceNames();
};
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index c3630ab..2be5626 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -482,11 +482,10 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException)
return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaFont::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFont") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFont"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index b87672a..8527919 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -80,7 +80,7 @@ public:
virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ;
virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ;
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 13bf8f8..5688021 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -800,11 +800,10 @@ ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException )
}
template< typename Ifc1 >
-rtl::OUString&
+rtl::OUString
ScVbaFormat<Ifc1>::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat"));
}
template< typename Ifc1 >
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index 3646665..d2c0e09 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -102,7 +102,7 @@ public:
virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 9874a44..7a72243 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -157,11 +157,10 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
}
}
-rtl::OUString&
+rtl::OUString
ScVbaFormatCondition::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index aa1a3e5..fec0b0b 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -65,7 +65,7 @@ public:
virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index ddf8ef4..96f61c7 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -269,11 +269,10 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName,
}
}
-rtl::OUString&
+rtl::OUString
ScVbaFormatConditions::getServiceImplName()
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list