diff options
49 files changed, 151 insertions, 127 deletions
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index 4520112a3cca..72b22386e57a 100644 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.hxx @@ -20,7 +20,6 @@ #define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED #include <comphelper/stl_types.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/uno/Sequence.h> #include "connectivity/dbtoolsdllapi.hxx" @@ -44,11 +43,11 @@ namespace connectivity { mutable ::utl::OConfigurationTreeRoot m_aInstalled; mutable TInstalledDrivers m_aDrivers; - void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; + void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const; public: DriversConfigImpl(); - const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const { Load(_rxORB); return m_aDrivers; } + const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; } }; // // Allows to access all driver which are located in the configuration @@ -59,7 +58,7 @@ namespace connectivity const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const; public: - DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); ~DriversConfig(); DriversConfig( const DriversConfig& ); @@ -73,7 +72,7 @@ namespace connectivity ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const; private: OSharedConfigNode m_aNode; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; }; } #endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 1fd66e910bf3..78734d8abe27 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -375,7 +375,7 @@ namespace dbtools ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue ); - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); /** quote the given name with the given quote string. */ diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index 6a204bfb8bdc..8b94f6919d0c 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -90,14 +90,14 @@ DriversConfigImpl::DriversConfigImpl() { } // ----------------------------------------------------------------------------- -void DriversConfigImpl::Load(const uno::Reference< lang::XMultiServiceFactory >& _rxORB) const +void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rxORB) const { if ( m_aDrivers.empty() ) { if ( !m_aInstalled.isValid() ) { static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed - m_aInstalled = ::utl::OConfigurationTreeRoot::createWithServiceFactory(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); + m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); } if ( m_aInstalled.isValid() ) @@ -116,7 +116,7 @@ void DriversConfigImpl::Load(const uno::Reference< lang::XMultiServiceFactory >& } } // ----------------------------------------------------------------------------- -DriversConfig::DriversConfig(const uno::Reference< lang::XMultiServiceFactory >& _rxORB) +DriversConfig::DriversConfig(const uno::Reference< uno::XComponentContext >& _rxORB) :m_xORB(_rxORB) { } diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index 06aed4ea1a76..ad9a1a3c01a4 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -89,7 +89,7 @@ namespace dbtools DatabaseMetaData_Impl() :xConnection() ,xConnectionMetaData() - ,aDriverConfig( ::comphelper::getProcessServiceFactory() ) + ,aDriverConfig( ::comphelper::getProcessComponentContext() ) ,sCachedIdentifierQuoteString() ,sCachedCatalogSeparator() { diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index acfb227703ab..1b6124a164ca 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -984,9 +984,9 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& return s_sNodeName; } // ----------------------------------------------------------------------------- -::rtl::OUString getDefaultReportEngineServiceName(const Reference< XMultiServiceFactory >& _rxORB) +::rtl::OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB) { - ::utl::OConfigurationTreeRoot aReportEngines = ::utl::OConfigurationTreeRoot::createWithServiceFactory( + ::utl::OConfigurationTreeRoot aReportEngines = ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxORB, lcl_getReportEngines(), -1, ::utl::OConfigurationTreeRoot::CM_READONLY); if ( aReportEngines.isValid() ) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 25087d2ebd24..193adbbf9247 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -74,7 +74,7 @@ namespace connectivity { Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) { - return *(new ODriverDelegator(_rxFac)); + return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac))); } } @@ -84,9 +84,9 @@ namespace connectivity //= ODriverDelegator //==================================================================== //-------------------------------------------------------------------- - ODriverDelegator::ODriverDelegator(const Reference< XMultiServiceFactory >& _rxFactory) + ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext) : ODriverDelegator_BASE(m_aMutex) - ,m_xFactory(_rxFactory) + ,m_xContext(_rxContext) ,m_bInShutDownConnections(sal_False) { } @@ -131,7 +131,7 @@ namespace connectivity if ( !m_xDriver.is() ) { ::rtl::OUString sURL("jdbc:hsqldb:db"); - Reference<XDriverManager2> xDriverAccess = DriverManager::create( comphelper::getComponentContext(m_xFactory) ); + Reference<XDriverManager2> xDriverAccess = DriverManager::create( m_xContext ); m_xDriver = xDriverAccess->getDriverByURL(sURL); } @@ -141,14 +141,14 @@ namespace connectivity //-------------------------------------------------------------------- namespace { - ::rtl::OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XMultiServiceFactory >& _rxORB ) + ::rtl::OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext ) { ::rtl::OUStringBuffer aConfigPath; aConfigPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" ); aConfigPath.append ( ODriverDelegator::getImplementationName_Static() ); aConfigPath.appendAscii( "/PermittedJavaMethods" ); - ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithServiceFactory( - _rxORB, aConfigPath.makeStringAndClear() ) ); + ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( + _rxContext, aConfigPath.makeStringAndClear() ) ); ::rtl::OUStringBuffer aPermittedMethods; Sequence< ::rtl::OUString > aNodeNames( aConfig.getNodeNames() ); @@ -252,7 +252,7 @@ namespace connectivity // security: permitted Java classes NamedValue aPermittedClasses( ::rtl::OUString( "hsqldb.method_class_names" ), - makeAny( lcl_getPermittedJavaMethods_nothrow( m_xFactory ) ) + makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); @@ -372,12 +372,12 @@ namespace connectivity static Reference< XTerminateListener> s_xTerminateListener; if( !s_xTerminateListener.is() ) { - Reference< XDesktop2 > xDesktop = Desktop::create( comphelper::getComponentContext(m_xFactory) ); + Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext ); s_xTerminateListener = new OConnectionController(this); xDesktop->addTerminateListener(s_xTerminateListener); } - Reference< XComponent> xIfc = new OHsqlConnection( this, xOrig, comphelper::getComponentContext(m_xFactory) ); + Reference< XComponent> xIfc = new OHsqlConnection( this, xOrig, m_xContext ); xConnection.set(xIfc,UNO_QUERY); m_aConnections.push_back(TWeakPair(WeakReferenceHelper(xOrig),TWeakConnectionPair(sKey,TWeakRefPair(WeakReferenceHelper(xConnection),WeakReferenceHelper())))); @@ -817,15 +817,14 @@ namespace connectivity } //.............................................................. - ::rtl::OUString lcl_getSystemLocale( const Reference< XMultiServiceFactory >& _rxORB ) + ::rtl::OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext ) { ::rtl::OUString sLocaleString = ::rtl::OUString( "en-US" ); try { //......................................................... Reference< XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( - comphelper::getComponentContext( _rxORB ) ) ); + com::sun::star::configuration::theDefaultProvider::get( _rxContext ) ); //......................................................... // arguments for creating the config access @@ -887,7 +886,7 @@ namespace connectivity { ::rtl::OUStringBuffer aStatement; aStatement.appendAscii( "SET DATABASE COLLATION \"" ); - aStatement.appendAscii( lcl_getCollationForLocale( lcl_getSystemLocale( m_xFactory ) ) ); + aStatement.appendAscii( lcl_getCollationForLocale( lcl_getSystemLocale( m_xContext ) ) ); aStatement.appendAscii( "\"" ); xStatement->execute( aStatement.makeStringAndClear() ); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index a814c1b6665d..3ef5f0c60361 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -757,8 +757,8 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri ::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass) { static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths")); - ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithServiceFactory( - m_pDriver->getContext().getLegacyServiceFactory(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); + ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext( + m_pDriver->getContext().getUNOContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); ::rtl::OUString sURL; if ( aNamesRoot.isValid() && aNamesRoot.hasByName( _sDriverClass ) ) { diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 4288a66651e3..45cac22c8cf7 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/sdbcx/XCreateCatalog.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase5.hxx> #include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> @@ -63,7 +64,7 @@ namespace connectivity // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; sal_Bool m_bInShutDownConnections; /** load the driver we want to delegate. @@ -82,7 +83,7 @@ namespace connectivity public: /** creates a new delegator for a HSQLDB driver */ - ODriverDelegator(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + ODriverDelegator(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 7f2d8fb30c2c..68411e75c778 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -242,7 +242,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext ) :m_aContext( _rxContext ) ,m_aEventLogger( _rxContext, "org.openoffice.logging.sdbc.DriverManager" ) - ,m_aDriverConfig(m_aContext.getLegacyServiceFactory()) + ,m_aDriverConfig(m_aContext.getUNOContext()) ,m_nLoginTimeout(0) { // bootstrap all objects supporting the .sdb.Driver service diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 504c35cc4f55..344c15cf4471 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -138,8 +138,8 @@ namespace dbaccess ,m_aConfigurationRoot() ,m_aRegistrationListeners( m_aMutex ) { - m_aConfigurationRoot = ::utl::OConfigurationTreeRoot::createWithServiceFactory( - m_aContext.getLegacyServiceFactory(), getConfigurationRootPath(), -1, ::utl::OConfigurationTreeRoot::CM_UPDATABLE ); + m_aConfigurationRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext( + m_aContext.getUNOContext(), getConfigurationRootPath(), -1, ::utl::OConfigurationTreeRoot::CM_UPDATABLE ); } DatabaseRegistrations::~DatabaseRegistrations() diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index d0fd4dc0d9fd..0e2b410d0e64 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1638,7 +1638,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ { // we seem to be a "new style" report, check if report extension is present. Reference< XContentEnumerationAccess > xEnumAccess( m_aContext.getLegacyServiceFactory(), UNO_QUERY ); - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext.getLegacyServiceFactory()); + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext.getUNOContext()); Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() ) { diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index c392e0b14b66..15587a0bf43a 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -57,9 +57,9 @@ namespace dbaccess //========================================================================= DBG_NAME(ODsnTypeCollection) //------------------------------------------------------------------------- -ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory) -:m_aDriverConfig(_xFactory) -,m_xFactory(_xFactory) +ODsnTypeCollection::ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext) +:m_aDriverConfig(_xContext) +,m_xContext(_xContext) #if OSL_DEBUG_LEVEL > 0 ,m_nLivingIterators(0) #endif @@ -305,7 +305,7 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) cons { ::rtl::OUString sEmbeddedDatabaseURL; static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess")); ///Installed - const ::utl::OConfigurationTreeRoot aInstalled = ::utl::OConfigurationTreeRoot::createWithServiceFactory(m_xFactory, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); + const ::utl::OConfigurationTreeRoot aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(m_xContext, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY); if ( aInstalled.isValid() ) { if ( aInstalled.hasByName("EmbeddedDatabases/DefaultEmbeddedDatabase/Value") ) diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 8ffc3e2be408..391c462ed7e5 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -27,6 +27,7 @@ #include <xmloff/txtimp.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include "xmlstrings.hrc" @@ -195,7 +196,7 @@ namespace dbaxml ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 nExportFlag) : SvXMLExport( util::MeasureUnit::MM_10TH, _rxMSF, XML_DATABASE, EXPORT_OASIS | nExportFlag) -,m_aTypeCollection(_rxMSF) +,m_aTypeCollection(comphelper::getComponentContext(_rxMSF)) ,m_bAllreadyFilled(sal_False) { GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_10TH); @@ -280,7 +281,7 @@ void ODBExport::exportDataSource() xSettingsState->getPropertyDefault( INFO_DECIMALDELIMITER ) >>= aDelimiter.sDecimal; xSettingsState->getPropertyDefault( INFO_THOUSANDSDELIMITER ) >>= aDelimiter.sThousand; - ::connectivity::DriversConfig aDriverConfig(getServiceFactory()); + ::connectivity::DriversConfig aDriverConfig(comphelper::getComponentContext(getServiceFactory())); const ::rtl::OUString sURL = ::comphelper::getString(xProp->getPropertyValue(PROPERTY_URL)); ::comphelper::NamedValueCollection aDriverSupportedProperties( aDriverConfig.getProperties( sURL ) ); diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 27dacf3d10e9..623bacdd1f5c 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -26,6 +26,7 @@ #include "xmlstrings.hrc" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> @@ -99,7 +100,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, } if ( !(sLocation.isEmpty() || sMediaType.isEmpty()) ) { - ::dbaccess::ODsnTypeCollection aTypeCollection(rImport.getORB()); + ::dbaccess::ODsnTypeCollection aTypeCollection(comphelper::getComponentContext(rImport.getORB())); ::rtl::OUString sURL(aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 8ad67807c5d5..a625398598b2 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -176,7 +176,7 @@ namespace dbaxml protected: virtual ~DatasourceURLListener(){} public: - DatasourceURLListener(uno::Reference< lang::XMultiServiceFactory > const & _xFactory) : m_xFactory(_xFactory),m_aTypeCollection(_xFactory){} + DatasourceURLListener(uno::Reference< lang::XMultiServiceFactory > const & _xFactory) : m_xFactory(_xFactory),m_aTypeCollection(comphelper::getComponentContext(_xFactory)){} // XPropertyChangeListener virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& _rEvent ) throw (uno::RuntimeException) { @@ -871,7 +871,7 @@ void ODBFilter::setPropertyInfo() if ( !xDataSource.is() ) return; - ::connectivity::DriversConfig aDriverConfig(getServiceFactory()); + ::connectivity::DriversConfig aDriverConfig(comphelper::getComponentContext(getServiceFactory())); const ::rtl::OUString sURL = ::comphelper::getString(xDataSource->getPropertyValue(PROPERTY_URL)); ::comphelper::NamedValueCollection aDataSourceSettings = aDriverConfig.getProperties( sURL ); diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index e50c936ae051..fc2d64d2f76b 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -20,8 +20,6 @@ #ifndef _DBACCESS_DSNTYPES_HXX_ #define _DBACCESS_DSNTYPES_HXX_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - #include <comphelper/stl_types.hxx> #include "dbadllapi.hxx" #include <tools/string.hxx> @@ -111,7 +109,7 @@ protected: StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource ::connectivity::DriversConfig m_aDriverConfig; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; #if OSL_DEBUG_LEVEL > 0 sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators @@ -121,7 +119,7 @@ public: class TypeIterator; friend class ODsnTypeCollection::TypeIterator; - ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); + ODsnTypeCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext); ~ODsnTypeCollection(); /// get the datasource type display name from a DSN string diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 43366805df60..1ddb0ebe061b 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -301,7 +301,7 @@ OApplicationController::OApplicationController(const Reference< XMultiServiceFac :OApplicationController_CBASE( _rxORB ) ,m_aContextMenuInterceptors( getMutex() ) ,m_pSubComponentManager( new SubComponentManager( *this, getSharedMutex() ) ) - ,m_aTypeCollection(_rxORB) + ,m_aTypeCollection( comphelper::getComponentContext(_rxORB) ) ,m_aTableCopyHelper(this) ,m_pClipbordNotifier(NULL) ,m_nAsyncDrop(0) @@ -660,7 +660,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = xEnumAccess.is(); if ( aReturn.bEnabled ) { - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xServiceFactory); + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(comphelper::getComponentContext(m_xServiceFactory)); aReturn.bEnabled = !sReportEngineServiceName.isEmpty(); if ( aReturn.bEnabled ) { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 143b9d3eb63c..af44aa1f3260 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1753,7 +1753,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const } else if ( nId == ID_TREE_EDIT_DATABASE ) { - ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithServiceFactory( getORB(), + ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( comphelper::getComponentContext(getORB()), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/Policies/Features/Common" ) ) ) ); sal_Bool bHaveEditDatabase( sal_True ); OSL_VERIFY( aConfig.getNodeValue( "EditDatabaseFromDataSourceView" ) >>= bHaveEditDatabase ); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 1b717c869dea..eb33e8e6f028 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -318,7 +318,7 @@ namespace dbaui { if ( m_aJavaDriver.GetText().Len() ) { - ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM(m_pAdminDialog->getORB()); + ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( Reference<XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), UNO_QUERY_THROW) ); bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aJavaDriver.GetText()); } } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 07e0bfb70621..f84b37c1b89c 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -556,8 +556,8 @@ DBG_NAME(OMySQLIntroPageSetup) { if ( m_aETDriverClass.GetText().Len() ) { -// TODO chage jvmaccess - ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM(m_pAdminDialog->getORB()); +// TODO change jvmaccess + ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( uno::Reference<lang::XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), uno::UNO_QUERY_THROW) ); bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText()); } } @@ -676,8 +676,8 @@ DBG_NAME(OMySQLIntroPageSetup) { if ( m_aETDriverClass.GetText().Len() ) { -// TODO chage jvmaccess - ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM(m_pAdminDialog->getORB()); +// TODO change jvmaccess + ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( uno::Reference<lang::XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), uno::UNO_QUERY_THROW) ); bSuccess = xJVM.is() && ::connectivity::existsJavaClassByName(xJVM,m_aETDriverClass.GetText()); } } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index a548f2f4dec6..329faf48e4b6 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -146,8 +146,8 @@ namespace //======================================================================== //= ODbDataSourceAdministrationHelper //======================================================================== -ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XMultiServiceFactory >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper) - : m_xORB(_xORB) +ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper) + : m_xContext(_xORB) , m_pParent(_pParent) , m_pItemSetHelper(_pItemSetHelper) { @@ -209,7 +209,7 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer try { - m_xDatabaseContext = DatabaseContext::create(comphelper::getComponentContext(m_xORB)); + m_xDatabaseContext = DatabaseContext::create(m_xContext); } catch(const Exception&) { @@ -252,7 +252,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert if ( !xHandler.is() ) { // instantiate the default SDB interaction handler - xHandler = Reference< XInteractionHandler >( task::InteractionHandler::createWithParent(comphelper::getComponentContext(m_xORB), 0), UNO_QUERY ); + xHandler = Reference< XInteractionHandler >( task::InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY ); } String sName = pName ? pName->GetValue() : String(); @@ -373,7 +373,7 @@ void ODbDataSourceAdministrationHelper::clearPassword() catch (const SQLWarning& e) { aErrorInfo = SQLExceptionInfo(e); } catch (const SQLException& e) { aErrorInfo = SQLExceptionInfo(e); } - showError(aErrorInfo,m_pParent,comphelper::getComponentContext(getORB())); + showError(aErrorInfo,m_pParent,getORB()); } if ( aRet.first.is() ) successfullyConnected();// notify the admindlg to save the password @@ -396,7 +396,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const ::rtl::O try { - xDriverManager.set( ConnectionPool::create( comphelper::getComponentContext(getORB()) ) ); + xDriverManager.set( ConnectionPool::create( getORB() ) ); } catch (const Exception& e) { @@ -734,7 +734,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS // first determine which of all the items are relevant for the data source (depends on the connection url) ::rtl::OUString eType = getDatasourceType(_rSource); ::std::vector< sal_Int32> aDetailIds; - ODriversSettings::getSupportedIndirectSettings(eType,getORB(),aDetailIds); + ODriversSettings::getSupportedIndirectSettings(eType, getORB(), aDetailIds); // collect the translated property values for the relevant items PropertyValueSet aRelevantSettings; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 305aa8a7cdbf..9c21c83e1f53 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -57,8 +57,8 @@ namespace dbaui DECLARE_STL_MAP(sal_Int32, ::rtl::OUString, ::std::less< sal_Int32 >, MapInt2String); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; /// service factory + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + m_xContext; /// service factory ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > m_xDatabaseContext; /// database context we're working in ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDatasource; @@ -75,7 +75,7 @@ namespace dbaui IItemSetHelper* m_pItemSetHelper; public: - ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB + ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB ,Window* _pParent ,IItemSetHelper* _pItemSetHelper); @@ -92,7 +92,7 @@ namespace dbaui /// clear the password in the current data source's item set void clearPassword(); - inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; } + inline ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const { return m_xContext; } ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext > getDatabaseContext() const { return m_xDatabaseContext; } diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 4291c686361e..1176326d0dc5 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::NamedValue; using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. @@ -51,7 +51,7 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR // The best approach would be to extend the FeatureSet to contain *all* known data source features, not only // the ones from the "Advanced settings" UI. - ::connectivity::DriversConfig aDriverConfig(_xFactory); + ::connectivity::DriversConfig aDriverConfig(_xContext); const ::comphelper::NamedValueCollection& aProperties = aDriverConfig.getProperties(_sURLPrefix); #if OSL_DEBUG_LEVEL > 0 { diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 16ccc397ed19..219dfa106200 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -40,7 +40,7 @@ namespace dbaui @param _out_rDetailsIds Will be filled. */ - static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory,::std::vector< sal_Int32>& _out_rDetailsIds ); + static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for Dbase */ diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index af55b88ff237..89fbdda38a60 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -23,6 +23,7 @@ #include "tablespage.hxx" #include <vcl/msgbox.hxx> #include "dsitems.hxx" +#include <comphelper/processfactory.hxx> #include "propertysetitem.hxx" @@ -47,7 +48,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent ,const Reference< XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName) :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems) - ,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) ) + ,m_pImpl( new ODbDataSourceAdministrationHelper( comphelper::getComponentContext(_rxORB), pParent, this ) ) ,m_bStopExecution(sal_False) ,m_pOutSet(_pItems) { diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index f57256bf3f15..411c9c279974 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -56,7 +56,7 @@ DBG_NAME(OUserAdminDlg) //======================================================================== OUserAdminDlg::OUserAdminDlg(Window* _pParent , SfxItemSet* _pItems - ,const Reference< XMultiServiceFactory >& _rxORB + ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ,const Reference< XConnection >& _xConnection) :SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_USERADMIN), _pItems) @@ -107,7 +107,7 @@ DBG_NAME(OUserAdminDlg) try { ::dbtools::DatabaseMetaData aMetaData( createConnection().first ); - if ( !aMetaData.supportsUserAdministration( ::comphelper::ComponentContext( getORB() ) ) ) + if ( !aMetaData.supportsUserAdministration( getORB() ) ) { String sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); throw SQLException(sError,NULL,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any()); @@ -115,7 +115,7 @@ DBG_NAME(OUserAdminDlg) } catch(const SQLException&) { - ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), GetParent(), ::comphelper::getComponentContext( getORB() ) ); + ::dbaui::showError( ::dbtools::SQLExceptionInfo( ::cppu::getCaughtException() ), GetParent(), getORB() ); return RET_CANCEL; } catch(const Exception&) @@ -131,7 +131,7 @@ DBG_NAME(OUserAdminDlg) void OUserAdminDlg::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) { // register ourself as modified listener - static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory(m_pImpl->getORB()); + static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( Reference<XMultiServiceFactory>(m_pImpl->getORB()->getServiceManager(), UNO_QUERY_THROW) ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); AdjustLayout(); @@ -162,7 +162,7 @@ DBG_NAME(OUserAdminDlg) return ::std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,sal_False); } // ----------------------------------------------------------------------------- - Reference< XMultiServiceFactory > OUserAdminDlg::getORB() const + Reference< XComponentContext > OUserAdminDlg::getORB() const { return m_pImpl->getORB(); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index f15fd2547825..be26d56ba05f 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -44,6 +44,8 @@ namespace dbaui using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::XComponentContext; + using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::sdbc::XConnection; using ::com::sun::star::sdbc::XDriver; @@ -451,10 +453,10 @@ namespace dbaui //======================================================================== //------------------------------------------------------------------------ AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems, - const Reference< XMultiServiceFactory >& _rxORB, const Any& _aDataSourceName ) + const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName ) :SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems) { - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this)); + m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); m_pImpl->translateProperties(xDatasource, *_pItems); @@ -514,7 +516,7 @@ namespace dbaui void AdvancedSettingsDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) { // register ourself as modified listener - static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory(m_pImpl->getORB()); + static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( Reference<XMultiServiceFactory>(m_pImpl->getORB()->getServiceManager(), UNO_QUERY_THROW) ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); AdjustLayout(); @@ -544,7 +546,7 @@ namespace dbaui } // ----------------------------------------------------------------------------- - Reference< XMultiServiceFactory > AdvancedSettingsDialog::getORB() const + Reference< XComponentContext > AdvancedSettingsDialog::getORB() const { return m_pImpl->getORB(); } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index d3ddfb7ac0e5..9d97f6d37530 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -57,7 +57,7 @@ DBG_NAME(ODbAdminDialog) //------------------------------------------------------------------------- ODbAdminDialog::ODbAdminDialog(Window* _pParent , SfxItemSet* _pItems - , const Reference< XMultiServiceFactory >& _rxORB + , const Reference< XComponentContext >& _rxContext ) :SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADMINISTRATION), _pItems) ,m_bApplied(sal_False) @@ -66,7 +66,7 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent { DBG_CTOR(ODbAdminDialog,NULL); - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); + m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxContext,this,this)); // add the initial tab page AddTabPage( m_nMainPageID, String( ModuleRes( STR_PAGETITLE_GENERAL ) ), OConnectionTabPage::Create, NULL ); @@ -98,7 +98,7 @@ short ODbAdminDialog::Ok() void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) { // register ourself as modified listener - static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory(m_pImpl->getORB()); + static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( Reference<XMultiServiceFactory>(m_pImpl->getORB()->getServiceManager(), UNO_QUERY_THROW) ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); AdjustLayout(); @@ -297,7 +297,7 @@ SfxItemSet* ODbAdminDialog::getWriteOutputSet() return m_pImpl->createConnection(); } // ----------------------------------------------------------------------------- -Reference< XMultiServiceFactory > ODbAdminDialog::getORB() const +Reference< XComponentContext > ODbAdminDialog::getORB() const { return m_pImpl->getORB(); } diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 1dfac6ea3780..8dc1c61064d1 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -73,7 +73,7 @@ DBG_NAME(ODbTypeWizDialog) //------------------------------------------------------------------------- ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ,SfxItemSet* _pItems - ,const Reference< XMultiServiceFactory >& _rxORB + ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ) :OWizardMachine(_pParent, ModuleRes(DLG_DATABASE_TYPE_CHANGE), WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ) @@ -221,7 +221,7 @@ SfxItemSet* ODbTypeWizDialog::getWriteOutputSet() return m_pImpl->createConnection(); } // ----------------------------------------------------------------------------- -Reference< XMultiServiceFactory > ODbTypeWizDialog::getORB() const +Reference< XComponentContext > ODbTypeWizDialog::getORB() const { return m_pImpl->getORB(); } @@ -300,7 +300,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) // register ourself as modified listener if ( pPage ) { - static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory(m_pImpl->getORB()); + static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory( Reference<XMultiServiceFactory>(m_pImpl->getORB()->getServiceManager(), UNO_QUERY_THROW) ); static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); // open our own resource block, as the page titles are strings local to this block LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); @@ -343,7 +343,7 @@ sal_Bool ODbTypeWizDialog::saveDatasource() if ( pPage ) pPage->FillItemSet(*m_pOutSet); - DataSourceInfoConverter aConverter(getORB()); + DataSourceInfoConverter aConverter( Reference<XMultiServiceFactory>(getORB()->getServiceManager(), UNO_QUERY_THROW) ); ::rtl::OUString sOldURL; if ( m_pImpl->getCurrentDataSource().is() ) m_pImpl->getCurrentDataSource()->getPropertyValue(PROPERTY_URL) >>= sOldURL; diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index c0e33b3cf528..90fb5f0c9d5d 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -122,7 +122,7 @@ DBG_NAME(ODbTypeWizDialogSetup) //------------------------------------------------------------------------- ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent ,SfxItemSet* _pItems - ,const Reference< XMultiServiceFactory >& _rxORB + ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ) :svt::RoadmapWizard( _pParent, ModuleRes(DLG_DATABASE_WIZARD), @@ -326,7 +326,7 @@ void DataSourceInfoConverter::convert(const ::dbaccess::ODsnTypeCollection* _pCo _xDatasource->getPropertyValue(PROPERTY_INFO) >>= aInfo; ::comphelper::NamedValueCollection aDS(aInfo); - ::connectivity::DriversConfig aDriverConfig(m_xFactory); + ::connectivity::DriversConfig aDriverConfig(comphelper::getComponentContext(m_xFactory)); const ::comphelper::NamedValueCollection& aOldProperties = aDriverConfig.getProperties(_sOldURLPrefix); const ::comphelper::NamedValueCollection& aNewProperties = aDriverConfig.getProperties(_sNewURLPrefix); @@ -355,7 +355,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath() case OGeneralPage::eConnectExternal: { ::rtl::OUString sOld = m_sURL; - DataSourceInfoConverter aConverter(getORB()); + DataSourceInfoConverter aConverter( uno::Reference<lang::XMultiServiceFactory>(getORB()->getServiceManager(), uno::UNO_QUERY_THROW) ); m_sURL = m_pGeneralPage->GetSelectedType(); aConverter.convert(m_pCollection,sOld,m_sURL,m_pImpl->getCurrentDataSource()); ::dbaccess::DATASOURCE_TYPE eType = VerifyDataSourceType(m_pCollection->determineType(m_sURL)); @@ -440,7 +440,7 @@ SfxItemSet* ODbTypeWizDialogSetup::getWriteOutputSet() return m_pImpl->createConnection(); } // ----------------------------------------------------------------------------- -Reference< XMultiServiceFactory > ODbTypeWizDialogSetup::getORB() const +Reference< XComponentContext > ODbTypeWizDialogSetup::getORB() const { return m_pImpl->getORB(); } @@ -595,7 +595,7 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) if ( pPage ) { - pPage->SetServiceFactory(m_pImpl->getORB()); + pPage->SetServiceFactory( uno::Reference<lang::XMultiServiceFactory>(m_pImpl->getORB()->getServiceManager(), uno::UNO_QUERY_THROW) ); pPage->SetAdminDialog(this, this); defaultButton( _nState == PAGE_DBSETUPWIZARD_FINAL ? WZB_FINISH : WZB_NEXT ); @@ -734,7 +734,7 @@ namespace //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { - Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(comphelper::getComponentContext(getORB()), 0) ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), 0) ); try { if (callSaveAsDialog() == sal_True) @@ -841,7 +841,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } else if ( m_pCollection->isFileSystemBased(eType) ) { - Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::getComponentContext(getORB()))); + Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); INetURLObject aDBPathURL(m_sWorkPath); aDBPathURL.Append(m_aDocURL.getBase()); createUniqueFolderName(&aDBPathURL); @@ -858,7 +858,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const ::rtl::OUString& _sPath) { Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); - Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(comphelper::getComponentContext(getORB())) ); + Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(getORB()) ); Reference< XNameAccess > xNameAccessDatabaseContext(xDatabaseContext, UNO_QUERY_THROW ); INetURLObject aURL( _sPath ); ::rtl::OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -909,7 +909,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() //------------------------------------------------------------------------- void ODbTypeWizDialogSetup::createUniqueFolderName(INetURLObject* pURL) { - Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::getComponentContext(getORB()))); + Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); :: rtl::OUString sLastSegmentName = pURL->getName(); sal_Bool bFolderExists = sal_True; sal_Int32 i = 1; @@ -927,7 +927,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() //------------------------------------------------------------------------- String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { - Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(comphelper::getComponentContext(getORB()))); + Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); :: rtl::OUString sFilename = _rURL.getName(); ::rtl::OUString BaseName = _rURL.getBase(); ::rtl::OUString sExtension = _rURL.getExtension(); @@ -969,7 +969,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() OAsyncronousLink m_aAsyncCaller; public: - AsyncLoader( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rURL ); + AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ); void doLoadAsync(); @@ -984,16 +984,15 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() }; // ............................................................................. - AsyncLoader::AsyncLoader( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rURL ) + AsyncLoader::AsyncLoader( const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rURL ) :m_sURL( _rURL ) ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) ) { try { - m_xDesktop.set( Desktop::create(comphelper::getComponentContext(_rxORB)) ); + m_xDesktop.set( Desktop::create(_rxORB) ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); - m_xInteractionHandler = - InteractionHandler::createWithParent(comphelper::getComponentContext(_rxORB), 0); + m_xInteractionHandler = InteractionHandler::createWithParent(_rxORB, 0); } catch( const Exception& ) { diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index f97333f8d708..ff3e679c97da 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -626,8 +626,8 @@ namespace dbaui { if ( m_aEDDriverClass.GetText().Len() ) { -// TODO chage jvmaccess - ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM(m_pAdminDialog->getORB()); +// TODO change jvmaccess + ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( Reference<XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), UNO_QUERY_THROW) ); bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aEDDriverClass.GetText()); } } diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index f6371552ffbc..fe3600da1358 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -100,8 +100,8 @@ namespace dbaui bool bHideCreateNew = ( nCreateNewDBIndex == -1 ); // also, if our application policies tell us to hide the option, do it - ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithServiceFactory( - ::comphelper::getProcessServiceFactory(), + ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( + ::comphelper::getProcessComponentContext(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/Policies/Features/Base" ) ) ) ); sal_Bool bAllowCreateLocalDatabase( sal_True ); diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index ac8c33155fae..b4831ecffc48 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -50,7 +50,7 @@ namespace dbaui class SAL_NO_VTABLE IDatabaseSettingsDialog { public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const = 0; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 45fe3383dd9b..e54d7e1e8f84 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -59,7 +59,7 @@ namespace dbaui public: OUserAdminDlg( Window* _pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); @@ -71,7 +71,7 @@ namespace dbaui virtual short Execute(); // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index ea0c311fe315..608d18a55674 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -51,7 +51,7 @@ namespace dbaui public: AdvancedSettingsDialog( Window* _pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName); virtual ~AdvancedSettingsDialog(); @@ -65,7 +65,7 @@ namespace dbaui virtual short Execute(); // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 30d8d4e1af45..15c875850c1a 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -67,7 +67,7 @@ public: */ ODbAdminDialog(Window* pParent, SfxItemSet* _pItems, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); virtual ~ODbAdminDialog(); @@ -90,7 +90,7 @@ public: virtual SfxItemSet* getWriteOutputSet(); // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index ad69a65e9f12..af254065ffe4 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -76,7 +76,7 @@ public: */ ODbTypeWizDialog(Window* pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialog(); @@ -85,7 +85,7 @@ public: virtual SfxItemSet* getWriteOutputSet(); // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 3ff274ad2703..69f4ab5b02e5 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -100,7 +100,7 @@ public: */ ODbTypeWizDialogSetup(Window* pParent ,SfxItemSet* _pItems - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ); virtual ~ODbTypeWizDialogSetup(); @@ -109,7 +109,7 @@ public: virtual SfxItemSet* getWriteOutputSet(); // forwards to ODbDataSourceAdministrationHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); virtual ::rtl::OUString getDatasourceType(const SfxItemSet& _rSet) const; diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 69adb66b53e2..722afd354100 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -97,7 +97,7 @@ namespace dbaui static FeatureSets s_aFeatureSets; if ( s_aFeatureSets.empty() ) { - ::connectivity::DriversConfig aDriverConfig( ::comphelper::getProcessServiceFactory() ); + ::connectivity::DriversConfig aDriverConfig( ::comphelper::getProcessComponentContext() ); const uno::Sequence< ::rtl::OUString > aPatterns = aDriverConfig.getURLs(); for ( const ::rtl::OUString* pattern = aPatterns.getConstArray(); pattern != aPatterns.getConstArray() + aPatterns.getLength(); @@ -130,7 +130,7 @@ namespace dbaui static Supported s_aSupport; if ( s_aSupport.empty() ) { - ::connectivity::DriversConfig aDriverConfig(::comphelper::getProcessServiceFactory()); + ::connectivity::DriversConfig aDriverConfig(::comphelper::getProcessComponentContext()); const uno::Sequence< ::rtl::OUString > aURLs = aDriverConfig.getURLs(); const ::rtl::OUString* pIter = aURLs.getConstArray(); const ::rtl::OUString* pEnd = pIter + aURLs.getLength(); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 2022d4ce9427..e5fd25185242 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -18,6 +18,7 @@ */ #include "TEditControl.hxx" +#include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -141,7 +142,7 @@ void OTableEditorCtrl::Init() aColumnName = String( ModuleRes(STR_TAB_FIELD_COLUMN_DATATYPE) ); InsertDataColumn( FIELD_TYPE, aColumnName, FIELDTYPE_WIDTH ); - ::dbaccess::ODsnTypeCollection aDsnTypes(GetView()->getController().getORB()); + ::dbaccess::ODsnTypeCollection aDsnTypes(comphelper::getComponentContext(GetView()->getController().getORB())); sal_Bool bShowColumnDescription = aDsnTypes.supportsColumnDescription(::comphelper::getString(GetView()->getController().getDataSource()->getPropertyValue(PROPERTY_URL))); aColumnName = String( ModuleRes(STR_TAB_HELP_TEXT) ); InsertDataColumn( HELP_TEXT, aColumnName, bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH ); diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 71feb959bc13..14bbf350c855 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -135,7 +135,7 @@ namespace dbaui //------------------------------------------------------------------------------ Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) { - AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); + AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext.getUNOContext(),m_aInitialSelection); return pDlg; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index a6694dd49303..95dd38e4fa0d 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -106,7 +106,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr //------------------------------------------------------------------------------ Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) { - ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); + ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext.getUNOContext(),m_aInitialSelection); return pDlg; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 0490af72366f..5ab3fb7d0dbe 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -120,7 +120,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo( //------------------------------------------------------------------------------ Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) { - return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(), m_aInitialSelection); + return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext.getUNOContext(), m_aInitialSelection); } // ----------------------------------------------------------------------------- void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index ae49afb1789a..6284fe40f9cb 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -107,7 +107,7 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() //------------------------------------------------------------------------------ Dialog* OUserSettingsDialog::createDialog(Window* _pParent) { - OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection,m_xActiveConnection); + OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext.getUNOContext(),m_aInitialSelection,m_xActiveConnection); return pDlg; } diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 89b1a6e49a7b..e054018dc8c3 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -108,7 +108,7 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) { - ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory()); + ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext.getUNOContext()); // the initial selection if ( m_aInitialSelection.hasValue() ) diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 3a53e01c0837..1d9a918db48e 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -26,6 +26,7 @@ #endif #include "dbadmin.hxx" #include <comphelper/extract.hxx> +#include <comphelper/processfactory.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> #include <osl/diagnose.h> @@ -59,7 +60,7 @@ ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XM { DBG_CTOR(ODatabaseAdministrationDialog,NULL); - m_pCollection = new ::dbaccess::ODsnTypeCollection(_rxORB); + m_pCollection = new ::dbaccess::ODsnTypeCollection(comphelper::getComponentContext(_rxORB)); ODbAdminDialog::createItemSet(m_pDatasourceItems, m_pItemPool, m_pItemPoolDefaults, m_pCollection); } diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 0a3f89cb5073..07a662b046a1 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -244,7 +244,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task aConvertedProperties[nPos++].Value <<= m_xReport->getCaption(); // create job factory and initialize - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(xFactory); + const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_xContext); uno::Reference<task::XJob> xJob(m_xContext->getServiceManager()->createInstanceWithContext(sReportEngineServiceName,m_xContext),uno::UNO_QUERY_THROW); if ( !m_xReport->getCommand().isEmpty() ) { diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx index beb02ec2f2fe..51ce1e05c904 100644 --- a/unotools/inc/unotools/confignode.hxx +++ b/unotools/inc/unotools/confignode.hxx @@ -296,6 +296,21 @@ namespace utl static OConfigurationTreeRoot createWithServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); + /** open a new top-level configuration node<p/> + opens a new node which is the root if an own configuration sub tree. This is what "top level" means: The + node does not have a parent. It does not mean that the node represents a module tree (like org.openoffice.Office.Writer + or such).<br/> + In opposite to <method>createWithProvider</method>, createWithProvider expects a service factory. This factory + is used to create a configuration provider, and this provider is used to retrieve the node + @see createWithProvider + @param _rxContext service factory to use to create the configuration provider. + @param _rPath path to the node the object should represent + @param _nDepth depth for node retrieval + @param _eMode specifies which privileges should be applied when retrieving the node + */ + static OConfigurationTreeRoot createWithComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); + /** tolerant version of the <member>createWithServiceFactory</member> <p>No assertions are thrown in case of an failure to initialize the configuration service, but once diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 859e8df0e031..6d118d2d1910 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -592,6 +592,12 @@ namespace utl } //------------------------------------------------------------------------ + OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite ) + { + return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite ); + } + + //------------------------------------------------------------------------ OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext, const ::rtl::OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite ) { |