From 77d020e45b4faaaaf751c4da611562bc348de864 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 6 Jul 2007 09:10:28 +0000 Subject: INTEGRATION: CWS oj14 (1.29.12); FILE MERGED 2007/04/18 15:16:45 oj 1.29.12.7: RESYNC: (1.39-1.40); FILE MERGED 2007/03/14 15:48:05 mav 1.29.12.6: #i75401# no need to use implementation service names any more 2007/02/20 16:21:43 oj 1.29.12.5: RESYNC: (1.38-1.39); FILE MERGED 2006/11/07 08:41:51 oj 1.29.12.4: RESYNC: (1.34-1.38); FILE MERGED 2006/07/04 07:24:48 oj 1.29.12.3: RESYNC: (1.32-1.34); FILE MERGED 2006/03/20 13:47:07 oj 1.29.12.2: RESYNC: (1.29-1.32); FILE MERGED 2006/03/20 08:42:51 oj 1.29.12.1: use mimeconfighelper --- embeddedobj/source/msole/olecomponent.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'embeddedobj') diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index a5ef0465804d..05182e03eef8 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olecomponent.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:43:41 $ + * last change: $Author: rt $ $Date: 2007-07-06 10:10:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,6 +67,9 @@ #include #include +#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ +#include +#endif #include #include #include @@ -76,10 +79,9 @@ #include #include #include -#include using namespace ::com::sun::star; - +using namespace ::comphelper; #define MAX_ENUM_ELE 20 #define FORMATS_NUM 3 @@ -1199,7 +1201,7 @@ uno::Sequence< sal_Int8 > OleComponent::GetCLSID() if ( FAILED( hr ) ) throw io::IOException(); // TODO: - return GetSequenceClassID( aCLSID.Data1, aCLSID.Data2, aCLSID.Data3, + return MimeConfigurationHelper::GetSequenceClassID( aCLSID.Data1, aCLSID.Data2, aCLSID.Data3, aCLSID.Data4[0], aCLSID.Data4[1], aCLSID.Data4[2], aCLSID.Data4[3], aCLSID.Data4[4], aCLSID.Data4[5], @@ -1629,7 +1631,7 @@ sal_Int64 SAL_CALL OleComponent::getSomething( const ::com::sun::star::uno::Sequ try { uno::Sequence < sal_Int8 > aCLSID = GetCLSID(); - if ( ClassIDsEqual( aIdentifier, aCLSID ) ) + if ( MimeConfigurationHelper::ClassIDsEqual( aIdentifier, aCLSID ) ) return (sal_Int64) (IUnknown*) m_pNativeImpl->m_pObj; // compatibility hack for old versions: CLSID was used in wrong order (SvGlobalName order) -- cgit