[Libreoffice-commits] core.git: 14 commits - basctl/source chart2/qa chart2/source cui/source dbaccess/source extensions/source framework/inc framework/source i18nlangtag/qa lotuswordpro/source sc/inc sc/qa sc/source sd/inc sd/source sw/inc sw/qa sw/source ucb/source uui/source writerfilter/inc writerfilter/source xmlsecurity/inc xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Mar 17 04:31:26 PDT 2014
basctl/source/basicide/baside2.cxx | 2
basctl/source/basicide/baside2.hxx | 2
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/basidesh.cxx | 4
basctl/source/basicide/bastypes.cxx | 2
basctl/source/basicide/localizationmgr.cxx | 2
basctl/source/basicide/moduldlg.cxx | 3
basctl/source/basicide/moduldlg.hxx | 2
basctl/source/inc/baside3.hxx | 2
basctl/source/inc/basidesh.hxx | 4
basctl/source/inc/bastypes.hxx | 2
chart2/qa/extras/chart2export.cxx | 8 -
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 62 +++++-----
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 16 +-
chart2/source/controller/dialogs/DataBrowser.cxx | 2
chart2/source/controller/dialogs/DataBrowser.hxx | 2
chart2/source/controller/dialogs/DataBrowserModel.cxx | 2
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 6
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 6
chart2/source/inc/DataSeriesHelper.hxx | 4
chart2/source/inc/RegressionCurveHelper.hxx | 4
chart2/source/tools/DataSeriesHelper.cxx | 5
chart2/source/tools/RegressionCurveHelper.cxx | 4
chart2/source/view/inc/AbstractShapeFactory.hxx | 4
chart2/source/view/inc/OpenglShapeFactory.hxx | 4
chart2/source/view/inc/PlotterBase.hxx | 2
chart2/source/view/inc/ShapeFactory.hxx | 4
chart2/source/view/main/OpenglShapeFactory.cxx | 4
chart2/source/view/main/PlotterBase.cxx | 2
chart2/source/view/main/ShapeFactory.cxx | 4
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 10 -
cui/source/dialogs/scriptdlg.cxx | 4
cui/source/factory/dlgfact.hxx | 4
cui/source/inc/autocdlg.hxx | 4
cui/source/inc/hlmarkwn.hxx | 8 -
cui/source/inc/scriptdlg.hxx | 4
cui/source/options/optaboutconfig.cxx | 2
cui/source/options/optaboutconfig.hxx | 2
cui/source/options/optlingu.cxx | 7 -
cui/source/options/optsave.cxx | 2
cui/source/tabpages/autocdlg.cxx | 4
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 10 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 6
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 2
dbaccess/source/ui/control/TableGrantCtrl.cxx | 2
dbaccess/source/ui/dlg/dbfindex.cxx | 2
dbaccess/source/ui/dlg/dbfindex.hxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 4
dbaccess/source/ui/dlg/generalpage.hxx | 4
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2
dbaccess/source/ui/misc/dsmeta.cxx | 2
extensions/source/bibliography/datman.hxx | 2
extensions/source/bibliography/general.cxx | 2
extensions/source/bibliography/general.hxx | 2
extensions/source/bibliography/toolbar.cxx | 8 -
extensions/source/bibliography/toolbar.hxx | 8 -
extensions/source/propctrlr/formcomponenthandler.cxx | 2
framework/inc/classes/fwktabwindow.hxx | 2
framework/inc/services/layoutmanager.hxx | 2
framework/source/dispatch/loaddispatcher.cxx | 6
framework/source/fwe/classes/addonmenu.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 4
framework/source/inc/dispatch/loaddispatcher.hxx | 4
i18nlangtag/qa/cppunit/test_languagetag.cxx | 2
lotuswordpro/source/filter/lwpbookmarkmgr.cxx | 6
lotuswordpro/source/filter/lwpbookmarkmgr.hxx | 6
lotuswordpro/source/filter/lwpfilter.cxx | 4
lotuswordpro/source/filter/lwpfootnote.hxx | 2
lotuswordpro/source/filter/lwpfoundry.cxx | 4
lotuswordpro/source/filter/lwpfoundry.hxx | 4
lotuswordpro/source/filter/lwpfrib.cxx | 4
lotuswordpro/source/filter/lwpfrib.hxx | 4
lotuswordpro/source/filter/lwpfribmark.cxx | 2
lotuswordpro/source/filter/lwpfribmark.hxx | 2
lotuswordpro/source/filter/lwphyperlinkmgr.cxx | 2
lotuswordpro/source/filter/lwphyperlinkmgr.hxx | 2
lotuswordpro/source/filter/lwpmarker.cxx | 2
lotuswordpro/source/filter/lwpmarker.hxx | 8 -
lotuswordpro/source/filter/lwpnumericfmt.cxx | 2
lotuswordpro/source/filter/lwpnumericfmt.hxx | 6
lotuswordpro/source/filter/lwppara.hxx | 4
lotuswordpro/source/filter/lwppara1.cxx | 4
lotuswordpro/source/filter/lwpproplist.cxx | 6
lotuswordpro/source/filter/lwpproplist.hxx | 6
lotuswordpro/source/filter/lwpstory.hxx | 4
lotuswordpro/source/filter/lwptblformula.cxx | 2
lotuswordpro/source/filter/lwptblformula.hxx | 2
lotuswordpro/source/filter/xfilter/ixfcontent.hxx | 2
lotuswordpro/source/filter/xfilter/xfannotation.hxx | 8 -
lotuswordpro/source/filter/xfilter/xfarrowstyle.hxx | 12 -
lotuswordpro/source/filter/xfilter/xfbgimage.hxx | 4
lotuswordpro/source/filter/xfilter/xfbookmark.hxx | 4
lotuswordpro/source/filter/xfilter/xfcell.cxx | 2
lotuswordpro/source/filter/xfilter/xfcell.hxx | 6
lotuswordpro/source/filter/xfilter/xfcellstyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfchange.hxx | 10 -
lotuswordpro/source/filter/xfilter/xfcontent.hxx | 2
lotuswordpro/source/filter/xfilter/xfcrossref.hxx | 4
lotuswordpro/source/filter/xfilter/xfdatestyle.hxx | 12 -
lotuswordpro/source/filter/xfilter/xfdocfield.cxx | 2
lotuswordpro/source/filter/xfilter/xfdocfield.hxx | 2
lotuswordpro/source/filter/xfilter/xfdrawobj.hxx | 4
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 4
lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx | 8 -
lotuswordpro/source/filter/xfilter/xffont.hxx | 12 -
lotuswordpro/source/filter/xfilter/xffontdecl.cxx | 2
lotuswordpro/source/filter/xfilter/xffontdecl.hxx | 2
lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx | 36 ++---
lotuswordpro/source/filter/xfilter/xfframe.hxx | 8 -
lotuswordpro/source/filter/xfilter/xfhyperlink.hxx | 16 +-
lotuswordpro/source/filter/xfilter/xfimage.cxx | 2
lotuswordpro/source/filter/xfilter/xfimage.hxx | 2
lotuswordpro/source/filter/xfilter/xfindex.cxx | 4
lotuswordpro/source/filter/xfilter/xfindex.hxx | 28 ++--
lotuswordpro/source/filter/xfilter/xfinputlist.hxx | 4
lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx | 12 -
lotuswordpro/source/filter/xfilter/xfliststyle.cxx | 6
lotuswordpro/source/filter/xfilter/xfliststyle.hxx | 12 -
lotuswordpro/source/filter/xfilter/xfmasterpage.cxx | 2
lotuswordpro/source/filter/xfilter/xfmasterpage.hxx | 2
lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx | 16 +-
lotuswordpro/source/filter/xfilter/xfnumfmt.hxx | 6
lotuswordpro/source/filter/xfilter/xfofficemeta.cxx | 12 -
lotuswordpro/source/filter/xfilter/xfofficemeta.hxx | 12 -
lotuswordpro/source/filter/xfilter/xfpagenumber.hxx | 4
lotuswordpro/source/filter/xfilter/xfparastyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfplaceholder.hxx | 12 -
lotuswordpro/source/filter/xfilter/xfruby.hxx | 4
lotuswordpro/source/filter/xfilter/xfstylecont.cxx | 2
lotuswordpro/source/filter/xfilter/xfstylecont.hxx | 2
lotuswordpro/source/filter/xfilter/xfstylemanager.cxx | 6
lotuswordpro/source/filter/xfilter/xfstylemanager.hxx | 6
lotuswordpro/source/filter/xfilter/xftable.cxx | 2
lotuswordpro/source/filter/xfilter/xftable.hxx | 18 +-
lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 2
lotuswordpro/source/filter/xfilter/xftextcontent.hxx | 2
lotuswordpro/source/filter/xfilter/xftextspan.cxx | 6
lotuswordpro/source/filter/xfilter/xftextspan.hxx | 4
lotuswordpro/source/filter/xfilter/xftimestyle.hxx | 8 -
sc/inc/scabstdlg.hxx | 6
sc/qa/unit/subsequent_filters-test.cxx | 4
sc/source/core/data/dptabsrc.cxx | 2
sc/source/filter/excel/xechart.cxx | 2
sc/source/filter/excel/xihelper.cxx | 2
sc/source/filter/inc/pagesettings.hxx | 4
sc/source/filter/inc/xechart.hxx | 2
sc/source/filter/inc/xichart.hxx | 2
sc/source/filter/inc/xihelper.hxx | 2
sc/source/filter/oox/pagesettings.cxx | 2
sc/source/filter/xml/xmlcondformat.cxx | 2
sc/source/filter/xml/xmldrani.hxx | 6
sc/source/filter/xml/xmlfilti.cxx | 2
sc/source/filter/xml/xmlfilti.hxx | 2
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/filter/xml/xmlimprt.hxx | 2
sc/source/ui/Accessibility/AccessibleCell.cxx | 31 ++---
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 2
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 24 +--
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 16 +-
sc/source/ui/attrdlg/scdlgfact.hxx | 16 +-
sc/source/ui/condformat/condformathelper.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 4
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 2
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 24 +--
sc/source/ui/inc/condformathelper.hxx | 2
sc/source/ui/inc/impex.hxx | 2
sc/source/ui/inc/mtrindlg.hxx | 20 +--
sc/source/ui/inc/navipi.hxx | 4
sc/source/ui/inc/scuiasciiopt.hxx | 2
sc/source/ui/miscdlgs/mtrindlg.cxx | 2
sc/source/ui/miscdlgs/solvrdlg.cxx | 2
sc/source/ui/navipi/navipi.cxx | 4
sc/source/ui/vba/vbastyles.cxx | 2
sc/source/ui/vba/vbastyles.hxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 8 -
sc/source/ui/vba/vbaworksheet.hxx | 2
sd/inc/TransitionPreset.hxx | 2
sd/inc/sdpage.hxx | 2
sd/source/core/TransitionPreset.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/drawdoc4.cxx | 2
sd/source/core/sdpage.cxx | 2
sd/source/core/stlpool.cxx | 2
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 4
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/html/htmlex.hxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.hxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 8 -
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/animations/CustomAnimationPane.hxx | 2
sd/source/ui/app/optsitem.cxx | 2
sd/source/ui/func/unprlout.cxx | 4
sd/source/ui/inc/RemoteServer.hxx | 4
sd/source/ui/inc/optsitem.hxx | 2
sd/source/ui/inc/unmodpg.hxx | 2
sd/source/ui/inc/unoaprms.hxx | 4
sd/source/ui/inc/unprlout.hxx | 4
sd/source/ui/remotecontrol/ImagePreparer.cxx | 4
sd/source/ui/remotecontrol/Server.cxx | 9 -
sd/source/ui/view/unmodpg.cxx | 2
sw/inc/PostItMgr.hxx | 2
sw/inc/acmplwrd.hxx | 2
sw/inc/ddefld.hxx | 2
sw/inc/doc.hxx | 6
sw/inc/docsh.hxx | 2
sw/inc/editsh.hxx | 2
sw/inc/expfld.hxx | 2
sw/inc/list.hxx | 2
sw/inc/numrule.hxx | 2
sw/inc/section.hxx | 2
sw/inc/swabstdlg.hxx | 6
sw/inc/unotxdoc.hxx | 4
sw/qa/extras/inc/swmodeltestbase.hxx | 16 +-
sw/qa/extras/rtfimport/rtfimport.cxx | 2
sw/source/core/access/acccell.cxx | 28 ++--
sw/source/core/access/acctable.hxx | 2
sw/source/core/doc/acmplwrd.cxx | 2
sw/source/core/doc/docdesc.cxx | 2
sw/source/core/doc/docnum.cxx | 4
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/list.cxx | 6
sw/source/core/docnode/section.cxx | 2
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/fields/cellfml.cxx | 13 +-
sw/source/core/fields/chpfld.cxx | 2
sw/source/core/fields/ddefld.cxx | 3
sw/source/core/fields/expfld.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/inc/txmsrt.hxx | 4
sw/source/core/inc/txtfrm.hxx | 2
sw/source/core/inc/unoflatpara.hxx | 2
sw/source/core/tox/txmsrt.cxx | 2
sw/source/core/uibase/app/docst.cxx | 2
sw/source/core/uibase/dbui/mmconfigitem.cxx | 4
sw/source/core/uibase/docvw/PostItMgr.cxx | 2
sw/source/core/uibase/inc/frmdlg.hxx | 4
sw/source/core/uibase/inc/initui.hxx | 10 -
sw/source/core/uibase/inc/mmconfigitem.hxx | 4
sw/source/core/uibase/inc/swuipardlg.hxx | 2
sw/source/core/uibase/inc/tmpdlg.hxx | 2
sw/source/core/uibase/misc/glosdoc.cxx | 2
sw/source/core/uibase/uiview/srcview.cxx | 31 ++---
sw/source/core/uibase/uno/unotxdoc.cxx | 7 -
sw/source/core/uibase/utlui/initui.cxx | 12 -
sw/source/core/undo/undel.cxx | 2
sw/source/core/unocore/unoflatpara.cxx | 2
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/swhtml.hxx | 2
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/filter/ww8/docxexport.hxx | 2
sw/source/filter/ww8/docxsdrexport.cxx | 2
sw/source/filter/ww8/docxsdrexport.hxx | 2
sw/source/filter/ww8/docxtablestyleexport.cxx | 4
sw/source/filter/ww8/ww8par.hxx | 10 -
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 8 -
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 6
sw/source/ui/dialog/swdlgfact.hxx | 6
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/frmdlg/frmdlg.cxx | 4
sw/source/ui/table/tautofmt.cxx | 2
sw/source/ui/vba/vbafield.cxx | 4
sw/source/ui/vba/vbafield.hxx | 4
ucb/source/ucp/cmis/auth_provider.hxx | 4
ucb/source/ucp/cmis/certvalidation_handler.hxx | 2
ucb/source/ucp/cmis/cmis_url.cxx | 4
ucb/source/ucp/cmis/cmis_url.hxx | 4
ucb/source/ucp/file/bc.cxx | 2
ucb/source/ucp/file/bc.hxx | 2
ucb/source/ucp/file/filnot.hxx | 2
ucb/source/ucp/file/filrset.hxx | 2
ucb/source/ucp/file/shell.cxx | 12 -
ucb/source/ucp/file/shell.hxx | 12 -
ucb/source/ucp/webdav-neon/NeonSession.cxx | 2
ucb/source/ucp/webdav-neon/NeonSession.hxx | 2
uui/source/iahndl-authentication.cxx | 4
uui/source/iahndl-ssl.cxx | 2
uui/source/iahndl.cxx | 3
uui/source/iahndl.hxx | 2
uui/source/passworddlg.cxx | 2
uui/source/passworddlg.hxx | 2
writerfilter/inc/dmapper/DomainMapper.hxx | 2
writerfilter/source/dmapper/BorderHandler.cxx | 6
writerfilter/source/dmapper/BorderHandler.hxx | 6
writerfilter/source/dmapper/CellColorHandler.cxx | 4
writerfilter/source/dmapper/CellColorHandler.hxx | 4
writerfilter/source/dmapper/CellMarginHandler.cxx | 4
writerfilter/source/dmapper/CellMarginHandler.hxx | 4
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 18 +-
writerfilter/source/dmapper/MeasureHandler.cxx | 2
writerfilter/source/dmapper/MeasureHandler.hxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 4
writerfilter/source/dmapper/NumberingManager.hxx | 14 +-
writerfilter/source/dmapper/OLEHandler.cxx | 2
writerfilter/source/dmapper/OLEHandler.hxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 9 -
writerfilter/source/dmapper/StyleSheetTable.hxx | 2
writerfilter/source/dmapper/TDefTableHandler.cxx | 6
writerfilter/source/dmapper/TDefTableHandler.hxx | 6
writerfilter/source/dmapper/TblStylePrHandler.cxx | 4
writerfilter/source/dmapper/TblStylePrHandler.hxx | 4
writerfilter/source/dmapper/ThemeTable.cxx | 2
writerfilter/source/dmapper/ThemeTable.hxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2
writerfilter/source/rtftok/rtfsdrimport.cxx | 8 -
writerfilter/source/rtftok/rtfsdrimport.hxx | 8 -
writerfilter/source/rtftok/rtfvalue.cxx | 6
writerfilter/source/rtftok/rtfvalue.hxx | 6
xmlsecurity/inc/xmlsecurity/biginteger.hxx | 2
xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx | 2
xmlsecurity/inc/xmlsecurity/sigstruct.hxx | 4
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
xmlsecurity/source/helper/documentsignaturehelper.cxx | 4
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 2
xmlsecurity/source/helper/xsecctl.hxx | 2
xmlsecurity/source/xmlsec/biginteger.cxx | 2
332 files changed, 810 insertions(+), 801 deletions(-)
New commits:
commit b69dcab522f04d914f5f2ded350032bc3840c312
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 11:25:23 2014 +0200
extensions: prefer passing OUString by reference
Change-Id: Ic411b2776d0c054d59bfdc847f67785c85c5cb9e
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 9d649ca..015f2b7 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -110,7 +110,7 @@ protected:
void SetMeAsUidListener();
void RemoveMeAsUidListener();
- void UpdateAddressbookCursor(OUString aSourceName);
+ void UpdateAddressbookCursor(const OUString& aSourceName);
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm);
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index d4483b7..be37d26 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -432,7 +432,7 @@ void BibGeneralPage::CommitActiveControl()
}
void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize,
- OUString& rErrorString, OUString aColumnUIName, const OString& sHelpId, sal_uInt16 nIndexInFTArray )
+ OUString& rErrorString, const OUString& aColumnUIName, const OString& sHelpId, sal_uInt16 nIndexInFTArray )
{
// adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index ce6c099..8062e18 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -128,7 +128,7 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
sal_Int16& rIndex );
void AddControlWithError( const OUString& rColumnName, const Point& rPos,
- const Size& rSize, OUString& rErrorString, OUString aColumnUIName,
+ const Size& rSize, OUString& rErrorString, const OUString& aColumnUIName,
const OString& sHelpId, sal_uInt16 nIndexInFTArray );
void AdjustScrollbars();
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 6117df5..0e30a7a 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::beans;
// Konstanten -------------------------------------------------------------
-BibToolBarListener::BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
+BibToolBarListener::BibToolBarListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId):
nIndex(nId),
aCommand(aStr),
pToolBar(pTB)
@@ -79,7 +79,7 @@ OUString BibToolBarListener::GetCommand() const
return aCommand;
}
-BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
+BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId):
BibToolBarListener(pTB,aStr,nId)
{
}
@@ -118,7 +118,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
}
};
-BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
+BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId):
BibToolBarListener(pTB,aStr,nId)
{
}
@@ -155,7 +155,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
}
};
-BibTBEditListener::BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
+BibTBEditListener::BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId):
BibToolBarListener(pTB,aStr,nId)
{
}
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 7fbe163..86da81a 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -48,7 +48,7 @@ protected:
public:
- BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
+ BibToolBarListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
~BibToolBarListener();
OUString GetCommand() const;
@@ -68,7 +68,7 @@ class BibTBListBoxListener: public BibToolBarListener
{
public:
- BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
+ BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
~BibTBListBoxListener();
virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
@@ -80,7 +80,7 @@ class BibTBEditListener: public BibToolBarListener
{
public:
- BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
+ BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
~BibTBEditListener();
virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
@@ -92,7 +92,7 @@ class BibTBQueryMenuListener: public BibToolBarListener
{
public:
- BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
+ BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
~BibTBQueryMenuListener();
virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 79d0c1d..feab5da 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -191,7 +191,7 @@ namespace pcr
namespace
{
- bool lcl_isLanguageDependentProperty( OUString aName )
+ bool lcl_isLanguageDependentProperty( const OUString& aName )
{
bool bRet = false;
commit 1d6fd96df71265730550e68878a1d2856761a2f3
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 11:25:03 2014 +0200
framework: prefer passing OUString by reference
Change-Id: I23c2ac9ef6bfc3eedb8ad6cb199c12d42ed642c8
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 915ffa5..9893c2f 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -85,7 +85,7 @@ struct TabEntry
TabEntry() :
m_nIndex( -1 ), m_pPage( NULL ) {}
- TabEntry( sal_Int32 nIndex, OUString sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
+ TabEntry( sal_Int32 nIndex, const OUString& sURL, const css::uno::Reference< css::awt::XContainerWindowEventHandler > & rEventHdl ) :
m_nIndex( nIndex ), m_pPage( NULL ), m_sPageURL( sURL ), m_xEventHdl( rEventHdl ) {}
~TabEntry() { delete m_pPage; }
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index db8be46e..6f5bef6 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -217,7 +217,7 @@ namespace framework
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName );
- void implts_writeNewStateData( const OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
+ void implts_writeNewStateData( const OUString& aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
sal_Bool implts_readWindowStateData( const OUString& rName, UIElement& rElementData );
void implts_writeWindowStateData( const OUString& rName, const UIElement& rElementData );
void implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 68a6524..b028e5f 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -25,10 +25,10 @@
namespace framework{
-LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext ,
+LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext ,
const css::uno::Reference< css::frame::XFrame >& xOwnerFrame ,
- const OUString sTargetName ,
- sal_Int32 nSearchFlags)
+ const OUString& sTargetName ,
+ sal_Int32 nSearchFlags)
: ThreadHelpBase( )
, m_xContext (xContext )
, m_xOwnerFrame (xOwnerFrame )
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 11c5685..a165a29 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -151,7 +151,7 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos )
}
-static sal_uInt16 FindMenuId( Menu* pMenu, const OUString aCommand )
+static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand )
{
sal_uInt16 nPos = 0;
OUString aCmd;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 2fc0bef..268eae1 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -328,7 +328,7 @@ class AddonsOptions_Impl : public ConfigItem
sal_Bool ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& aAddonMenuSeq );
sal_Bool ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeMenuBarSeq );
sal_Bool ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames );
- sal_Bool ReadToolBarItemSet( const OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq );
+ sal_Bool ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& aAddonOfficeToolBarSeq );
sal_Bool ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& aAddonOfficeHelpMenuSeq );
void ReadImages( ImageManager& aImageManager );
sal_Bool ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer );
@@ -840,7 +840,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo
// private method
-sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
+sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
{
sal_Bool bInsertSeparator = sal_False;
sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength();
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 23b16ac..c0384b2 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -85,8 +85,8 @@ class LoadDispatcher : private ThreadHelpBase
*/
LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::frame::XFrame >& xOwnerFrame ,
- const OUString sTargetName ,
- sal_Int32 nSearchFlags);
+ const OUString& sTargetName ,
+ sal_Int32 nSearchFlags);
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 8946969..fb49ad8 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -579,7 +579,7 @@ void TestLanguageTag::testAllTags()
}
}
-static bool checkMapping( const OUString rStr1, const OUString& rStr2 )
+static bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
{
if (rStr1 == "la-Latn" ) return rStr2 == "la";
if (rStr1 == "tzm-Latn-DZ" ) return rStr2 == "kab-DZ";
commit 96b5d4f62709a7db0c1a85f35938abdedea578e3
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 11:24:40 2014 +0200
uui: prefer passing OUString by reference
Change-Id: Iec1fb3fd063d73f04a1600a21d6129e4cd5476b4
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 2050f38..ae579e6 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -507,7 +507,7 @@ executePasswordDialog(
Window * pParent,
LoginErrorInfo & rInfo,
task::PasswordRequestMode nMode,
- OUString aDocName,
+ const OUString& aDocName,
bool bMSCryptoMode,
bool bIsPasswordToModify,
bool bIsSimplePasswordRequest )
@@ -569,7 +569,7 @@ handlePasswordRequest_(
task::PasswordRequestMode nMode,
uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
rContinuations,
- OUString aDocumentName,
+ const OUString& aDocumentName,
bool bMSCryptoMode,
bool bIsPasswordToModify,
bool bIsSimplePasswordRequest = false )
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index feb21f2..f51efa1 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -80,7 +80,7 @@ getContentPart( const OUString& _rRawString )
bool
isDomainMatch(
- OUString hostName, uno::Sequence< OUString > certHostNames)
+ const OUString& hostName, uno::Sequence< OUString > certHostNames)
{
for ( int i = 0; i < certHostNames.getLength(); i++){
OUString element = certHostNames[i];
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 907fa49..13bbb7e 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -257,9 +257,10 @@ UUIInteractionHelper::getStringFromRequest(
OUString
UUIInteractionHelper::replaceMessageWithArguments(
- OUString aMessage,
+ const OUString& _aMessage,
std::vector< OUString > const & rArguments )
{
+ OUString aMessage = _aMessage;
for (sal_Int32 i = 0;;)
{
i = aMessage.indexOf("$(ARG", i);
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index be740d0..44b1912 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -122,7 +122,7 @@ public:
// Helper.
static OUString
replaceMessageWithArguments(
- OUString aMessage,
+ const OUString& aMessage,
std::vector< OUString > const & rArguments );
::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 6d6bc02..91e05e0 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
PasswordDialog::PasswordDialog(Window* _pParent,
task::PasswordRequestMode nDlgMode, ResMgr * pResMgr,
- OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest)
+ const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest)
: ModalDialog(_pParent, "PasswordDialog", "uui/ui/password.ui")
, nMinLen(1)
, aPasswdMismatch(ResId(STR_PASSWORD_MISMATCH, *pResMgr))
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index bb5a592..4d7c03d 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog
DECL_LINK(OKHdl_Impl, void *);
public:
- PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, OUString& aDocURL,
+ PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
commit 4386863e1a5b3aebaded5ff66e4bd29ca7ce67d0
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:18:44 2014 +0200
xmlsecurity: prefer passing OUString by reference
Change-Id: I44b96a8adc2f6309088d99ff3bce438f660d302d
diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index f7c3c61..32e7744 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -27,7 +27,7 @@
#include "com/sun/star/uno/Sequence.h"
OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
-::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( OUString serialNumber );
+::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( const OUString& serialNumber );
#endif
diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
index 361c8d3..61dc500 100644
--- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
@@ -71,7 +71,7 @@ public:
DocumentSignatureMode eDocSigMode );
static std::vector< OUString > CreateElementList(
const css::uno::Reference < css::embed::XStorage >& rxStore,
- const OUString rRootStorageName, DocumentSignatureMode eMode,
+ DocumentSignatureMode eMode,
const DocumentSignatureAlgorithm mode);
static bool isODFPre_1_2(const OUString & sODFVersion);
static bool isOOo3_2_Signature(const SignatureInformation & sigInfo);
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index 77ab5d8..dd80c39 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -35,11 +35,11 @@
struct SignatureReferenceInformation
{
- sal_Int32 nType;
+ sal_Int32 nType;
OUString ouURI;
OUString ouDigestValue;
- SignatureReferenceInformation( sal_Int32 type, OUString uri )
+ SignatureReferenceInformation( sal_Int32 type, const OUString& uri )
{
nType = type;
ouURI = uri;
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index cf2dc7c..dfe9c76 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -126,7 +126,7 @@ public:
// Set the storage which should be used by the default UriBinding
// Must be set before StatrtMission().
//sODFVersion indicates the ODF version
- void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, OUString sODFVersion );
+ void SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, const OUString& sODFVersion );
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
// Return 1 to verify, 0 to skip.
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 896ee9f..3be1610 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -293,7 +293,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
m_sODFVersion, aSignInfos[n]);
const std::vector< OUString > aElementsToBeVerified =
DocumentSignatureHelper::CreateElementList(
- rxStorage, OUString(), eMode, mode);
+ rxStorage, eMode, mode);
const SignatureInformation& rInfo = aSignInfos[n];
css::security::DocumentSignatureInformation& rSigInfo = arInfos[n];
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index b9452c3..bd29787 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -437,7 +437,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
std::vector< OUString > aElements =
DocumentSignatureHelper::CreateElementList(
- mxStore, OUString(), meSignatureMode, OOo3_2Document);
+ mxStore, meSignatureMode, OOo3_2Document);
sal_Int32 nElements = aElements.size();
for ( sal_Int32 n = 0; n < nElements; n++ )
@@ -576,7 +576,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
m_sODFVersion, maCurrentSignatureInformations[n]);
std::vector< OUString > aElementsToBeVerified =
DocumentSignatureHelper::CreateElementList(
- mxStore, OUString(), meSignatureMode, mode);
+ mxStore, meSignatureMode, mode);
const SignatureInformation& rInfo = maCurrentSignatureInformations[n];
//First we try to get the certificate which is embedded in the XML Signature
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 11f6c6e..2ec4f03 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -76,7 +76,7 @@ int compareVersions(
//then mimetype and all content of META-INF must be excluded.
void ImplFillElementList(
std::vector< OUString >& rList, const Reference < css::embed::XStorage >& rxStore,
- const OUString rRootStorageName, const bool bRecursive,
+ const OUString& rRootStorageName, const bool bRecursive,
const DocumentSignatureAlgorithm mode)
{
OUString aMetaInfName( "META-INF" );
@@ -185,7 +185,7 @@ DocumentSignatureHelper::getDocumentAlgorithm(
std::vector< OUString >
DocumentSignatureHelper::CreateElementList(
const Reference < css::embed::XStorage >& rxStore,
- const OUString /*rRootStorageName*/, DocumentSignatureMode eMode,
+ DocumentSignatureMode eMode,
const DocumentSignatureAlgorithm mode)
{
std::vector< OUString > aElements;
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index b5e2869..e327210 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -75,7 +75,7 @@ bool XMLSignatureHelper::Init()
void XMLSignatureHelper::SetStorage(
const Reference < css::embed::XStorage >& rxStorage,
- OUString sODFVersion)
+ const OUString& sODFVersion)
{
DBG_ASSERT( !mxUriBinding.is(), "SetStorage - UriBinding already set!" );
mxUriBinding = new UriBindingHelper( rxStorage );
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 0b5469b..c45836e 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -131,7 +131,7 @@ public:
xReferenceResolvedListener = xListener;
}
- void addReference( sal_Int32 type, OUString uri, sal_Int32 keeperId )
+ void addReference( sal_Int32 type, const OUString& uri, sal_Int32 keeperId )
{
signatureInfor.vSignatureReferenceInfors.push_back(
SignatureReferenceInformation(type, uri));
diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx
index ae63a29..72eb669 100644
--- a/xmlsecurity/source/xmlsec/biginteger.cxx
+++ b/xmlsecurity/source/xmlsec/biginteger.cxx
@@ -25,7 +25,7 @@
using namespace ::com::sun::star::uno ;
-Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral )
+Sequence< sal_Int8 > numericStringToBigInteger ( const OUString& numeral )
{
if( numeral.getStr() != NULL )
{
commit 676558732b8f77460fd91955f739e4ccc5eb8111
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:18:24 2014 +0200
ucb: prefer passing OUString by reference
Change-Id: I1ea8374e39c893c6da6373ccec81d2404c3ee201
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index 9fc5fae..4475962 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -24,8 +24,8 @@ namespace cmis
public:
AuthProvider ( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment>& xEnv,
- OUString sUrl,
- OUString sBindingUrl ):
+ const OUString& sUrl,
+ const OUString& sBindingUrl ):
m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { }
bool authenticationQuery( std::string& username, std::string& password );
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 43b74da..2936ba8 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -30,7 +30,7 @@ namespace cmis
com::sun::star::ucb::XCommandEnvironment>& xEnv,
const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext>& xContext,
- OUString sHostname ):
+ const OUString& sHostname ):
m_xEnv( xEnv ), m_xContext( xContext ), m_sHostname( sHostname ) { }
bool validateCertificate( std::vector< std::string > certificates );
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index dd6f861..42fc76e 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -59,12 +59,12 @@ namespace cmis
return m_sRepositoryId;
}
- void URL::setObjectPath( OUString sPath )
+ void URL::setObjectPath( const OUString& sPath )
{
m_sPath = sPath;
}
- void URL::setObjectId( OUString sId )
+ void URL::setObjectId( const OUString& sId )
{
m_sId = sId;
}
diff --git a/ucb/source/ucp/cmis/cmis_url.hxx b/ucb/source/ucp/cmis/cmis_url.hxx
index e75e9e8..54c51ce 100644
--- a/ucb/source/ucp/cmis/cmis_url.hxx
+++ b/ucb/source/ucp/cmis/cmis_url.hxx
@@ -36,8 +36,8 @@ namespace cmis
OUString& getRepositoryId( );
OUString& getUsername( ) { return m_sUser; }
OUString& getPassword( ) { return m_sPass; }
- void setObjectPath( OUString sPath );
- void setObjectId( OUString sId );
+ void setObjectPath( const OUString& sPath );
+ void setObjectId( const OUString& sId );
OUString asString( );
};
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 9723918..b52d729 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1289,7 +1289,7 @@ BaseContent::cDEL( void )
ContentEventNotifier*
-BaseContent::cEXC( const OUString aNewName )
+BaseContent::cEXC( const OUString& aNewName )
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 39f65ed..5d3ed01 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -257,7 +257,7 @@ namespace fileaccess {
// Notifier
ContentEventNotifier* cDEL( void );
- ContentEventNotifier* cEXC( const OUString aNewName );
+ ContentEventNotifier* cEXC( const OUString& aNewName );
ContentEventNotifier* cCEL( void );
PropertySetInfoChangeNotifier* cPSL( void );
PropertyChangeNotifier* cPCL( void );
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 1527738..12b301c 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -108,7 +108,7 @@ namespace fileaccess {
{
public:
// Side effect of this function is the change of the name
- virtual ContentEventNotifier* cEXC( const OUString aNewName ) = 0;
+ virtual ContentEventNotifier* cEXC( const OUString& aNewName ) = 0;
// Side effect is the change of the state of the object to "deleted".
virtual ContentEventNotifier* cDEL( void ) = 0;
virtual ContentEventNotifier* cCEL( void ) = 0;
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 23e1fc7..79eddf0 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -68,7 +68,7 @@ class XResultSet_impl : public Notifier,
return 0;
}
- virtual ContentEventNotifier* cEXC( const OUString )
+ virtual ContentEventNotifier* cEXC( const OUString& )
{
return 0;
}
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index ada695b..878c91f 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1116,8 +1116,8 @@ shell::getv( sal_Int32 CommandId,
void SAL_CALL
shell::move( sal_Int32 CommandId,
- const OUString srcUnqPath,
- const OUString dstUnqPathIn,
+ const OUString& srcUnqPath,
+ const OUString& dstUnqPathIn,
const sal_Int32 NameClash )
throw()
{
@@ -1327,8 +1327,8 @@ bool getType(
void SAL_CALL
shell::copy(
sal_Int32 CommandId,
- const OUString srcUnqPath,
- const OUString dstUnqPathIn,
+ const OUString& srcUnqPath,
+ const OUString& dstUnqPathIn,
sal_Int32 NameClash )
throw()
{
@@ -2714,8 +2714,8 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste
std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
-shell::getContentExchangedEventListeners( const OUString aOldPrefix,
- const OUString aNewPrefix,
+shell::getContentExchangedEventListeners( const OUString& aOldPrefix,
+ const OUString& aNewPrefix,
sal_Bool withChildren )
{
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 8fe5644..dd84d29 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -298,8 +298,8 @@ namespace fileaccess {
void SAL_CALL
move( sal_Int32 CommandId,
- const OUString srcUnqPath, // Full file(folder)-path
- const OUString dstUnqPath, // Path to the destination-directory
+ const OUString& srcUnqPath, // Full file(folder)-path
+ const OUString& dstUnqPath, // Path to the destination-directory
const sal_Int32 NameClash )
throw();
@@ -309,8 +309,8 @@ namespace fileaccess {
void SAL_CALL
copy( sal_Int32 CommandId, // See "move"
- const OUString srcUnqPath,
- const OUString dstUnqPath,
+ const OUString& srcUnqPath,
+ const OUString& dstUnqPath,
sal_Int32 NameClash )
throw();
@@ -414,8 +414,8 @@ namespace fileaccess {
getContentDeletedEventListeners( const OUString& aName );
std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL
- getContentExchangedEventListeners( const OUString aOldPrefix,
- const OUString aNewPrefix,
+ getContentExchangedEventListeners( const OUString& aOldPrefix,
+ const OUString& aNewPrefix,
sal_Bool withChildren );
std::list< PropertyChangeNotifier* >* SAL_CALL
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index fcfab2a..42f476d 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -2023,7 +2023,7 @@ NeonSession::getDataFromInputStream(
}
sal_Bool
-NeonSession::isDomainMatch( OUString certHostName )
+NeonSession::isDomainMatch( const OUString& certHostName )
{
OUString hostName = getHostName();
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index f62ec00..e680a3e 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -227,7 +227,7 @@ public:
const void * getRequestData() const { return m_pRequestData; }
- sal_Bool isDomainMatch( OUString certHostName );
+ sal_Bool isDomainMatch( const OUString& certHostName );
private:
friend class NeonLockStore;
commit 5d456dc5c6bf733228f0c342be25c8f68513c8cb
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:18:05 2014 +0200
dbaccess: prefer passing OUString by reference
Change-Id: I7cec02a40db48ce3d3003b3808d06ff0455a6eb4
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 3b028ef..65d862e 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -437,14 +437,14 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getSt
void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (SQLException, RuntimeException, std::exception)
{
SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendHavingClauseByColumn" );
- ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
+ ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
}
void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw(SQLException, RuntimeException, std::exception)
{
SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendFilterByColumn" );
- ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
+ ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
}
@@ -643,8 +643,8 @@ void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _r
namespace
{
- OUString getComposedClause( const OUString _rElementaryClause, const OUString _rAdditionalClause,
- TokenComposer& _rComposer, const OUString _rKeyword )
+ OUString getComposedClause( const OUString& _rElementaryClause, const OUString& _rAdditionalClause,
+ TokenComposer& _rComposer, const OUString& _rKeyword )
{
_rComposer.clear();
_rComposer.append( _rElementaryClause );
@@ -1548,7 +1548,7 @@ void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Seque
setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns()));
}
-void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString>& _aSetFunctor,sal_Int32 filterOperator)
+void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor,sal_Int32 filterOperator)
{
SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setConditionByColumn" );
::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 1008e3c..2e676ab 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -349,7 +349,7 @@ namespace
}
}
- static Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const OUString _rURL )
+ static Sequence< PropertyValue > lcl_appendFileNameToDescriptor( const ::comphelper::NamedValueCollection& _rDescriptor, const OUString& _rURL )
{
::comphelper::NamedValueCollection aMutableDescriptor( _rDescriptor );
if ( !_rURL.isEmpty() )
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 3d67511..3f43e35 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -133,7 +133,7 @@ namespace dbaccess
void setConditionByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column
, sal_Bool andCriteria
- ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString>& _aSetFunctor
+ ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor
,sal_Int32 filterOperator);
/** getStructuredCondition returns the structured condition for the where or having clause
@@ -150,8 +150,8 @@ namespace dbaccess
setCurrentColumns( EColumnType _eType, const ::rtl::Reference< ::connectivity::OSQLColumns >& _rCols );
//helper methods for mem_fun_t
- inline bool implSetFilter(OUString _sFilter) { setFilter(_sFilter); return true;}
- inline bool implSetHavingClause(OUString _sFilter) { setHavingClause(_sFilter); return true;}
+ inline bool implSetFilter(const OUString& _sFilter) { setFilter(_sFilter); return true;}
+ inline bool implSetHavingClause(const OUString& _sFilter) { setHavingClause(_sFilter); return true;}
/** returns the part of the seelect statement
@param _ePart
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index cfe103d..3e0fc45 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -371,7 +371,7 @@ namespace dbmm
{
bool lcl_equalURLs_nothrow(
const Reference< XComponentContext >& context,
- const OUString& _lhs, const OUString _rhs )
+ const OUString& _lhs, const OUString& _rhs )
{
// the cheap situation: the URLs are equal
if ( _lhs == _rhs )
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 9570d8f..b15854d 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -341,7 +341,7 @@ sal_Bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivile
return bAllowed;
}
-void OTableGrantControl::setUserName(const OUString _sUserName)
+void OTableGrantControl::setUserName(const OUString& _sUserName)
{
m_sUserName = _sUserName;
m_aPrivMap = TTablePrivilegeMap();
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 5a05141..ed4ad22 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -40,7 +40,7 @@ using namespace ::svt;
const OString aGroupIdent("dBase III");
-ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, OUString aDataSrcName)
+ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, const OUString& aDataSrcName)
: ModalDialog(pParent, "DBaseIndexDialog", "dbaccess/ui/dbaseindexdialog.ui")
, m_aDSN(aDataSrcName)
, m_bCaseSensitiv(true)
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index d3bb626..adebe92 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -112,7 +112,7 @@ protected:
void checkButtons();
public:
- ODbaseIndexDialog( Window * pParent, OUString aDataSrcName );
+ ODbaseIndexDialog( Window * pParent, const OUString& aDataSrcName );
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 590dbef..ff2b839 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -354,7 +354,7 @@ namespace dbaui
return _inout_rDisplayName.getLength() > 0;
}
- void OGeneralPage::insertDatasourceTypeEntryData(const OUString& _sType, OUString sDisplayName)
+ void OGeneralPage::insertDatasourceTypeEntryData(const OUString& _sType, const OUString& sDisplayName)
{
// insert a (temporary) entry
sal_uInt16 nPos = m_pDatasourceType->InsertEntry(sDisplayName);
@@ -363,7 +363,7 @@ namespace dbaui
m_aURLPrefixes[nPos] = _sType;
}
- void OGeneralPageWizard::insertEmbeddedDBTypeEntryData(const OUString& _sType, OUString sDisplayName)
+ void OGeneralPageWizard::insertEmbeddedDBTypeEntryData(const OUString& _sType, const OUString& sDisplayName)
{
// insert a (temporary) entry
sal_uInt16 nPos = m_pEmbeddedDBType->InsertEntry(sDisplayName);
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 5711261..aa44427 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -54,7 +54,7 @@ namespace dbaui
sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted
bool m_bInitTypeList : 1;
bool approveDatasourceType( const OUString& _sURLPrefix, OUString& _inout_rDisplayName );
- void insertDatasourceTypeEntryData( const OUString& _sType, OUString sDisplayName );
+ void insertDatasourceTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
protected:
ListBox* m_pDatasourceType;
@@ -159,7 +159,7 @@ namespace dbaui
m_aControlDependencies;
bool m_bInitEmbeddedDBList : 1;
- void insertEmbeddedDBTypeEntryData( const OUString& _sType, OUString sDisplayName );
+ void insertEmbeddedDBTypeEntryData( const OUString& _sType, const OUString& sDisplayName );
public:
void SetCreationModeHandler( const Link& _rHandler ) { m_aCreationModeHandler = _rHandler; }
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 6e360cb..63901b4 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -62,7 +62,7 @@ public:
OTableGrantControl( Window* pParent,const ResId& _RsId);
virtual ~OTableGrantControl();
void UpdateTables();
- void setUserName(const OUString _sUserName);
+ void setUserName(const OUString& _sUserName);
void setGrantUser(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XAuthorizable>& _xGrantUser);
void setTablesSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >& _xTablesSup);
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 97a5bd2..aaf3ab9 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -84,7 +84,7 @@ namespace dbaui
return s_aMappings;
}
- static const FeatureSet& lcl_getFeatureSet( const OUString _rURL )
+ static const FeatureSet& lcl_getFeatureSet( const OUString& _rURL )
{
typedef ::std::map< OUString, FeatureSet > FeatureSets;
static FeatureSets s_aFeatureSets;
commit 12bb4fdddd3c72a9fc9209288cc8e827bf353920
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:17:48 2014 +0200
cui: prefer passing OUString by reference
Change-Id: I1a4d36a329a0eac8b9bb3d9b0a5434ffc843bde2
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index d6320a4..28577d7 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -56,7 +56,7 @@ struct DocumentTypeData
{
OUString aStrURL;
OUString aStrExt;
- DocumentTypeData (OUString aURL, OUString aExt) : aStrURL(aURL), aStrExt(aExt)
+ DocumentTypeData (const OUString& aURL, const OUString& aExt) : aStrURL(aURL), aStrExt(aExt)
{}
};
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 67903b4..77aff95 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -56,7 +56,7 @@ struct TargetData
OUString aUStrLinkname;
bool bIsTarget;
- TargetData (OUString aUStrLName, bool bTarget)
+ TargetData (const OUString& aUStrLName, bool bTarget)
: bIsTarget(bTarget)
{
if (bIsTarget)
@@ -269,7 +269,7 @@ void SvxHlinkDlgMarkWnd::RestoreLastSelection()
|*
|************************************************************************/
-void SvxHlinkDlgMarkWnd::RefreshTree (OUString aStrURL)
+void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL)
{
OUString aUStrURL;
@@ -307,7 +307,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree (OUString aStrURL)
|*
|************************************************************************/
-sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(OUString aURL)
+sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
{
mnError = LERR_NOERROR;
@@ -497,7 +497,7 @@ void SvxHlinkDlgMarkWnd::ClearTree()
|*
|************************************************************************/
-SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (OUString aStrName)
+SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (const OUString& aStrName)
{
sal_Bool bFound=sal_False;
SvTreeListEntry* pEntry = maLbTree.First();
@@ -520,7 +520,7 @@ SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (OUString aStrName)
|*
|************************************************************************/
-bool SvxHlinkDlgMarkWnd::SelectEntry(OUString aStrMark)
+bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark)
{
SvTreeListEntry* pEntry = FindEntry(aStrMark);
if (!pEntry)
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 7192521..90cac37 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -352,7 +352,7 @@ void SFTreeListBox::ExpandAllTrees()
SAL_WNODEPRECATED_DECLARATIONS_PUSH
SvTreeListEntry * SFTreeListBox::insertEntry(
OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
- bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, OUString factoryURL )
+ bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, const OUString& factoryURL )
{
SvTreeListEntry * p;
if( nBitmap == RID_CUIIMG_DOC && !factoryURL.isEmpty() )
@@ -454,7 +454,7 @@ CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode )
// ScriptOrgDialog ------------------------------------------------------------
-SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, OUString language )
+SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, const OUString& language )
: SfxModalDialog(pParent, "ScriptOrganizerDialog",
"cui/ui/scriptorganizer.ui")
, m_sLanguage(language)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 28622ad..03d4ca9 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -283,8 +283,8 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
virtual void SetSizePixel( const Size& rNewSize );
virtual Size GetSizePixel() const;
virtual bool MoveTo( Point aNewPos ) const;
- virtual bool ConnectToDialog( bool bDoit = true )const;
- virtual void RefreshTree ( const OUString& aStrURL ) ;
+ virtual bool ConnectToDialog( bool bDoit = true ) const;
+ virtual void RefreshTree ( const OUString& aStrURL );
virtual void SelectEntry ( const OUString& aStrMark );
virtual sal_uInt16 SetError( sal_uInt16 nError) ;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index ab5a31c..1a0292f 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -273,8 +273,8 @@ public:
virtual void StateChanged(StateChangedType nStateChange);
void SetLanguage(LanguageType eSet);
- void DeleteEntry(OUString sShort, OUString sLong);
- void NewEntry(OUString sShort, OUString sLong, bool bKeepSourceFormatting);
+ void DeleteEntry(const OUString& sShort, const OUString& sLong);
+ void NewEntry(const OUString& sShort, const OUString& sLong, bool bKeepSourceFormatting);
};
// class OfaAutocorrExceptPage ---------------------------------------------
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 4e7652a..ecc0271 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -71,10 +71,10 @@ private:
sal_uInt16 mnError;
protected:
- sal_Bool RefreshFromDoc( OUString aURL );
+ sal_Bool RefreshFromDoc( const OUString& aURL );
void RestoreLastSelection();
- SvTreeListEntry* FindEntry(OUString aStrName);
+ SvTreeListEntry* FindEntry(const OUString& aStrName);
void ClearTree();
int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL );
@@ -88,8 +88,8 @@ public:
~SvxHlinkDlgMarkWnd();
sal_Bool MoveTo ( Point aNewPos );
- void RefreshTree(OUString aStrURL);
- bool SelectEntry(OUString aStrMark);
+ void RefreshTree(const OUString& aStrURL);
+ bool SelectEntry(const OUString& aStrMark);
sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True );
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 89db028..bb3fa60 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -86,7 +86,7 @@ public:
SvTreeListEntry * pParent,
bool bChildrenOnDemand,
std::auto_ptr< SFEntry > aUserData,
- OUString factoryURL );
+ const OUString& factoryURL );
SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap,
SvTreeListEntry * pParent,
bool bChildrenOnDemand,
@@ -177,7 +177,7 @@ protected:
public:
// prob need another arg in the ctor
// to specify the language or provider
- SvxScriptOrgDialog( Window* pParent, OUString language );
+ SvxScriptOrgDialog( Window* pParent, const OUString& language );
~SvxScriptOrgDialog();
virtual short Execute();
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 6e0a0f3..80504a5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -381,7 +381,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
}
}
-Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( OUString sNodePath, sal_Bool bUpdate )
+Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate )
{
uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 0f80272..135fc21 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -62,7 +62,7 @@ public:
void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue);
void Reset(/* const SfxItemSet&*/ );
void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
- com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( OUString sNodePath, sal_Bool bUpdate );
+ com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate );
virtual sal_Bool FillItemSet( /* SfxItemSet& rSet*/ );
virtual Size GetOptimalSize() const;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8297b60..d0cac4e 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -130,10 +130,11 @@ static sal_Int32 lcl_SeqGetEntryPos(
return i < nLen ? i : -1;
}
-static void lcl_OpenURL( OUString sURL )
+static void lcl_OpenURL( const OUString& _sURL )
{
- if ( !sURL.isEmpty() )
+ if ( !_sURL.isEmpty() )
{
+ OUString sURL = _sURL;
localizeWebserviceURI(sURL);
try
{
@@ -200,7 +201,7 @@ class ModuleUserData_Impl
OUString sImplName;
public:
- ModuleUserData_Impl( OUString sImpName, sal_Bool bIsParent, sal_Bool bChecked, sal_uInt8 nSetType, sal_uInt8 nSetIndex ) :
+ ModuleUserData_Impl( const OUString& sImpName, sal_Bool bIsParent, sal_Bool bChecked, sal_uInt8 nSetType, sal_uInt8 nSetIndex ) :
bParent(bIsParent),
bIsChecked(bChecked),
nType(nSetType),
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index e4b6e58..b9490de 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -345,7 +345,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
-sal_Bool isODFFormat( OUString sFilter )
+sal_Bool isODFFormat( const OUString& sFilter )
{
static const char* aODFFormats[] =
{
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 8611fc7..300f876 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1130,7 +1130,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
return 0;
};
-void OfaAutocorrReplacePage::NewEntry(OUString sShort, OUString sLong, bool bKeepSourceFormatting)
+void OfaAutocorrReplacePage::NewEntry(const OUString& sShort, const OUString& sLong, bool bKeepSourceFormatting)
{
DoubleStringArray& rNewArray = aChangesTable[eLang].aNewEntries;
for (sal_uInt32 i = 0; i < rNewArray.size(); i++)
@@ -1160,7 +1160,7 @@ void OfaAutocorrReplacePage::NewEntry(OUString sShort, OUString sLong, bool bKee
rNewArray.back().pUserData = &bHasSelectionText;
}
-void OfaAutocorrReplacePage::DeleteEntry(OUString sShort, OUString sLong)
+void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString& sLong)
{
DoubleStringArray& rNewArray = aChangesTable[eLang].aNewEntries;
for (sal_uInt32 i = 0; i < rNewArray.size(); i++)
commit 7e8af4b249132764d9eca559b4a6e2449d4d26f8
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:17:07 2014 +0200
basct: prefer passing OUString by reference
Change-Id: Ide803f793e829767fad89ab2aef776ef24fedb37
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 97dee2e..0ddd014 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -197,7 +197,7 @@ bool bSourceLinesEnabled = false;
ModulWindow::ModulWindow (
ModulWindowLayout* pParent,
ScriptDocument const& rDocument,
- OUString aLibName, OUString aName, OUString& aModule
+ const OUString& aLibName, const OUString& aName, OUString& aModule
) :
BaseWindow(pParent, rDocument, aLibName, aName),
rLayout(*pParent),
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index e4dfc80..92f346d 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -337,7 +337,7 @@ protected:
public:
TYPEINFO();
- ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName, OUString& aModule );
+ ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, OUString& aModule );
~ModulWindow();
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 2e50548..1f2122b 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -78,7 +78,7 @@ TYPEINIT1( DialogWindow, BaseWindow );
DialogWindow::DialogWindow (
DialogWindowLayout* pParent,
ScriptDocument const& rDocument,
- OUString aLibName, OUString aName,
+ const OUString& aLibName, const OUString& aName,
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel
) :
BaseWindow(pParent, rDocument, aLibName, aName),
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 1581ee7..61146c1 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -908,7 +908,7 @@ void Shell::EnableScrollbars( bool bEnable )
aVScrollBar.Enable(bEnable);
}
-void Shell::SetCurLib( const ScriptDocument& rDocument, OUString aLibName, bool bUpdateWindows, bool bCheck )
+void Shell::SetCurLib( const ScriptDocument& rDocument, const OUString& aLibName, bool bUpdateWindows, bool bCheck )
{
if ( !bCheck || ( rDocument != m_aCurDocument || aLibName != m_aCurLibName ) )
{
@@ -939,7 +939,7 @@ void Shell::SetCurLib( const ScriptDocument& rDocument, OUString aLibName, bool
}
}
-void Shell::SetCurLibForLocalization( const ScriptDocument& rDocument, OUString aLibName )
+void Shell::SetCurLibForLocalization( const ScriptDocument& rDocument, const OUString& aLibName )
{
// Create LocalizationMgr
Reference< resource::XStringResourceManager > xStringResourceManager;
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index af59070..c3bef5d 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -55,7 +55,7 @@ DBG_NAME( BaseWindow )
TYPEINIT0( BaseWindow )
TYPEINIT1( SbxItem, SfxPoolItem );
-BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName )
+BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,m_aDocument( rDocument )
,m_aLibName( aLibName )
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 2812387..2c5efb2 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -102,7 +102,7 @@ namespace
}
-bool isLanguageDependentProperty( OUString aName )
+bool isLanguageDependentProperty( const OUString& aName )
{
static struct Prop
{
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index a47d30a..83106ac 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -939,7 +939,7 @@ void LibDialog::SetStorageName( const OUString& rName )
// Helper function
SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
- TreeListBox& rBasicBox, const OUString& rLibName, OUString aModName, bool bMain )
+ TreeListBox& rBasicBox, const OUString& rLibName, const OUString& _aModName, bool bMain )
{
OSL_ENSURE( rDocument.isAlive(), "createModImpl: invalid document!" );
if ( !rDocument.isAlive() )
@@ -951,6 +951,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
if ( aLibName.isEmpty() )
aLibName = "Standard" ;
rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
+ OUString aModName = _aModName;
if ( aModName.isEmpty() )
aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index ee85969..51daca7 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -257,7 +257,7 @@ public:
// Helper functions
SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
- TreeListBox& rBasicBox, const OUString& rLibName, OUString aModName, bool bMain = false );
+ TreeListBox& rBasicBox, const OUString& rLibName, const OUString& aModName, bool bMain = false );
void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
CheckBox* pLibBox, TreeListBox* pBasicBox );
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index de239a3..01e1b3c 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -78,7 +78,7 @@ protected:
public:
TYPEINFO();
- DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, OUString aLibName, OUString aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel);
+ DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel);
DialogWindow( DialogWindow* pCurView ); // never implemented
~DialogWindow();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index eca619b..c4c5d72 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -102,8 +102,8 @@ private:
void StoreAllWindowData( bool bPersistent = true );
void SetMDITitle();
void EnableScrollbars( bool bEnable );
- void SetCurLib( const ScriptDocument& rDocument, OUString aLibName, bool bUpdateWindows = true , bool bCheck = true );
- void SetCurLibForLocalization( const ScriptDocument& rDocument, OUString aLibName );
+ void SetCurLib( const ScriptDocument& rDocument, const OUString& aLibName, bool bUpdateWindows = true , bool bCheck = true );
+ void SetCurLibForLocalization( const ScriptDocument& rDocument, const OUString& aLibName );
void ImplStartListening( StarBASIC* pBasic );
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 19e203e..97186fc 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -166,7 +166,7 @@ protected:
public:
TYPEINFO();
- BaseWindow( Window* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName );
+ BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName );
virtual ~BaseWindow();
void Init();
commit cc2700245d911c14114ce7346357b1a4d008cc06
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:16:07 2014 +0200
sd: prefer passing OUString by reference
Change-Id: Ide21e1f51284fb2d4c7aaaa358417c6080b2fdde
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index a095040..35476da 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -69,7 +69,7 @@ private:
static bool importTransitionsFile( TransitionPresetList& rList,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
UStringMap& rTransitionNameMape,
- OUString aFilename );
+ const OUString& aFilename );
};
}
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 40a4dcf..f10aef2 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -260,7 +260,7 @@ public:
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType,
const Rectangle& rOldBoundRect);
- void SetLayoutName(OUString aName);
+ void SetLayoutName(const OUString& aName);
virtual OUString GetLayoutName() const { return maLayoutName; }
void SetFileName(const OUString& aName) { maFileName = aName; }
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 966ccde..a12d112 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -92,7 +92,7 @@ TransitionPreset::TransitionPreset( const ::com::sun::star::uno::Reference< ::co
bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
Reference< XMultiServiceFactory >& xServiceFactory,
UStringMap& rTransitionNameMape,
- OUString aURL )
+ const OUString& aURL )
{
// import transition presets
Reference< XAnimationNode > xAnimationNode;
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 61c4533..f8654f0 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -356,7 +356,7 @@ lcl_removeUnusedStyles(SfxStyleSheetBasePool* const pStyleSheetPool, SdStyleShee
rStyles = aUsedStyles;
}
-SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, OUString aStyleName)
+SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, const OUString& aStyleName)
{
for(SdStyleSheetVector::const_iterator aIt(rStyles.begin()), aLast(rStyles.end()); aIt != aLast; ++aIt)
{
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index b576742..f8429c5 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -494,7 +494,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pSSPool->CreateLayoutStyleSheets(aPrefix);
}
-static Any implMakeSolidCellStyle( SdStyleSheetPool* pSSPool, const OUString& rName, const OUString rParent, const Color& rColor )
+static Any implMakeSolidCellStyle( SdStyleSheetPool* pSSPool, const OUString& rName, const OUString& rParent, const Color& rColor )
{
SfxStyleSheetBase* pSheet = &(pSSPool->Make(rName, SD_STYLE_FAMILY_CELL, SFXSTYLEBIT_AUTO));
pSheet->SetParent(rParent);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index adc8f73..728fb46 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2500,7 +2500,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
|* Set the name of the layout
|*
\************************************************************************/
-void SdPage::SetLayoutName(OUString aName)
+void SdPage::SetLayoutName(const OUString& aName)
{
maLayoutName = aName;
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 6b88b0b..3dfd66f 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -86,7 +86,7 @@ OUString lcl_findRenamedStyleName(std::vector< std::pair< OUString, OUString > >
return OUString();
}
-SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, OUString aStyleName)
+SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, const OUString& aStyleName)
{
if( aStyleName.isEmpty() )
return NULL;
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 4efbd3b..b4f9e64 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -125,7 +125,7 @@ protected:
sal_uInt32 GetNewSlideId() { return mnSlideIdMax ++; }
sal_uInt32 GetNewSlideMasterId() { return mnSlideMasterIdMax ++; }
- sal_Int32 GetAuthorIdAndLastIndex( OUString sAuthor, sal_Int32& nLastIndex );
+ sal_Int32 GetAuthorIdAndLastIndex( const OUString& sAuthor, sal_Int32& nLastIndex );
private:
void AddLayoutIdAndRelation( ::sax_fastparser::FSHelperPtr pFS, sal_Int32 nLayoutFileId );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ce47590..74d06fe 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1226,7 +1226,7 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS )
}
-static OUString lcl_GetInitials( OUString sName )
+static OUString lcl_GetInitials( const OUString& sName )
{
OUStringBuffer sRet;
@@ -1272,7 +1272,7 @@ void PowerPointExport::WriteAuthors()
pFS->endElementNS( XML_p, XML_cmAuthorLst );
}
-sal_Int32 PowerPointExport::GetAuthorIdAndLastIndex( OUString sAuthor, sal_Int32& nLastIndex )
+sal_Int32 PowerPointExport::GetAuthorIdAndLastIndex( const OUString& sAuthor, sal_Int32& nLastIndex )
{
if ( maAuthors.count( sAuthor ) <= 0 ) {
struct AuthorComments aAuthorComments;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b8322c4..38ff219 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -333,7 +333,7 @@ static OUString getParagraphStyle( SdrOutliner* pOutliner, sal_Int32 nPara )
// constructor for the html export helper classes
HtmlExport::HtmlExport(
- OUString aPath,
+ const OUString& aPath,
const Sequence< PropertyValue >& rParams,
SdDrawDocument* pExpDoc,
::sd::DrawDocShell* pDocShell )
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index b98105f..bb4d01f 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -210,7 +210,7 @@ class HtmlExport
OUString GetButtonName( int nButton ) const;
public:
- HtmlExport( OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell );
+ HtmlExport( const OUString& aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell );
virtual ~HtmlExport();
static OUString ColorToHTMLString( Color aColor );
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 8cbc95a..8c714a2 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2251,7 +2251,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl)
-CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, OString sPage)
+CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& sPage)
: TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui")
, mpSet( pSet )
, mpResultSet( 0 )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index f7d350b..daeb6f2 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -150,7 +150,7 @@ class STLPropertySet;
class CustomAnimationDialog : public TabDialog
{
public:
- CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, OString Page = OString());
+ CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& Page = OString());
~CustomAnimationDialog();
STLPropertySet* getDefaultSet() { return mpSet; }
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 16d8e9e..0e946f0 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -203,7 +203,7 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true )
class CustomAnimationListEntryItem : public SvLBoxString
{
public:
- CustomAnimationListEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent );
+ CustomAnimationListEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent );
virtual ~CustomAnimationListEntryItem();
void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
SvLBoxItem* Create() const;
@@ -219,7 +219,7 @@ private:
-CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent )
+CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent )
: SvLBoxString( pEntry, nFlags, aDescription )
, mpParent( pParent )
, maDescription( aDescription )
@@ -355,7 +355,7 @@ CustomAnimationListEntry::~CustomAnimationListEntry()
class CustomAnimationTriggerEntryItem : public SvLBoxString
{
public:
- CustomAnimationTriggerEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription );
+ CustomAnimationTriggerEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, const OUString& aDescription );
virtual ~CustomAnimationTriggerEntryItem();
virtual sal_uInt16 IsA();
void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
@@ -370,7 +370,7 @@ private:
-CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription )
+CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString& aDescription )
: SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription )
{
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 958808a..96006e0 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1556,7 +1556,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper
}
}
-void CustomAnimationPane::showOptions(OString sPage)
+void CustomAnimationPane::showOptions(const OString& sPage)
{
STLPropertySet* pSet = createSelectionSet();
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 54564b5b..fe89da0 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -104,7 +104,7 @@ private:
void updateMotionPathTags();
void markShapesFromSelectedEffects();
- void showOptions(OString sPage = OString());
+ void showOptions(const OString& sPage = OString());
void moveSelection( bool bUp );
void onPreview( bool bForcePreview );
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 8c9453e..f1c0ece 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -49,7 +49,7 @@ template< class T > T getSafeValue( const Any& rAny )
// - SdOptionsItem -
-SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ) :
+SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ) :
ConfigItem ( rSubTree ),
mrParent ( rParent )
{
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 1100fc6..5d85e83 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction);
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
SdDrawDocument* pTheDoc,
- OUString aTheOldLayoutName,
- OUString aTheNewLayoutName,
+ const OUString& aTheOldLayoutName,
+ const OUString& aTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
sal_Bool bSet,
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index f873fcd..3c450f0 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -45,7 +45,7 @@ namespace sd
OUString mAddress;
enum PROTOCOL { NETWORK = 1, BLUETOOTH };
- ClientInfo( const OUString rName, const OUString rAddress ) :
+ ClientInfo( const OUString& rName, const OUString& rAddress ) :
mName( rName ),
mAddress( rAddress ) {}
};
@@ -66,7 +66,7 @@ namespace sd
// For the control dialog
SD_DLLPUBLIC static std::vector<ClientInfo*> getClients();
SD_DLLPUBLIC static sal_Bool connectClient( ClientInfo *pClient,
- OUString aPin );
+ const OUString& aPin );
/// ensure that discoverability (eg. for Bluetooth) is enabled
SD_DLLPUBLIC static void ensureDiscoverable();
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index a3856b0..01b22b5 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -59,7 +59,7 @@ private:
public:
- SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree );
+ SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree );
virtual ~SdOptionsItem();
virtual void Commit();
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index f96f4ac..fd74d18 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -45,7 +45,7 @@ public:
ModifyPageUndoAction(
SdDrawDocument* pTheDoc,
SdPage* pThePage,
- OUString aTheNewName,
+ const OUString& aTheNewName,
AutoLayout eTheNewAutoLayout,
sal_Bool bTheNewBckgrndVisible,
sal_Bool bTheNewBckgrndObjsVisible);
diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx
index e866a7c..678641d 100644
--- a/sd/source/ui/inc/unoaprms.hxx
+++ b/sd/source/ui/inc/unoaprms.hxx
@@ -104,7 +104,7 @@ public:
{ bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; }
void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn)
{ bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; }
- void SetSound(OUString aTheOldSound, OUString aTheNewSound)
+ void SetSound(const OUString& aTheOldSound, const OUString& aTheNewSound)
{ aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; }
void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen)
{ aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; }
@@ -114,7 +114,7 @@ public:
{ pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; }
void SetClickAction(::com::sun::star::presentation::ClickAction eTheOldAction, ::com::sun::star::presentation::ClickAction eTheNewAction)
{ eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; }
- void SetBookmark(OUString aTheOldBookmark, OUString aTheNewBookmark)
+ void SetBookmark(const OUString& aTheOldBookmark, const OUString& aTheNewBookmark)
{ aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; }
void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres)
{ bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; }
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index 1b72d19..3ff3a90 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -39,8 +39,8 @@ class SdPresentationLayoutUndoAction : public SdUndoAction
public:
TYPEINFO();
SdPresentationLayoutUndoAction(SdDrawDocument* pTheDoc,
- OUString aTheOldLayoutName,
- OUString aTheNewLayoutName,
+ const OUString& aTheOldLayoutName,
+ const OUString& aTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
sal_Bool bSet,
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 7ee3e32..ba99888 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -201,7 +201,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
Transmitter::PRIORITY_LOW );
}
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUrl );
+sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, const OUString& aUrl );
// Code copied from sdremote/source/presenter/PresenterNotesView.cxx
OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
@@ -283,7 +283,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
aRet.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
}
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUrl )
+sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, const OUString& aUrl )
{
OUString aFilterName( "XHTML Draw File" );
uno::Reference< document::XExporter > xExporter;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 51796cc..529193a 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -52,9 +52,10 @@ namespace sd {
BufferedStreamSocket *mpStreamSocket;
OUString mPin;
- ClientInfoInternal( const OUString rName,
- const OUString rAddress,
- BufferedStreamSocket *pSocket, OUString rPin ):
+ ClientInfoInternal( const OUString& rName,
+ const OUString& rAddress,
+ BufferedStreamSocket *pSocket,
+ const OUString& rPin ):
ClientInfo( rName, rAddress ),
mpStreamSocket( pSocket ),
mPin( rPin ) {}
@@ -249,7 +250,7 @@ std::vector<ClientInfo*> RemoteServer::getClients()
return aClients;
}
-sal_Bool RemoteServer::connectClient( ClientInfo* pClient, OUString aPin )
+sal_Bool RemoteServer::connectClient( ClientInfo* pClient, const OUString& aPin )
{
SAL_INFO( "sdremote", "RemoteServer::connectClient called" );
if ( !spServer )
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index cc5a675..7775201 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -39,7 +39,7 @@ TYPEINIT1(ModifyPageUndoAction, SdUndoAction);
ModifyPageUndoAction::ModifyPageUndoAction(
SdDrawDocument* pTheDoc,
SdPage* pThePage,
- OUString aTheNewName,
+ const OUString& aTheNewName,
AutoLayout eTheNewAutoLayout,
sal_Bool bTheNewBckgrndVisible,
sal_Bool bTheNewBckgrndObjsVisible)
commit 769a6c20c4eb9e081cdc46dd638f67927fc7bc25
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 09:14:55 2014 +0200
sw: prefer passing OUString by reference
Change-Id: Iaa846ec8f19567f0a9f30154d74cc53df93eff16
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 1467bed..0355ae5 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -214,7 +214,7 @@ class SwPostItMgr: public SfxListener
void CorrectPositions();
void SetLayout() { mbLayout = true; };
- void Delete(OUString aAuthor);
+ void Delete(const OUString& aAuthor);
void Delete();
void Hide( const OUString& rAuthor );
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index dde4853..1f78fea 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -70,7 +70,7 @@ public:
void CheckChangedList(const editeng::SortedAutoCompleteStrings& rNewLst);
// Returns all words matching a given prefix aMatch.
- bool GetWordsMatching(OUString aMatch, std::vector<OUString>& aWords) const;
+ bool GetWordsMatching(const OUString& aMatch, std::vector<OUString>& aWords) const;
};
#endif
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 3fa8df5..bb2343e 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -59,7 +59,7 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
OUString GetCmd() const;
- void SetCmd( OUString aStr );
+ void SetCmd( const OUString& aStr );
sal_uInt16 GetType() const { return refLink->GetUpdateMode(); }
void SetType( sal_uInt16 nType ) { refLink->SetUpdateMode( nType ); }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2f030ba..034dbd5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1367,7 +1367,7 @@ public:
sal_uInt16 MakePageDesc( const OUString &rName, const SwPageDesc* pCpy = 0,
bool bRegardLanguage = true,
bool bBroadcast = false);
- void BroadcastStyleOperation(OUString rName, SfxStyleFamily eFamily,
+ void BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamily,
sal_uInt16 nOp);
/** The html import sometimes overwrites the
@@ -1394,7 +1394,7 @@ public:
bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false );
OUString GetUniqueTOXBaseName( const SwTOXType& rType,
- const OUString sChkStr ) const;
+ const OUString& sChkStr ) const;
bool SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName);
void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect);
@@ -1496,7 +1496,7 @@ public:
void SetNumRule( const SwPaM&,
const SwNumRule&,
const bool bCreateNewList,
- const OUString sContinuedListId = OUString(),
+ const OUString& sContinuedListId = OUString(),
bool bSetItem = true,
const bool bResetIndentAttrs = false );
void SetCounted( const SwPaM&, bool bCounted);
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 61d3546..30c2ecf 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -113,7 +113,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
const sal_uInt16 nFamily,
sal_uInt16 nMask,
const sal_Bool bNew,
- const OString sPageId = OString(),
+ const OString& sPageId = OString(),
SwWrtShell* pActShell = 0,
const sal_Bool bBasic = sal_False );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 7d5dd38..f2d11c4 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -472,7 +472,7 @@ public:
list Id of a list, which has to be continued by applying the given list style. */
void SetCurNumRule( const SwNumRule&,
const bool bCreateNewList /*= false*/,
- const OUString sContinuedListId = OUString(),
+ const OUString& sContinuedListId = OUString(),
const bool bResetIndentAttrs = false );
/// Paragraphs without enumeration but with indents.
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 6a47e06..8aaf12e 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -39,7 +39,7 @@ class SwEditShell;
const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
const SwFrm& rFrm );
-OUString ReplacePoint(OUString sTmpName, bool bWithCommandType = false);
+OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false);
struct _SeqFldLstElem
{
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index 1966253..dfa6eaa 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -31,7 +31,7 @@ class SwListImpl;
class SwList
{
public:
- SwList( const OUString sListId,
+ SwList( const OUString& sListId,
SwNumRule& rDefaultListStyle,
const SwNodes& rNodes );
~SwList();
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 68c9f28..2782725 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -193,7 +193,7 @@ public:
void AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
void RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
- inline void SetDefaultListId( const OUString sDefaultListId )
+ inline void SetDefaultListId( const OUString& sDefaultListId )
{
msDefaultListId = sDefaultListId;
}
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 539918c..40eba2a 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -139,7 +139,7 @@ public:
bool IsConnectFlag() const { return m_bConnectFlag; }
void SetConnectFlag(bool const bFlag = true){ m_bConnectFlag = bFlag; }
- static OUString CollapseWhiteSpaces(const OUString sName);
+ static OUString CollapseWhiteSpaces(const OUString& sName);
};
class SW_DLLPUBLIC SwSection
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 925da1bf..c5f7c74 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -363,7 +363,7 @@ public:
sal_uInt8 nDialogMode,
const OUString *pCollName = 0,
sal_Bool bDraw = sal_False,
- OString sDefPage = OString() ) = 0;
+ const OString& sDefPage = OString() ) = 0;
virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) = 0;
@@ -393,7 +393,7 @@ public:
const SfxItemSet& rCoreSet,
bool bNewFrm = true,
bool bFmt = false,
- OString sDefPage = OString(),
+ const OString& sDefPage = OString(),
const OUString* pFmtStr = 0) = 0;
// @param nSlot
// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
@@ -402,7 +402,7 @@ public:
Window* pParent,
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
- OString sPage = OString(),
+ const OString& sPage = OString(),
SwWrtShell* pActShell = 0,
bool bNew = false) = 0;
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 742e493..f9bc195 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -502,9 +502,9 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
public:
SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess,
- const OUString& rLinkDisplayName, OUString sSuffix);
+ const OUString& rLinkDisplayName, const OUString& sSuffix);
SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc,
- const OUString& rLinkDisplayName, OUString sSuffix);
+ const OUString& rLinkDisplayName, const OUString& sSuffix);
~SwXLinkNameAccessWrapper();
//XNameAccess
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index dde4a45..c82ae7c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -242,7 +242,7 @@ protected:
}
/// Get a family of styles, see com.sun.star.style.StyleFamilies for possible values.
- uno::Reference<container::XNameAccess> getStyles(OUString aFamily)
+ uno::Reference<container::XNameAccess> getStyles(const OUString& aFamily)
{
uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
@@ -251,7 +251,7 @@ protected:
}
/// Get a family of auto styles, see com.sun.star.style.StyleFamilies for possible values.
- uno::Reference<style::XAutoStyleFamily> getAutoStyles(OUString aFamily)
+ uno::Reference<style::XAutoStyleFamily> getAutoStyles(const OUString& aFamily)
{
uno::Reference< style::XAutoStylesSupplier > xAutoStylesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference< style::XAutoStyles > xAutoStyles(xAutoStylesSupplier->getAutoStyles());
@@ -264,7 +264,7 @@ protected:
*
* If the attribute is omitted, the text of the node is returned.
*/
- OUString parseDump(OString aXPath, OString aAttribute = OString())
+ OUString parseDump(const OString& aXPath, const OString& aAttribute = OString())
{
if (!mpXmlBuffer)
dumpLayout();
@@ -347,7 +347,7 @@ protected:
}
// Get paragraph (counted from 1), optionally check it contains the given text.
- uno::Reference< text::XTextRange > getParagraph( int number, OUString content = OUString() ) const
+ uno::Reference< text::XTextRange > getParagraph( int number, const OUString& content = OUString() ) const
{
uno::Reference<text::XTextRange> const xParagraph(
getParagraphOrTable(number), uno::UNO_QUERY_THROW);
@@ -356,7 +356,7 @@ protected:
return xParagraph;
}
- uno::Reference<text::XTextRange> getParagraphOfText(int number, uno::Reference<text::XText> xText, OUString content = OUString()) const
+ uno::Reference<text::XTextRange> getParagraphOfText(int number, uno::Reference<text::XText> xText, const OUString& content = OUString()) const
{
uno::Reference<text::XTextRange> const xParagraph(getParagraphOrTable(number, xText), uno::UNO_QUERY_THROW);
if (!content.isEmpty())
@@ -365,7 +365,7 @@ protected:
}
/// Get run (counted from 1) of a paragraph, optionally check it contains the given text.
- uno::Reference<text::XTextRange> getRun(uno::Reference<text::XTextRange> xParagraph, int number, OUString content = OUString()) const
+ uno::Reference<text::XTextRange> getRun(uno::Reference<text::XTextRange> xParagraph, int number, const OUString& content = OUString()) const
{
uno::Reference<container::XEnumerationAccess> xRunEnumAccess(xParagraph, uno::UNO_QUERY);
uno::Reference<container::XEnumeration> xRunEnum = xRunEnumAccess->createEnumeration();
@@ -414,7 +414,7 @@ protected:
}
/// Get TextFrame by name
- uno::Reference<drawing::XShape> getTextFrameByName(OUString aName)
+ uno::Reference<drawing::XShape> getTextFrameByName(const OUString& aName)
{
uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XNameAccess> xNameAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
@@ -473,7 +473,7 @@ protected:
}
/// Save the loaded document to a tempfile. Can be used to check the resulting docx/odt directly as a ZIP file.
- void save(OUString aFilter, utl::TempFile& rTempFile)
+ void save(const OUString& aFilter, utl::TempFile& rTempFile)
{
rTempFile.EnableKillingFile();
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index a48f976..cb19476 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -84,7 +84,7 @@ public:
protected:
/// Copy&paste helper.
- void paste(OUString aFilename, uno::Reference<text::XTextRange> xTextRange = uno::Reference<text::XTextRange>())
+ void paste(const OUString& aFilename, uno::Reference<text::XTextRange> xTextRange = uno::Reference<text::XTextRange>())
{
uno::Reference<document::XFilter> xFilter(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW);
uno::Reference<document::XImporter> xImporter(xFilter, uno::UNO_QUERY_THROW);
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 1eea4f7..29933cd 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -391,28 +391,26 @@ uno::Any SwAccessibleCell::getMinimumValue( )
return aAny;
}
-static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
+static OUString ReplaceOneChar(const OUString& oldOUString, const OUString& replacedChar, const OUString& replaceStr)
{
int iReplace = oldOUString.lastIndexOf(replacedChar);
- if (iReplace > -1)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list