From 3b0361d3c4e058e4d6f1db56799f86e1f4e9686c Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 24 Mar 2006 12:07:57 +0000 Subject: [PATCH] INTEGRATION: CWS fwk33 (1.32.4); FILE MERGED 2006/02/27 12:36:44 mav 1.32.4.1: #i59148# let helper methods be implemented in one library --- embeddedobj/source/msole/olecomponent.cxx | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 536a14cf6d7f..831bbf825745 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: olecomponent.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: rt $ $Date: 2006-02-03 09:03:24 $ + * last change: $Author: obo $ $Date: 2006-03-24 13:07:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,11 +67,12 @@ #include #include -#include "olecomponent.hxx" -#include "olewrapclient.hxx" -#include "advisesink.hxx" -#include "oleembobj.hxx" -#include "mtnotification.hxx" +#include +#include +#include +#include +#include +#include using namespace ::com::sun::star; @@ -182,11 +183,6 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor ) return aResult; } -//---------------------------------------------- -uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, - sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, - sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ); - //---------------------------------------------- HRESULT OpenIStorageFromURL_Impl( const ::rtl::OUString& aURL, IStorage** ppIStorage ) { @@ -1625,8 +1621,6 @@ void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEv xListener ); } -sal_Bool ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 ); - sal_Int64 SAL_CALL OleComponent::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) { try