diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 07:07:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 07:07:56 +0000 |
| commit | bc41348ee0ce76fefadd6543dddaeeac5ae9b3bd (patch) | |
| tree | 282119d9e2774838a2ef7690d06c9aa38023cf38 /embeddedobj | |
| parent | 98224ed7a55bdf94b0f3636f102e0edd8a9f21dc (diff) | |
INTEGRATION: CWS tl07 (1.8.12); FILE MERGED
2005/03/15 09:39:39 tl 1.8.12.4: RESYNC: (1.9-1.11); FILE MERGED
2005/01/26 09:46:59 tl 1.8.12.3: #i38930#: implementation for XChild
2005/01/24 14:35:45 tl 1.8.12.2: RESYNC: (1.8-1.9); FILE MERGED
2005/01/24 12:58:57 mba 1.8.12.1: #i38930#: implementation for XChild
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/commonembedding/embedobj.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index aa17cf1edffa..dd8aa893a6d7 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: embedobj.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: vg $ $Date: 2005-03-23 14:19:45 $ + * last change: $Author: rt $ $Date: 2005-04-04 08:07:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -720,4 +720,19 @@ void SAL_CALL OCommonEmbeddedObject::setContainerName( const ::rtl::OUString& sN m_aContainerName = sName; } +com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL OCommonEmbeddedObject::getParent() throw (::com::sun::star::uno::RuntimeException) +{ + return m_xParent; +} + +void SAL_CALL OCommonEmbeddedObject::setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xParent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) +{ + m_xParent = xParent; + if ( m_nObjectState != -1 && m_nObjectState != embed::EmbedStates::LOADED ) + { + uno::Reference < container::XChild > xChild( m_pDocHolder->GetComponent(), uno::UNO_QUERY ); + if ( xChild.is() ) + xChild->setParent( xParent ); + } +} |