diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-13 16:29:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-14 08:08:26 +0200 |
commit | 67042f1f0314da51dbea6602ddcdd0a4ab347bc7 (patch) | |
tree | 1f34cf288f136a72a24a9a81da49331b75ba519c /basic | |
parent | fdo#46808, Convert some XMultiServiceFactory to XComponentContext (diff) | |
download | core-67042f1f0314da51dbea6602ddcdd0a4ab347bc7.tar.gz core-67042f1f0314da51dbea6602ddcdd0a4ab347bc7.zip |
fdo#46808, replace XMultiServiceFactory with XComponentContext is SfxLibrary
Change-Id: I150d86b4ae4004e7c39ec6a3ed7fba31029f8ab1
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/inc/dlgcont.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 6 | ||||
-rw-r--r-- | basic/source/inc/scriptcont.hxx | 4 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 12 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 8 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 12 |
6 files changed, 23 insertions, 23 deletions
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 7b7fcdd31d95..9c5256b8e56d 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -124,7 +124,7 @@ public: ( ModifiableHelper& _rModifiable, const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, SfxDialogLibraryContainer* pParent ); @@ -133,7 +133,7 @@ public: ( ModifiableHelper& _rModifiable, const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly, SfxDialogLibraryContainer* pParent diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 8db283971053..5bbb4ffbb6b1 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -559,7 +559,7 @@ class SfxLibrary friend class SfxDialogLibraryContainer; friend class SfxScriptLibraryContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > mxSFI; ModifiableHelper& mrModifiable; @@ -620,13 +620,13 @@ public: SfxLibrary( ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Type& aType, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI ); SfxLibrary( ModifiableHelper& _rModifiable, const ::com::sun::star::uno::Type& aType, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index f33261264d25..3e72904f2d6e 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -159,14 +159,14 @@ public: SfxScriptLibrary ( ModifiableHelper& _rModifiable, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI ); SfxScriptLibrary ( ModifiableHelper& _rModifiable, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xMSF, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly ); diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 2c0054da5df0..bc598c41d083 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -87,7 +87,7 @@ SfxDialogLibraryContainer::SfxDialogLibraryContainer( const uno::Reference< embe // Methods to get library instances of the correct type SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const OUString& aName ) { - SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, mxMSF, mxSFI, this ); + SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, comphelper::getComponentContext(mxMSF), mxSFI, this ); return pRet; } @@ -96,7 +96,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink const OUString& StorageURL, sal_Bool ReadOnly ) { SfxLibrary* pRet = new SfxDialogLibrary - ( maModifiable, aName, mxMSF, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this ); + ( maModifiable, aName, comphelper::getComponentContext(mxMSF), mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this ); return pRet; } @@ -533,10 +533,10 @@ Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Refere // Ctor SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const OUString& aName, - const Reference< XMultiServiceFactory >& xMSF, + const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI, SfxDialogLibraryContainer* pParent ) - : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xMSF, xSFI ) + : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xContext, xSFI ) , m_pParent( pParent ) , m_aName( aName ) { @@ -544,14 +544,14 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const OUString& aName, - const Reference< XMultiServiceFactory >& xMSF, + const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly, SfxDialogLibraryContainer* pParent ) : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), - xMSF, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) + xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) , m_pParent( pParent ) , m_aName( aName ) { diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 8c0187374798..2e0a8f2b8263 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2999,9 +2999,9 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServic // Ctor SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, - const Reference< XMultiServiceFactory >& xMSF, const Reference< XSimpleFileAccess3 >& xSFI ) + const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI ) : OComponentHelper( m_aMutex ) - , mxMSF( xMSF ) + , mxContext( xContext ) , mxSFI( xSFI ) , mrModifiable( _rModifiable ) , maNameContainer( aType ) @@ -3021,10 +3021,10 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, } SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType, - const Reference< XMultiServiceFactory >& xMSF, const Reference< XSimpleFileAccess3 >& xSFI, + const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly ) : OComponentHelper( m_aMutex ) - , mxMSF( xMSF ) + , mxContext( xContext ) , mxSFI( xSFI ) , mrModifiable( _rModifiable ) , maNameContainer( aType ) diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 75b3828c91af..982913ca964d 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -144,7 +144,7 @@ SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embe SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName ) { (void)aName; // Only needed for SfxDialogLibrary - SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxMSF, mxSFI ); + SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, comphelper::getComponentContext(mxMSF), mxSFI ); return pRet; } @@ -154,7 +154,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString& aN sal_Bool ReadOnly ) { (void)aName; // Only needed for SfxDialogLibrary - SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxMSF, mxSFI, + SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, comphelper::getComponentContext(mxMSF), mxSFI, aLibInfoFileURL, StorageURL, ReadOnly ); return pRet; } @@ -1231,21 +1231,21 @@ Reference< XInterface > SAL_CALL SfxScriptLibraryContainer::Create( const Refere // Ctor SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, - const Reference< XMultiServiceFactory >& xMSF, + const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI ) - : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xMSF, xSFI ) + : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xContext, xSFI ) , mbLoadedSource( false ) , mbLoadedBinary( false ) { } SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable, - const Reference< XMultiServiceFactory >& xMSF, + const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI, const OUString& aLibInfoFileURL, const OUString& aStorageURL, sal_Bool ReadOnly ) - : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xMSF, xSFI, + : SfxLibrary( _rModifiable, getCppuType( (const OUString *)0 ), xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly) , mbLoadedSource( false ) , mbLoadedBinary( false ) |