From 71c88f02a019dee180686ac9ec88d8c7c1f7f534 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 17 Mar 2014 09:13:09 +0200 Subject: sc: prefer passing OUString by reference Change-Id: I85e8823e872bf53182ce90576225e462edb1930a --- sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 2 +- .../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 +- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sc/source/ui/inc') diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 7b0ebb41fa2b..049b92303cc9 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -61,7 +61,7 @@ private: void GetRangeFromSelection(); template - void GenerateNumbers(RNG randomGenerator, OUString aDistributionName); + void GenerateNumbers(RNG randomGenerator, const OUString& aDistributionName); void SelectGeneratorAndGenerateNumbers(); diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index 2f133c05f2bc..ca65ae3c908e 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -37,18 +37,18 @@ private: public: FormulaTemplate(ScDocument* aDocument, ScAddress::Details aAddressDetails); - void setTemplate(OUString aTemplate); + void setTemplate(const OUString& aTemplate); void setTemplate(const char* aTemplate); OUString& getTemplate(); - void autoReplaceRange(OUString aVariable, ScRange aRange); - void autoReplaceAddress(OUString aVariable, ScAddress aAddress); + void autoReplaceRange(const OUString& aVariable, ScRange aRange); + void autoReplaceAddress(const OUString& aVariable, ScAddress aAddress); - void applyRange(OUString aVariable, ScRange aRange); - void applyRangeList(OUString aVariable, ScRangeList aRangeList); - void applyAddress(OUString aVariable, ScAddress aAddress); - void applyString(OUString aVariable, OUString aValue); - void applyNumber(OUString aVariable, sal_Int32 aValue); + void applyRange(const OUString& aVariable, ScRange aRange); + void applyRangeList(const OUString& aVariable, ScRangeList aRangeList); + void applyAddress(const OUString& aVariable, ScAddress aAddress); + void applyString(const OUString& aVariable, const OUString& aValue); + void applyNumber(const OUString& aVariable, sal_Int32 aValue); }; class AddressWalker @@ -82,11 +82,11 @@ public: AddressWalkerWriter(ScAddress aInitialAddress, ScDocShell* pDocShell, ScDocument* pDocument, formula::FormulaGrammar::Grammar eGrammar ); - void writeFormula(OUString aFormula); - void writeMatrixFormula(OUString aFormula); - void writeString(OUString aString); + void writeFormula(const OUString& aFormula); + void writeMatrixFormula(const OUString& aFormula); + void writeString(const OUString& aString); void writeString(const char* aCharArray); - void writeBoldString(OUString aString); + void writeBoldString(const OUString& aString); void writeValue(double aValue); }; diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx index 47270d061c46..f73f890b21c2 100644 --- a/sc/source/ui/inc/condformathelper.hxx +++ b/sc/source/ui/inc/condformathelper.hxx @@ -32,7 +32,7 @@ public: static SC_DLLPUBLIC OUString GetExpression(const ScConditionalFormat& rFormat, const ScAddress& rPos); static SC_DLLPUBLIC OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex, - OUString aStr1 = OUString(), OUString aStr2 = OUString() ); + const OUString& aStr1 = OUString(), const OUString& aStr2 = OUString() ); }; #endif diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index b21511d8ed2d..6682acb566ca 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -181,7 +181,7 @@ inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) class ScImportStringStream : public SvMemoryStream { public: - ScImportStringStream( const OUString rStr ) + ScImportStringStream( const OUString& rStr ) : SvMemoryStream( (void*)rStr.getStr(), rStr.getLength() * sizeof(sal_Unicode), STREAM_READ) { diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 448c77345069..4c845afe1dea 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -31,16 +31,16 @@ class ScMetricInputDlg : public ModalDialog { public: - ScMetricInputDlg( Window* pParent, - OString sDialogName, - long nCurrent, - long nDefault, - FieldUnit eFUnit = FUNIT_MM, - sal_uInt16 nDecimals = 2, - long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, - long nLast = 100 ); + ScMetricInputDlg( Window* pParent, + const OString& sDialogName, + long nCurrent, + long nDefault, + FieldUnit eFUnit = FUNIT_MM, + sal_uInt16 nDecimals = 2, + long nMaximum = 1000, + long nMinimum = 0, + long nFirst = 1, + long nLast = 100 ); long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 05b0a236bce0..924f536eb682 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -279,10 +279,10 @@ private: { return rBindings; } void SetCurrentCell( SCCOL nCol, SCROW Row ); - void SetCurrentCellStr( const OUString rName ); + void SetCurrentCellStr( const OUString& rName ); void SetCurrentTable( SCTAB nTab ); void SetCurrentTableStr( const OUString& rName ); - void SetCurrentObject( const OUString rName ); + void SetCurrentObject( const OUString& rName ); void SetCurrentDoc( const OUString& rDocName ); ScTabViewShell* GetTabViewShell() const; diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 139108376f8e..33095fa140fa 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -82,7 +82,7 @@ class ScImportAsciiDlg : public ModalDialog public: ScImportAsciiDlg( - Window* pParent, OUString aDatName, + Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ); ~ScImportAsciiDlg(); -- cgit