diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excimp8.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 3dbc3cf5aede..3ea56ebae788 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -113,7 +113,7 @@ #include <oox/ole/vbaproject.hxx> #include <oox/ole/olestorage.hxx> #include <unotools/streamwrap.hxx> -#include <comphelper/componentcontext.hxx> +#include <comphelper/processfactory.hxx> using namespace com::sun::star; using namespace ::comphelper; @@ -356,14 +356,14 @@ void ImportExcel8::ReadBasic( void ) } try { - ::comphelper::ComponentContext aCtx( ::comphelper::getProcessServiceFactory() ); + uno::Reference< uno::XComponentContext > aCtx( ::comphelper::getProcessComponentContext() ); SfxMedium& rMedium = GetMedium(); uno::Reference< io::XInputStream > xIn = rMedium.GetInputStream(); - oox::ole::OleStorage root( aCtx.getUNOContext(), xIn, false ); + oox::ole::OleStorage root( aCtx, xIn, false ); oox::StorageRef vbaStg = root.openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false ); if ( vbaStg.get() ) { - oox::ole::VbaProject aVbaPrj( aCtx.getUNOContext(), pShell->GetModel(), CREATE_OUSTRING( "Calc") ); + oox::ole::VbaProject aVbaPrj( aCtx, pShell->GetModel(), CREATE_OUSTRING( "Calc") ); // collect names of embedded form controls, as specified in the VBA project uno::Reference< container::XNameContainer > xOleNameOverrideSink( new OleNameOverrideContainer ); aVbaPrj.setOleOverridesSink( xOleNameOverrideSink ); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 900d2e6f86d2..37077e36b5ab 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -113,8 +113,6 @@ #include "namebuff.hxx" #include <boost/shared_ptr.hpp> -#include <comphelper/componentcontext.hxx> -#include <comphelper/processfactory.hxx> #include <comphelper/mediadescriptor.hxx> #include <sfx2/docfile.hxx> @@ -3160,14 +3158,6 @@ bool XclImpSimpleDffConverter::GetColorFromPalette( sal_uInt16 nIndex, Color& rC return 1; } -// ---------------------------------------------------------------------------- -Reference< XComponentContext > -lcl_getUnoCtx() -{ - comphelper::ComponentContext aCtx( ::comphelper::getProcessServiceFactory() ); - return aCtx.getUNOContext(); -} - XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( XclImpDrawing& rDrawing, SdrModel& rSdrModel, SdrPage& rSdrPage ) : mrDrawing( rDrawing ), |