diff options
20 files changed, 82 insertions, 83 deletions
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx index fbefc13bcd41..8cf7953394e7 100644 --- a/comphelper/inc/comphelper/mimeconfighelper.hxx +++ b/comphelper/inc/comphelper/mimeconfighelper.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XContainerQuery.hpp> @@ -36,7 +37,7 @@ namespace comphelper { class COMPHELPER_DLLPUBLIC MimeConfigurationHelper { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xObjectConfig; @@ -47,7 +48,7 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper public: - MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); + MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); static ::rtl::OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID ); diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index e1b63bc68bc4..61c667e81cf0 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -34,10 +34,10 @@ using namespace ::com::sun::star; using namespace comphelper; //----------------------------------------------------------------------- -MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory ) -: m_xFactory( xFactory ) +MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XComponentContext >& rxContext ) +: m_xContext( rxContext ) { - if ( !m_xFactory.is() ) + if ( !m_xContext.is() ) throw uno::RuntimeException(); } @@ -122,8 +122,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurati try { if ( !m_xConfigProvider.is() ) - m_xConfigProvider = configuration::theDefaultProvider::get( - getComponentContext( m_xFactory ) ); + m_xConfigProvider = configuration::theDefaultProvider::get( m_xContext ); uno::Sequence< uno::Any > aArgs( 1 ); beans::PropertyValue aPathProp; @@ -186,7 +185,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto if ( !m_xFilterFactory.is() ) m_xFilterFactory.set( - m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory")) ), + m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.FilterFactory", m_xContext), uno::UNO_QUERY ); return m_xFilterFactory; @@ -222,8 +221,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto ::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType ) { uno::Reference< container::XContainerQuery > xTypeCFG( - m_xFactory->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ), + m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext), uno::UNO_QUERY ); if ( xTypeCFG.is() ) @@ -585,7 +583,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu // filter name is not specified, so type detection should be done uno::Reference< document::XTypeDetection > xTypeDetection( - m_xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ), + m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext), uno::UNO_QUERY ); if ( !xTypeDetection.is() ) diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index d765d7ecd23b..9e91fd447a0a 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -253,7 +253,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments ODocumentDefinition::GetDocumentServiceFromMediaType( sMediaType, m_aContext, aClassID ); else if ( !sDocServiceName.isEmpty() ) { - ::comphelper::MimeConfigurationHelper aConfigHelper( m_aContext.getLegacyServiceFactory() ); + ::comphelper::MimeConfigurationHelper aConfigHelper( m_aContext.getUNOContext() ); const Sequence< NamedValue > aProps( aConfigHelper.GetObjectPropsByDocumentName( sDocServiceName ) ); const ::comphelper::NamedValueCollection aMediaTypeProps( aProps ); aClassID = aMediaTypeProps.getOrDefault( "ClassID", Sequence< sal_Int8 >() ); diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 75737630278f..120ffdbc44d4 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -386,7 +386,7 @@ namespace dbaccess ::rtl::OUString sResult; try { - ::comphelper::MimeConfigurationHelper aConfigHelper( _rContext.getLegacyServiceFactory() ); + ::comphelper::MimeConfigurationHelper aConfigHelper( _rContext.getUNOContext() ); sResult = aConfigHelper.GetDocServiceNameFromMediaType( _rMediaType ); _rClassId = aConfigHelper.GetSequenceClassIDRepresentation(aConfigHelper.GetExplicitlyRegisteredObjClassID( _rMediaType )); if ( !_rClassId.getLength() && !sResult.isEmpty() ) diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index a625398598b2..21c2da5eb152 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -144,7 +144,7 @@ namespace dbaxml aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden")); aArgs[nLen++].Value <<= sal_True; - ::comphelper::MimeConfigurationHelper aHelper(m_xFactory); + ::comphelper::MimeConfigurationHelper aHelper( comphelper::getComponentContext(m_xFactory) ); SvtModuleOptions aModuleOptions; uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL( aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET) )), diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 941186d50370..be9abc521060 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -187,7 +187,8 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) uno::Sequence < uno::Any > aArgs(1); aArgs[0] <<= uno::Reference < embed::XEmbeddedObject >( this ); uno::Reference< util::XCloseable > xDocument( - m_xFactory->createInstanceWithArguments( GetDocumentServiceName(), aArgs ), uno::UNO_QUERY ); + m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( GetDocumentServiceName(), aArgs, m_xContext), + uno::UNO_QUERY ); uno::Reference < container::XChild > xChild( xDocument, uno::UNO_QUERY ); if ( xChild.is() ) @@ -315,7 +316,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) uno::Reference< embed::XComponentSupplier > xCompSupl( m_xClientSite, uno::UNO_QUERY_THROW ); uno::Reference< uno::XInterface > xContDoc( xCompSupl->getComponent(), uno::UNO_QUERY_THROW ); - uno::Reference< frame::XModuleManager2 > xManager( frame::ModuleManager::create(comphelper::getComponentContext(m_xFactory)) ); + uno::Reference< frame::XModuleManager2 > xManager( frame::ModuleManager::create( m_xContext ) ); aModuleName = xManager->identify( xContDoc ); } diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index 508883d333f0..44a344d8b352 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -41,7 +41,7 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< sal_Bool bCanUseDocumentBaseURL ); //------------------------------------------------------ -OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, +OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::NamedValue >& aObjProps ) : m_pDocHolder( NULL ) , m_pInterfaceContainer( NULL ) @@ -51,7 +51,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti , m_nObjectState( -1 ) , m_nTargetState( -1 ) , m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) -, m_xFactory( xFactory ) +, m_xContext( rxContext ) , m_nMiscStatus( 0 ) , m_bEmbeddedScriptSupport( sal_True ) , m_bDocumentRecoverySupport( sal_True ) @@ -66,7 +66,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< lang::XMulti //------------------------------------------------------ OCommonEmbeddedObject::OCommonEmbeddedObject( - const uno::Reference< lang::XMultiServiceFactory >& xFactory, + const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::NamedValue >& aObjProps, const uno::Sequence< beans::PropertyValue >& aMediaDescr, const uno::Sequence< beans::PropertyValue >& aObjectDescr ) @@ -78,7 +78,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( , m_nObjectState( embed::EmbedStates::LOADED ) , m_nTargetState( -1 ) , m_nUpdateMode ( embed::EmbedUpdateModes::ALWAYS_UPDATE ) -, m_xFactory( xFactory ) +, m_xContext( rxContext ) , m_nMiscStatus( 0 ) , m_bEmbeddedScriptSupport( sal_True ) , m_bDocumentRecoverySupport( sal_True ) @@ -95,11 +95,11 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( //------------------------------------------------------ void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedValue >& aObjectProps ) { - OSL_ENSURE( m_xFactory.is(), "No ServiceFactory is provided!\n" ); - if ( !m_xFactory.is() ) + OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!\n" ); + if ( !m_xContext.is() ) throw uno::RuntimeException(); - m_pDocHolder = new DocumentHolder( comphelper::getComponentContext(m_xFactory), this ); + m_pDocHolder = new DocumentHolder( m_xContext, this ); m_pDocHolder->acquire(); // parse configuration entries @@ -234,7 +234,7 @@ void OCommonEmbeddedObject::LinkInit_Impl( m_bReadOnly = sal_True; if ( m_aLinkFilterName.getLength() ) { - ::comphelper::MimeConfigurationHelper aHelper( m_xFactory ); + ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); ::rtl::OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName ); m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) ); } diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index abb841813765..96e5db0c8a8c 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -191,7 +191,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc } //------------------------------------------------------ -static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< lang::XMultiServiceFactory >& _rxFactory, +static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< uno::XComponentContext >& _rxContext, const ::rtl::OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport ) { ::comphelper::NamedValueCollection aArguments; @@ -202,7 +202,8 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< uno::Reference< uno::XInterface > xDocument; try { - xDocument = _rxFactory->createInstanceWithArguments( _rDocumentServiceName, aArguments.getWrappedPropertyValues() ); + xDocument = _rxContext->getServiceManager()->createInstanceWithArgumentsAndContext( + _rDocumentServiceName, aArguments.getWrappedPropertyValues(), _rxContext ); } catch( const uno::Exception& ) { @@ -211,7 +212,7 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< // IllegalArgumentException when we try to create the instance with arguments. // Okay, so we fall back to creating the instance without any arguments. OSL_ASSERT("Consider implementing interface XInitialization to avoid duplicate construction"); - xDocument = _rxFactory->createInstance( _rDocumentServiceName ); + xDocument = _rxContext->getServiceManager()->createInstanceWithContext( _rDocumentServiceName, _rxContext ); } return uno::Reference< util::XCloseable >( xDocument, uno::UNO_QUERY ); @@ -312,7 +313,7 @@ void OCommonEmbeddedObject::EmbedAndReparentDoc_Impl( const uno::Reference< util //------------------------------------------------------ uno::Reference< util::XCloseable > OCommonEmbeddedObject::InitNewDocument_Impl() { - uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xFactory, GetDocumentServiceName(), + uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xContext, GetDocumentServiceName(), m_bEmbeddedScriptSupport, m_bDocumentRecoverySupport ) ); uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY ); @@ -372,7 +373,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::InitNewDocument_Impl() //------------------------------------------------------ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() { - uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xFactory, GetDocumentServiceName(), + uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xContext, GetDocumentServiceName(), m_bEmbeddedScriptSupport, m_bDocumentRecoverySupport ) ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY ); @@ -448,7 +449,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl() if ( aFilterName.isEmpty() ) { try { - ::comphelper::MimeConfigurationHelper aHelper( m_xFactory ); + ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); aFilterName = aHelper.GetDefaultFilterFromServiceName( GetDocumentServiceName(), nVersion ); } catch( const uno::Exception& ) {} @@ -480,7 +481,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag const uno::Reference< embed::XStorage > xSourceStorage( m_xRecoveryStorage.is() ? m_xRecoveryStorage : m_xObjectStorage ); - uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xFactory, GetDocumentServiceName(), + uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xContext, GetDocumentServiceName(), m_bEmbeddedScriptSupport, m_bDocumentRecoverySupport ) ); //#i103460# ODF: take the size given from the parent frame as default @@ -507,7 +508,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag uno::Reference< io::XInputStream > xTempInpStream; if ( !xDoc.is() ) { - xTempInpStream = createTempInpStreamFromStor( xSourceStorage, comphelper::getComponentContext(m_xFactory) ); + xTempInpStream = createTempInpStreamFromStor( xSourceStorage, m_xContext ); if ( !xTempInpStream.is() ) throw uno::RuntimeException(); @@ -574,7 +575,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr const ::rtl::OUString& aHierarchName ) { uno::Reference < io::XOutputStream > xTempOut( - io::TempFile::create(comphelper::getComponentContext(m_xFactory)), + io::TempFile::create(m_xContext), uno::UNO_QUERY_THROW ); uno::Reference< io::XInputStream > aResult( xTempOut, uno::UNO_QUERY ); @@ -781,7 +782,7 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed: // open storage based on document temporary file for reading uno::Reference < lang::XSingleServiceFactory > xStorageFactory( - m_xFactory->createInstance ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" )) ), + m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.embed.StorageFactory", m_xContext), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArgs(1); @@ -800,7 +801,7 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed: uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateDocFromMediaDescr_Impl( const uno::Sequence< beans::PropertyValue >& aMedDescr ) { - uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xFactory, GetDocumentServiceName(), + uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xContext, GetDocumentServiceName(), m_bEmbeddedScriptSupport, m_bDocumentRecoverySupport ) ); uno::Reference< frame::XLoadable > xLoadable( xDocument, uno::UNO_QUERY ); @@ -1696,7 +1697,7 @@ void SAL_CALL OCommonEmbeddedObject::reload( } } - ::comphelper::MimeConfigurationHelper aHelper( m_xFactory ); + ::comphelper::MimeConfigurationHelper aHelper( m_xContext ); if ( m_aLinkFilterName.isEmpty() ) { if ( !aNewLinkFilter.isEmpty() ) diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 62543b846d69..19a53cb5d51c 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -43,8 +43,8 @@ using namespace ::com::sun::star; -OSpecialEmbeddedObject::OSpecialEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, const uno::Sequence< beans::NamedValue >& aObjectProps ) -: OCommonEmbeddedObject( xFactory, aObjectProps ) +OSpecialEmbeddedObject::OSpecialEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::NamedValue >& aObjectProps ) +: OCommonEmbeddedObject( rxContext, aObjectProps ) { maSize.Width = maSize.Height = 10000; m_nObjectState = embed::EmbedStates::LOADED; diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx index ec29edae881a..adfd24552768 100644 --- a/embeddedobj/source/commonembedding/xfactory.cxx +++ b/embeddedobj/source/commonembedding/xfactory.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <rtl/logfile.hxx> +#include <comphelper/processfactory.hxx> #include "xfactory.hxx" @@ -54,7 +55,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OOoEmbeddedObjectFactory::impl_staticG uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { - return uno::Reference< uno::XInterface >( *new OOoEmbeddedObjectFactory( xServiceManager ) ); + return uno::Reference< uno::XInterface >( *new OOoEmbeddedObjectFactory( comphelper::getComponentContext(xServiceManager) ) ); } //------------------------------------------------------------------------- @@ -125,7 +126,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta xResult = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject( - m_xFactory, + m_xContext, aObject ) ), uno::UNO_QUERY ); } @@ -189,7 +190,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta xResult = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject( - m_xFactory, + m_xContext, aObject ) ), uno::UNO_QUERY ); } @@ -245,7 +246,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta xResult = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject( - m_xFactory, + m_xContext, aObject ) ), uno::UNO_QUERY ); @@ -306,7 +307,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta uno::Reference< uno::XInterface > xResult = uno::Reference< uno::XInterface > ( static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject( - m_xFactory, + m_xContext, aObject ) ), uno::UNO_QUERY ); @@ -366,7 +367,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta xResult = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject( - m_xFactory, + m_xContext, aObject, aTempMedDescr, lObjArgs ) ), @@ -432,7 +433,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta xResult = uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject( - m_xFactory, + m_xContext, aObject, aTempMedDescr, lObjArgs ) ), @@ -493,7 +494,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { - return uno::Reference< uno::XInterface >( *new OOoSpecialEmbeddedObjectFactory( xServiceManager ) ); + return uno::Reference< uno::XInterface >( *new OOoSpecialEmbeddedObjectFactory( comphelper::getComponentContext(xServiceManager) ) ); } //------------------------------------------------------------------------- @@ -516,7 +517,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOoSpecialEmbeddedObjectFactory::crea uno::Reference< uno::XInterface > xResult( static_cast< ::cppu::OWeakObject* > ( new OSpecialEmbeddedObject( - m_xFactory, + m_xContext, aObject ) ), uno::UNO_QUERY ); return xResult; diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index b7cf0226749a..0125d1fa4f38 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -29,17 +29,17 @@ class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::embed::XEmbeddedObjectCreator, ::com::sun::star::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::comphelper::MimeConfigurationHelper m_aConfigHelper; public: OOoEmbeddedObjectFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - , m_aConfigHelper( xFactory ) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) + : m_xContext( rxContext ) + , m_aConfigHelper( rxContext ) { - OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); + OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); @@ -76,17 +76,17 @@ class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::embed::XEmbedObjectFactory, ::com::sun::star::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::comphelper::MimeConfigurationHelper m_aConfigHelper; public: OOoSpecialEmbeddedObjectFactory( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - , m_aConfigHelper( xFactory ) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) + : m_xContext( rxContext ) + , m_aConfigHelper( rxContext ) { - OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); + OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 83d9b3e527ec..2fdb868e0280 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -59,7 +59,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticG uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) { - return uno::Reference< uno::XInterface >( *new UNOEmbeddedObjectCreator( xServiceManager ) ); + return uno::Reference< uno::XInterface >( *new UNOEmbeddedObjectCreator( comphelper::getComponentContext(xServiceManager) ) ); } //------------------------------------------------------------------------- @@ -96,7 +96,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta aEmbedFactory = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.OLEEmbeddedObjectFactory" )); } - uno::Reference < uno::XInterface > xFact( m_xFactory->createInstance( aEmbedFactory ) ); + uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) ); uno::Reference< embed::XEmbedObjectCreator > xEmbCreator( xFact, uno::UNO_QUERY ); if ( xEmbCreator.is() ) return xEmbCreator->createInstanceInitNew( aClassID, aClassName, xStorage, sEntName, lObjArgs ); @@ -209,7 +209,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta if ( !aEmbedFactory.isEmpty() ) { - uno::Reference< uno::XInterface > xFact = m_xFactory->createInstance( aEmbedFactory ); + uno::Reference< uno::XInterface > xFact = m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext); uno::Reference< embed::XEmbedObjectCreator > xEmbCreator( xFact, uno::UNO_QUERY ); if ( xEmbCreator.is() ) @@ -262,7 +262,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta { // the object can be loaded by one of the office application uno::Reference< embed::XEmbeddedObjectCreator > xOOoEmbCreator = - embed::OOoEmbeddedObjectFactory::create( comphelper::getComponentContext(m_xFactory) ); + embed::OOoEmbeddedObjectFactory::create( m_xContext ); xResult = xOOoEmbCreator->createInstanceInitFromMediaDescriptor( xStorage, sEntName, @@ -281,7 +281,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // was also extended. uno::Reference< embed::XEmbeddedObjectCreator > xOleEmbCreator = - embed::OLEEmbeddedObjectFactory::create( comphelper::getComponentContext(m_xFactory) ); + embed::OLEEmbeddedObjectFactory::create( m_xContext ); xResult = xOleEmbCreator->createInstanceInitFromMediaDescriptor( xStorage, sEntName, aTempMedDescr, lObjArgs ); } @@ -319,7 +319,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); uno::Reference< embed::XEmbedObjectFactory > xEmbFactory( - m_xFactory->createInstance( aEmbedFactory ), + m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), uno::UNO_QUERY ); if ( !xEmbFactory.is() ) throw uno::RuntimeException(); // TODO: @@ -367,7 +367,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta { // the object can be loaded by one of the office application uno::Reference< embed::XEmbeddedObjectCreator > xOOoLinkCreator = - embed::OOoEmbeddedObjectFactory::create( comphelper::getComponentContext(m_xFactory) ); + embed::OOoEmbeddedObjectFactory::create( m_xContext ); xResult = xOOoLinkCreator->createInstanceLink( xStorage, sEntName, @@ -398,7 +398,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta 4 ); uno::Reference< embed::XEmbeddedObjectCreator > xLinkCreator = - embed::OLEEmbeddedObjectFactory::create( comphelper::getComponentContext(m_xFactory)); + embed::OLEEmbeddedObjectFactory::create( m_xContext); xResult = xLinkCreator->createInstanceLink( xStorage, sEntName, aTempMedDescr, lObjArgs ); } @@ -425,7 +425,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID ); uno::Reference< embed::XLinkFactory > xLinkFactory( - m_xFactory->createInstance( aEmbedFactory ), + m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext), uno::UNO_QUERY ); if ( !xLinkFactory.is() ) throw uno::RuntimeException(); // TODO: diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index bf0dc1aed03d..2100ff2cc522 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -95,7 +95,7 @@ protected: sal_Int32 m_nTargetState; // should be -1 exept during state changing sal_Int32 m_nUpdateMode; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDocMediaDescriptor; @@ -228,12 +228,12 @@ private: public: OCommonEmbeddedObject( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps ); // no persistance for linked objects, so the descriptors are provided in constructor OCommonEmbeddedObject( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aObjectDescr ); diff --git a/embeddedobj/source/inc/specialobject.hxx b/embeddedobj/source/inc/specialobject.hxx index 82c2b29d9790..e0612dfe4b32 100644 --- a/embeddedobj/source/inc/specialobject.hxx +++ b/embeddedobj/source/inc/specialobject.hxx @@ -30,7 +30,7 @@ private: com::sun::star::awt::Size maSize; public: OSpecialEmbeddedObject( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps ); // XInterface diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 6e63b8bbed28..5e8b908fafe8 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -31,16 +31,16 @@ class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper2< ::com::sun::star::embed::XEmbeddedObjectCreator, ::com::sun::star::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::comphelper::MimeConfigurationHelper m_aConfigHelper; public: UNOEmbeddedObjectCreator( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - , m_aConfigHelper( xFactory ) + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) + : m_xContext( rxContext ) + , m_aConfigHelper( rxContext ) { - OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); + OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); } static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index ccf816153bdc..5fdda998f881 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -331,7 +331,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo() xTmpStorage->dispose(); // look for the related embedded object factory - ::comphelper::MimeConfigurationHelper aConfigHelper( m_xFactory ); + ::comphelper::MimeConfigurationHelper aConfigHelper( comphelper::getComponentContext(m_xFactory) ); ::rtl::OUString aEmbedFactory; if ( !aMediaType.isEmpty() ) aEmbedFactory = aConfigHelper.GetFactoryNameByMediaType( aMediaType ); diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index 9b825609d79b..60a63e42570f 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -218,7 +218,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia // TODO: use config helper for type detection uno::Reference< embed::XEmbeddedObjectCreator > xEmbCreator; - ::comphelper::MimeConfigurationHelper aHelper( m_xFactory ); + ::comphelper::MimeConfigurationHelper aHelper( comphelper::getComponentContext(m_xFactory) ); if ( aHelper.AddFilterNameCheckOwnFile( aMediaDescr ) ) xEmbCreator = embed::EmbeddedObjectCreator::create( comphelper::getComponentContext(m_xFactory) ); diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index fdfe2c715cf3..1dc60566372c 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -522,8 +522,7 @@ namespace aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden")); aArgs[nLen++].Value <<= sal_True; - uno::Reference< lang::XMultiServiceFactory > xFac(m_xContext->getServiceManager(),uno::UNO_QUERY); - ::comphelper::MimeConfigurationHelper aHelper(xFac); + ::comphelper::MimeConfigurationHelper aHelper(m_xContext); SvtModuleOptions aModuleOptions; uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL( aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(m_sMimeType) )), diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 07a662b046a1..38b529baeed8 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -169,8 +169,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task static const ::rtl::OUString s_sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); try { - const uno::Reference< lang::XMultiServiceFactory > xFactory(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW); - MimeConfigurationHelper aConfighelper(xFactory); + MimeConfigurationHelper aConfighelper(m_xContext); const ::rtl::OUString sMimeType = m_xReport->getMimeType(); const SfxFilter* pFilter = SfxFilter::GetDefaultFilter( aConfighelper.GetDocServiceNameFromMediaType(sMimeType) ); String sExt; diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index bd0bbca024e9..01954e4aeebe 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1678,8 +1678,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin // ----------------------------------------------------------------------------- ::rtl::OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const ::rtl::OUString& _sMimetype) const { - uno::Reference<lang::XMultiServiceFactory> xServiceFactory(m_xContext->getServiceManager(),uno::UNO_QUERY_THROW); - ::comphelper::MimeConfigurationHelper aMimeHelper(xServiceFactory); + ::comphelper::MimeConfigurationHelper aMimeHelper(m_xContext); ::rtl::OUString sRet; const SfxFilter* pFilter = SfxFilter::GetDefaultFilter( aMimeHelper.GetDocServiceNameFromMediaType(_sMimetype) ); if ( pFilter ) |