diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-13 16:51:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-14 08:08:27 +0200 |
commit | 4460f213df777f569fa2a2091885c29c7653637f (patch) | |
tree | fb2f12ff84bcfddb53ca0889d01541ee31176ffa /basic/source/uno/dlgcont.cxx | |
parent | 67042f1f0314da51dbea6602ddcdd0a4ab347bc7 (diff) |
fdo#46808, use XComponentContext in SfxLibraryContainer
Change-Id: I6f66fc69a40e2cd2ef2372e0413ff95b6202c5c5
Diffstat (limited to 'basic/source/uno/dlgcont.cxx')
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index bc598c41d083..1193756ebfc0 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, comphelper::getComponentContext(mxMSF), mxSFI, this ); + SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, mxContext, mxSFI, this ); return pRet; } @@ -96,7 +96,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink const OUString& StorageURL, sal_Bool ReadOnly ) { SfxLibrary* pRet = new SfxDialogLibrary - ( maModifiable, aName, comphelper::getComponentContext(mxMSF), mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this ); + ( maModifiable, aName, mxContext, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this ); return pRet; } @@ -236,17 +236,17 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e if ( xISP.is() ) { Reference< io::XInputStream > xInput( xISP->createInputStream() ); - Reference< XNameContainer > xDialogModel( mxMSF->createInstance - ( OUString( "com.sun.star.awt.UnoControlDialogModel" ) ) , UNO_QUERY ); - Reference< XComponentContext > xContext( comphelper::getComponentContext( mxMSF ) ); - ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, mxOwnerDocument ); + Reference< XNameContainer > xDialogModel( + mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", mxContext), + UNO_QUERY ); + ::xmlscript::importDialogModel( xInput, xDialogModel, mxContext, mxOwnerDocument ); std::vector< OUString > vEmbeddedImageURLs; GraphicObject::InspectForGraphicObjectImageURL( Reference< XInterface >( xDialogModel, UNO_QUERY ), vEmbeddedImageURLs ); if ( !vEmbeddedImageURLs.empty() ) { // Export the images to the storage Reference< document::XGraphicObjectResolver > xGraphicResolver = - document::GraphicObjectResolver::createWithStorage( xContext, xStorage ); + document::GraphicObjectResolver::createWithStorage( mxContext, xStorage ); std::vector< OUString >::iterator it = vEmbeddedImageURLs.begin(); std::vector< OUString >::iterator it_end = vEmbeddedImageURLs.end(); if ( xGraphicResolver.is() ) @@ -278,10 +278,11 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement // return aRetAny; //} - Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(mxMSF) ); + Reference< XParser > xParser = xml::sax::Parser::create( mxContext ); - Reference< XNameContainer > xDialogModel( mxMSF->createInstance - ( OUString( "com.sun.star.awt.UnoControlDialogModel" ) ), UNO_QUERY ); + Reference< XNameContainer > xDialogModel( + mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", mxContext), + UNO_QUERY ); if( !xDialogModel.is() ) { OSL_FAIL( "### couldn't create com.sun.star.awt.UnoControlDialogModel component\n" ); @@ -312,16 +313,13 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement if( !xInput.is() ) return aRetAny; - Reference< XComponentContext > xContext( - comphelper::getComponentContext( mxMSF ) ); - InputSource source; source.aInputStream = xInput; source.sSystemId = aFile; try { // start parsing - xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext, mxOwnerDocument ) ); + xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, mxContext, mxOwnerDocument ) ); xParser->parseStream( source ); } catch(const Exception& ) @@ -335,7 +333,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement // Create InputStream, TODO: Implement own InputStreamProvider // to avoid creating the DialogModel here! - Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, mxOwnerDocument ); + Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, mxContext, mxOwnerDocument ); aRetAny <<= xISP; return aRetAny; } @@ -377,8 +375,9 @@ Reference< ::com::sun::star::resource::XStringResourcePersistence > aArgs[4] <<= aComment; // TODO: Ctor - xRet = Reference< resource::XStringResourcePersistence >( mxMSF->createInstance - ( OUString("com.sun.star.resource.StringResourceWithStorage") ), UNO_QUERY ); + xRet = Reference< resource::XStringResourcePersistence >( + mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.resource.StringResourceWithStorage", mxContext), + UNO_QUERY ); uno::Reference< embed::XStorage > xLibrariesStor; uno::Reference< embed::XStorage > xLibraryStor; @@ -425,8 +424,9 @@ Reference< ::com::sun::star::resource::XStringResourcePersistence > aArgs[5] <<= xDummyHandler; // TODO: Ctor - xRet = Reference< resource::XStringResourcePersistence >( mxMSF->createInstance - ( OUString("com.sun.star.resource.StringResourceWithLocation") ), UNO_QUERY ); + xRet = Reference< resource::XStringResourcePersistence >( + mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.resource.StringResourceWithLocation", mxContext), + UNO_QUERY ); // TODO: Ctor if( xRet.is() ) |