summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 16:53:27 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 16:53:27 +0000
commitb94a5b677a72dc4e9c8e27709f61506c8292aeda (patch)
treefea12ec5d4ecd8c7c8b0214dcee52f0f45ac714c
parentd639c647f254f68a2f08e2eb5c6ce2eb4ed685f7 (diff)
INTEGRATION: CWS fwkbugfix02 (1.17.10); FILE MERGED
2004/04/30 08:00:57 mav 1.17.10.1: #116056# interfaces review
-rw-r--r--embeddedobj/source/msole/olecomponent.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index a14a23b65921..484e840c2b80 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: olecomponent.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: mav $ $Date: 2003-12-15 15:59:21 $
+ * last change: $Author: hr $ $Date: 2004-05-10 17:53:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -581,7 +581,7 @@ void OleComponent::Dispose()
if ( m_pInterfaceContainer )
{
- lang::EventObject aEvent( ( embed::XEmbeddedObject* )this );
+ lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ) );
m_pInterfaceContainer->disposeAndClear( aEvent );
delete m_pInterfaceContainer;
@@ -1035,7 +1035,7 @@ void OleComponent::CloseObject()
}
//----------------------------------------------
-uno::Sequence< embed::VerbDescr > OleComponent::GetVerbList()
+uno::Sequence< embed::VerbDescriptor > OleComponent::GetVerbList()
{
if ( !m_pNativeImpl->m_pOleObject )
throw embed::WrongStateException(); // TODO: the object is in wrong state