diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 5654a69dbe93..927c4585d4ef 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -177,7 +177,7 @@ FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxCon -OUString exportBackground(FlashExporter &aFlashExporter, Reference< XDrawPage > xDrawPage, OUString sPath, sal_uInt32 nPage, const char* suffix) +OUString exportBackground(FlashExporter &aFlashExporter, Reference< XDrawPage > xDrawPage, const OUString& sPath, sal_uInt32 nPage, const char* suffix) { OUString filename = STR("slide") + VAL(nPage+1) + STR(suffix) + STR(".swf"); OUString fullpath = sPath + STR("/") + filename; diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 425416ec82dd..04b7cbaf394d 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -214,7 +214,7 @@ private: void METFullArc(Point aCenter, double fMultiplier); void METPartialArcAtCurPos(Point aCenter, double fMultiplier, double fStartAngle, double fSweepAngle); - void METChrStr(Point aPt, OUString aStr); + void METChrStr(Point aPt, const OUString& aStr); void METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS); void METSetColor(Color aColor); void METSetBackgroundColor(Color aColor); @@ -1374,7 +1374,7 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, } -void METWriter::METChrStr( Point aPt, OUString aUniStr ) +void METWriter::METChrStr( Point aPt, const OUString& aUniStr ) { OString aStr(OUStringToOString(aUniStr, osl_getThreadTextEncoding())); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 0831b666e7a4..44d2c754e30d 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -5198,7 +5198,7 @@ void EscherEx::ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ) PtReplace( ESCHER_Persist_PrivateEntry | nKey, nOffset ); } -void EscherEx::SetEditAs( OUString rEditAs ) +void EscherEx::SetEditAs( const OUString& rEditAs ) { mEditAs = rEditAs; } diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index dfdff3ada3f7..36636ca5fc1c 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -1323,7 +1323,7 @@ const char* GetOOXMLPresetGeometry( const char* sShapeType ) typedef boost::unordered_map< const char*, MSO_SPT, rtl::CStringHash, rtl::CStringEqual> DMLToVMLTranslationHashMap; static DMLToVMLTranslationHashMap* pDMLToVMLMap; -MSO_SPT GETVMLShapeType(OString aType) +MSO_SPT GETVMLShapeType(const OString& aType) { const char* pDML = GetOOXMLPresetGeometry(aType.getStr()); diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index a0bbaaa85dfa..a87821cc24f7 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -172,7 +172,7 @@ static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream >& xOut } } -static OString convertString( OUString aInput ) +static OString convertString( const OUString& aInput ) { OString aRet( aInput.getStr(), aInput.getLength(), RTL_TEXTENCODING_ASCII_US ); aRet = aRet.replace( '\r', ' ' ); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 126c05edbb89..7cf948ad89d4 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -125,7 +125,7 @@ public: } virtual ~TextField() {} protected: - void implGrowCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets, OUString sText, OUString sTextFieldId ) const + void implGrowCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets, const OUString& sText, const OUString& sTextFieldId ) const { const sal_Unicode * ustr = sText.getStr(); sal_Int32 nLength = sText.getLength(); diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 0b2491452ee8..378d8fb0687b 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -75,7 +75,7 @@ using namespace com::sun::star::beans; namespace { -OUString supportedByType( const OUString clipBoardFormat , const OUString resultString, const OUString checkType) +OUString supportedByType( const OUString& clipBoardFormat, const OUString& resultString, const OUString& checkType) { OUString sTypeName; if ( clipBoardFormat.match("doctype:") ) diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index c6cc5e420486..63f247a7afb3 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -102,15 +102,14 @@ static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder, return xFolder; } -static void _addFile( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, Reference< XInputStream >& xInput, OUString aName ) throw( Exception ) +static void _addFile( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, Reference< XInputStream >& xInput, const OUString& aName ) throw( Exception ) { - Reference< XActiveDataSink > xSink( xFactory->createInstance(), UNO_QUERY ); Reference< XUnoTunnel > xTunnel( xSink, UNO_QUERY ); if( xSink.is() && xTunnel.is()) { Reference< XNameContainer > xNameContainer(xRootFolder, UNO_QUERY ); - xNameContainer->insertByName(aName = encodeZipUri( aName ), makeAny(xTunnel)); + xNameContainer->insertByName(encodeZipUri( aName ), makeAny(xTunnel)); xSink->setInputStream( xInput ); } } diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index a97dd87015bd..f87aa5367089 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1644,7 +1644,7 @@ public: sal_Bool SeekToPersistOffset( sal_uInt32 nKey ); virtual sal_Bool InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the // current StreamPosition changes - void SetEditAs( OUString rEditAs ); + void SetEditAs( const OUString& rEditAs ); rtl::OUString GetEditAs() { return mEditAs; } SvStream& GetStream() const { return *mpOutStrm; } sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); } diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index b22c6fbb0f30..ddf5a120ac5c 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -136,7 +136,7 @@ MSFILTER_DLLPUBLIC EquationResult ParseCombinedChars(const OUString& rStr); MSFILTER_DLLPUBLIC const char* GetOOXMLPresetGeometry( const char* sShapeType ); /// Similar to EnhancedCustomShapeTypeNames::Get(), but returns an MSO_SPT (binary / VML type). -MSFILTER_DLLPUBLIC MSO_SPT GETVMLShapeType(OString aType); +MSFILTER_DLLPUBLIC MSO_SPT GETVMLShapeType(const OString& aType); } diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 63033f4258af..08271191befb 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -55,7 +55,7 @@ public: inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; } inline void SetUndoStr( const OUString& rNew ) { aUndoStr = rNew; } inline void SetMatrixFlag(bool bNew) { bMatrix=bNew;} - inline void SetUniqueId(const OString nNew) { aUniqueId=nNew;} + inline void SetUniqueId(const OString& nNew) { aUniqueId=nNew;} inline void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: void Reset();