mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS oj14 (1.7.24); FILE MERGED

Browse Source 
2006/03/20 08:40:01 oj 1.7.24.1: use mimeconfighelper
This commit is contained in:
Rüdiger Timm
2007-07-06 09:07:46 +00:00
parent 3b132bdce7
commit 03cd6856d3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
embeddedobj/source/commonembedding/xfactory.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: xfactory.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -59,8 +59,9 @@
#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #ifndef _CPPUHELPER_IMPLBASE5_HXX_
#include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase5.hxx>
#endif #endif
#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_
#include <confighelper.hxx> #include <comphelper/mimeconfighelper.hxx>
#endif
class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper5< class OOoEmbeddedObjectFactory : public ::cppu::WeakImplHelper5<
::com::sun::star::embed::XEmbedObjectCreator, ::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; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
ConfigurationHelper m_aConfigHelper; ::comphelper::MimeConfigurationHelper m_aConfigHelper;
public: public:
OOoEmbeddedObjectFactory( OOoEmbeddedObjectFactory(
@@ -118,7 +119,7 @@ class OOoSpecialEmbeddedObjectFactory : public ::cppu::WeakImplHelper2<
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
ConfigurationHelper m_aConfigHelper; ::comphelper::MimeConfigurationHelper m_aConfigHelper;
public: public:
OOoSpecialEmbeddedObjectFactory( OOoSpecialEmbeddedObjectFactory(