diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-21 16:22:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-22 15:20:03 +0200 |
commit | 7298a2b0c721004b09a0fd3c7e287d655f42286b (patch) | |
tree | f897e317791f3946845e8cea6145ac2683de5993 /connectivity/source/drivers/calc | |
parent | 8c249489120c9ef0a25436d16c38cbe3756adff1 (diff) |
fdo#46808, Convert XMultiServiceFactory to XComponentContext
Change-Id: I3a74d4edaa3ff3c2498c3db2720b0e4e5305c2e4
Diffstat (limited to 'connectivity/source/drivers/calc')
-rw-r--r-- | connectivity/source/drivers/calc/CConnection.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/calc/CDriver.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index bae573fcaf28..04e6cd3555cc 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -128,7 +128,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() aArgs[nPos].Value <<= m_sPassword; } - Reference< XDesktop2 > xDesktop = Desktop::create( comphelper::getComponentContext(getDriver()->getFactory()) ); + Reference< XDesktop2 > xDesktop = Desktop::create( getDriver()->getComponentContext() ); Reference< XComponent > xComponent; Any aLoaderException; try diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index c66fbe82e9fa..40dcf3af9061 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -23,6 +23,7 @@ #include "connectivity/dbexception.hxx" #include "resource/sharedresources.hxx" #include "resource/calc_res.hrc" +#include "comphelper/processfactory.hxx" using namespace connectivity::calc; using namespace connectivity::file; @@ -54,7 +55,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) connectivity::calc::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { - return *(new ODriver(_rxFactory)); + return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, |