From 03cd6856d383402e66bbfb92bd64d4eb8c5b4c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 6 Jul 2007 09:07:46 +0000 Subject: [PATCH] INTEGRATION: CWS oj14 (1.7.24); FILE MERGED 2006/03/20 08:40:01 oj 1.7.24.1: use mimeconfighelper --- embeddedobj/source/commonembedding/xfactory.hxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 682e460d036c..e81daac6bdc3 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -4,9 +4,9 @@ * * $RCSfile: xfactory.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 18:36:24 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:07:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,8 +59,9 @@ #ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include #endif - -#include +#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ +#include +#endif class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper5< ::com::sun::star::embed::XEmbedObjectCreator, @@ -71,7 +72,7 @@ class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper5< { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - ConfigurationHelper m_aConfigHelper; + ::comphelper::MimeConfigurationHelper m_aConfigHelper; public: OOoEmbeddedObjectFactory( @@ -118,7 +119,7 @@ class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper2< { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - ConfigurationHelper m_aConfigHelper; + ::comphelper::MimeConfigurationHelper m_aConfigHelper; public: OOoSpecialEmbeddedObjectFactory(