diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-03-09 10:11:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-09 12:41:09 +0000 |
commit | 5a308b1239a09417507b0d05090ff2d3418d5133 (patch) | |
tree | 990fa9015a4107e4916691eb4dee80fa5713e96b /basic | |
parent | c1a227600d0b16df283162d24f1a31f5c9cee474 (diff) |
V801: Decreased performance
Change-Id: Iba139ede7bd72e23c0b7a28a8a4ff38ea816725a
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/inc/namecont.hxx | 22 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 2 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 24 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 6 |
4 files changed, 27 insertions, 27 deletions
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index d699805e5d1e..c7258f5337fb 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -261,16 +261,16 @@ protected: } meInitMode; void implStoreLibrary( SfxLibrary* pLib, - const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + const OUString& rName, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rStorage ); // New variant for library export void implStoreLibrary( SfxLibrary* pLib, - const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, - const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); + const OUString& rName, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rStorage, + const OUString& rTargetURL, + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI, + const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& rHandler ); void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); @@ -279,7 +279,7 @@ protected: void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI ); bool implLoadLibraryIndexFile( SfxLibrary* pLib, ::xmlscript::LibDescriptor& rLib, @@ -317,9 +317,9 @@ protected: // New variant for library export virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, + const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rStorage, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly=false ) @@ -734,7 +734,7 @@ class ScriptSubPackageIterator com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implDetectScriptPackage( const com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > xPackage, bool& rbPureDialogLib ); + < com::sun::star::deployment::XPackage >& rPackage, bool& rbPureDialogLib ); public: ScriptSubPackageIterator( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xMainPackage ); diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 30c8c62260c8..5b5f496fc165 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -70,7 +70,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas virtual bool implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& rToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) SAL_OVERRIDE; virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly=false ) diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 20d2dfbff1c7..adc6905a43bb 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -1365,7 +1365,7 @@ bool SfxLibraryContainer::implStorePasswordLibrary( const OUString& /*aName*/, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& /*xStorage*/, const OUString& /*aTargetURL*/, - const Reference< XSimpleFileAccess3 > /*xToUseSFI*/, + const Reference< XSimpleFileAccess3 >& /*xToUseSFI*/, const uno::Reference< task::XInteractionHandler >& ) { return false; @@ -1421,7 +1421,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, const OUString& aName, const uno::Reference< embed::XStorage >& xStorage, const OUString& aTargetURL, - Reference< XSimpleFileAccess3 > xToUseSFI, + const Reference< XSimpleFileAccess3 >& rToUseSFI, const Reference< XInteractionHandler >& xHandler ) { bool bLink = pLib->mbLink; @@ -1488,9 +1488,9 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib, try { Reference< XSimpleFileAccess3 > xSFI = mxSFI; - if( xToUseSFI.is() ) + if( rToUseSFI.is() ) { - xSFI = xToUseSFI; + xSFI = rToUseSFI; } OUString aLibDirPath; if( bExport ) @@ -1577,7 +1577,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib, const uno::Reference< embed::XStorage >& xStorage, const OUString& aTargetURL, - Reference< XSimpleFileAccess3 > xToUseSFI ) + const Reference< XSimpleFileAccess3 >& rToUseSFI ) { // Create sax writer Reference< XWriter > xWriter = xml::sax::Writer::create(mxContext); @@ -1622,9 +1622,9 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, // Export? bool bExport = !aTargetURL.isEmpty(); Reference< XSimpleFileAccess3 > xSFI = mxSFI; - if( xToUseSFI.is() ) + if( rToUseSFI.is() ) { - xSFI = xToUseSFI; + xSFI = rToUseSFI; } OUString aLibInfoPath; if( bExport ) @@ -3420,23 +3420,23 @@ Reference< deployment::XPackage > ScriptSubPackageIterator::getNextScriptSubPack return xScriptPackage; } -Reference< deployment::XPackage > ScriptSubPackageIterator::implDetectScriptPackage ( const Reference< deployment::XPackage > xPackage, +Reference< deployment::XPackage > ScriptSubPackageIterator::implDetectScriptPackage ( const Reference< deployment::XPackage >& rPackage, bool& rbPureDialogLib ) { Reference< deployment::XPackage > xScriptPackage; - if( xPackage.is() ) + if( rPackage.is() ) { - const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = xPackage->getPackageType(); + const Reference< deployment::XPackageTypeInfo > xPackageTypeInfo = rPackage->getPackageType(); OUString aMediaType = xPackageTypeInfo->getMediaType(); if ( aMediaType == sBasicLibMediaType ) { - xScriptPackage = xPackage; + xScriptPackage = rPackage; } else if ( aMediaType == sDialogLibMediaType ) { rbPureDialogLib = true; - xScriptPackage = xPackage; + xScriptPackage = rPackage; } } diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 7d67085f5cf3..a422f2a6a840 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -588,7 +588,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const OUString& aTargetURL, - const Reference< XSimpleFileAccess3 > xToUseSFI, + const Reference< XSimpleFileAccess3 >& rToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) { bool bExport = !aTargetURL.isEmpty(); @@ -730,9 +730,9 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons try { Reference< XSimpleFileAccess3 > xSFI = mxSFI; - if( xToUseSFI.is() ) + if( rToUseSFI.is() ) { - xSFI = xToUseSFI; + xSFI = rToUseSFI; } OUString aLibDirPath; if( bExport ) |