diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 07:08:44 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 07:08:44 +0000 |
commit | dc0b865ee63fe28eb4a9d083a2744882f93039a5 (patch) | |
tree | d825e6ede559118d09787500422398bc270fe3e9 /embeddedobj | |
parent | 7d5c2fe410f0c46a10016636b19ca50383036690 (diff) |
INTEGRATION: CWS tl07 (1.11.42); FILE MERGED
2005/03/15 09:40:03 tl 1.11.42.4: RESYNC: (1.12-1.13); FILE MERGED
2005/02/14 12:27:29 tl 1.11.42.3: RESYNC: (1.11-1.12); FILE MERGED
2005/01/26 09:47:16 tl 1.11.42.2: #i38930#: implementation for XChild
2005/01/24 12:58:59 mba 1.11.42.1: #i38930#: implementation for XChild
Diffstat (limited to 'embeddedobj')
-rw-r--r-- | embeddedobj/source/inc/commonembobj.hxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index e351fce9688c..d4619fa9dc2d 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -2,9 +2,9 @@ * * $RCSfile: commonembobj.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2005-02-25 09:21:28 $ + * last change: $Author: rt $ $Date: 2005-04-04 08:08:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,9 @@ #include <com/sun/star/uno/Any.hxx> #endif +#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ +#include <com/sun/star/container/XChild.hpp> +#endif #ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ #include <com/sun/star/embed/XEmbeddedObject.hpp> #endif @@ -151,6 +154,7 @@ class OCommonEmbeddedObject : public ::com::sun::star::embed::XEmbeddedObject , public ::com::sun::star::embed::XEmbedPersist , public ::com::sun::star::embed::XLinkageSupport , public ::com::sun::star::embed::XInplaceObject + , public ::com::sun::star::container::XChild , public ::cppu::OWeakObject { protected: @@ -217,6 +221,8 @@ protected: sal_Bool m_bLinkHasPassword; ::rtl::OUString m_aLinkPassword; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; + private: void CommonInit_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObjectProps ); @@ -542,6 +548,10 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& Listener ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XChild + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); }; #endif |