diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:35:32 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:35:32 +0000 |
| commit | 5d02391571a692d9ac62037fb728a7ab2e0c2e05 (patch) | |
| tree | 6acdc28be472f0b12ec4fc15b20406a0864c9fbc /xmloff/source/forms/layerimport.cxx | |
| parent | 38aa2f647a2ac2d0fd9190f266de1a629c70da59 (diff) | |
INTEGRATION: CWS binfilter (1.17.50); FILE MERGED
2004/02/05 15:02:53 aw 1.17.50.4: RESYNC: (1.18-1.19); FILE MERGED
2003/10/30 12:15:13 aw 1.17.50.3: RESYNC: (1.17-1.18); FILE MERGED
2003/07/08 17:32:55 aw 1.17.50.2: #110680#
2003/07/07 15:46:18 aw 1.17.50.1: #110680#
Changed all components to use the ServiceManager they were created with.
Diffstat (limited to 'xmloff/source/forms/layerimport.cxx')
| -rw-r--r-- | xmloff/source/forms/layerimport.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 0cfa82ee60..3cbb24bf25 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layerimport.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2003-12-11 12:09:57 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:35:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,9 +134,12 @@ #ifndef _SV_WINTYPES_HXX #include <vcl/wintypes.hxx> // for check states #endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ -#include <comphelper/processfactory.hxx> -#endif + +// #110680# +//#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +//#include <comphelper/processfactory.hxx> +//#endif + #ifndef _COM_SUN_STAR_FORM_XFORMSSUPPLIER_HPP_ #include <com/sun/star/form/XFormsSupplier.hpp> #endif @@ -439,7 +442,9 @@ namespace xmloff //--------------------------------------------------------------------- Reference< XMultiServiceFactory > OFormLayerXMLImport_Impl::getServiceFactory() { - return ::comphelper::getProcessServiceFactory(); + // #110680# + // return ::comphelper::getProcessServiceFactory(); + return m_rImporter.getServiceFactory(); } //--------------------------------------------------------------------- |