From 8f47ea7a06ec4f47f3f87ea586bba3b55039ba72 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 3 May 2004 12:36:01 +0000 Subject: INTEGRATION: CWS binfilter (1.6.144); FILE MERGED 2003/08/19 15:46:29 aw 1.6.144.2: #110680# Give ServiceManager as const reference and do not keep it as reference locally as member 2003/07/07 15:46:20 aw 1.6.144.1: #110680# Changed all components to use the ServiceManager they were created with. --- xmloff/source/meta/MetaImportComponent.cxx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index c905aa74aa19..10cdf414e139 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MetaImportComponent.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hjs $ $Date: 2001-09-12 10:31:04 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:36:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,8 +136,10 @@ void SvXMLMetaDocumentContext::EndElement() //=========================================================================== -XMLMetaImportComponent::XMLMetaImportComponent() throw() : - SvXMLImport() +// #110680# +XMLMetaImportComponent::XMLMetaImportComponent( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory) throw() +: SvXMLImport(xServiceFactory) { } @@ -189,7 +191,9 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - return (cppu::OWeakObject*)new XMLMetaImportComponent; + // #110680# + // return (cppu::OWeakObject*)new XMLMetaImportComponent; + return (cppu::OWeakObject*)new XMLMetaImportComponent(rSMgr); } -- cgit