diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:35:45 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:35:45 +0000 |
| commit | 73e45e11b16344cff5e023f3338c6119941f3fee (patch) | |
| tree | 0af1559d87fd63b53693b54e1efe2afae1246b38 /xmloff | |
| parent | e8c19198f4c1444643794d66b4eace827cafaa83 (diff) | |
INTEGRATION: CWS binfilter (1.9.50); FILE MERGED
2003/08/19 15:46:29 aw 1.9.50.3: #110680#
Give ServiceManager as const reference and do not keep it as reference locally as member
2003/07/08 17:33:20 aw 1.9.50.2: #110680#
2003/07/07 15:46:19 aw 1.9.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/meta/MetaExportComponent.cxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 1edb8a883a21..28e1936be1b9 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MetaExportComponent.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2003-03-27 18:20:31 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:35:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,10 @@ #include <com/sun/star/uno/Exception.hpp> #endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ -#include <comphelper/processfactory.hxx> -#endif +// #110680# +//#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +//#include <comphelper/processfactory.hxx> +//#endif #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> @@ -119,8 +120,10 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -XMLMetaExportComponent::XMLMetaExportComponent() : - SvXMLExport( MAP_INCH, XML_META ) +// #110680# +XMLMetaExportComponent::XMLMetaExportComponent( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory) +: SvXMLExport( xServiceFactory, MAP_INCH, XML_META ) { } @@ -180,6 +183,8 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - return (cppu::OWeakObject*)new XMLMetaExportComponent; + // #110680# + // return (cppu::OWeakObject*)new XMLMetaExportComponent; + return (cppu::OWeakObject*)new XMLMetaExportComponent(rSMgr); } |