diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-04 13:20:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 10:14:43 +0200 |
| commit | a6a8a8707b6ae111f94bac094d3c2909f523ca6f (patch) | |
| tree | 402b668480b3106df0d3055cff037c8a768a419c /sc/source/filter | |
| parent | f1204419af34b1d2f0ecaa69ceeb1f8c8a7d87df (diff) | |
fdo#46808, convert xmloff module code to use XComponentContext
with lots of repurcussions in other modules
Change-Id: I6982671eecc701b06cf85d93533e1fe618044fea
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 15 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index bd5fd4de8010..d587bf13f5b2 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -121,7 +121,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance( { // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_ALL); - return (cppu::OWeakObject*)new ScXMLImport( rSMgr, IMPORT_ALL ); + return (cppu::OWeakObject*)new ScXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_ALL ); } OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw() @@ -140,7 +140,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance( { // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META); - return (cppu::OWeakObject*)new ScXMLImport( rSMgr, IMPORT_META ); + return (cppu::OWeakObject*)new ScXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_META ); } OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw() @@ -159,7 +159,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance( { // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES|IMPORT_FONTDECLS); - return (cppu::OWeakObject*)new ScXMLImport( rSMgr, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES|IMPORT_FONTDECLS); + return (cppu::OWeakObject*)new ScXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES|IMPORT_FONTDECLS); } OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw() @@ -178,7 +178,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance( { // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_META|IMPORT_STYLES|IMPORT_MASTERSTYLES|IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_SETTINGS|IMPORT_FONTDECLS); - return (cppu::OWeakObject*)new ScXMLImport( rSMgr, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS); + return (cppu::OWeakObject*)new ScXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS); } OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw() @@ -197,7 +197,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( { // #110680# // return (cppu::OWeakObject*)new ScXMLImport(IMPORT_SETTINGS); - return (cppu::OWeakObject*)new ScXMLImport( rSMgr, IMPORT_SETTINGS ); + return (cppu::OWeakObject*)new ScXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_SETTINGS ); } const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() @@ -1922,11 +1922,10 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, return pContext; } -// #110680# ScXMLImport::ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const sal_uInt16 nImportFlag) -: SvXMLImport( xServiceFactory, nImportFlag ), +: SvXMLImport( xContext, nImportFlag ), pDoc( NULL ), pChangeTrackingImportHelper(NULL), pStylesImportHelper(NULL), diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 09a3639a6cf0..2d8201d097e2 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -927,7 +927,7 @@ protected: public: // #110680# ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const sal_uInt16 nImportFlag); ~ScXMLImport() throw(); |