diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 19:18:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 19:18:18 +0000 |
| commit | ab707f42b5d816848e7108a24f9e31c85c2c7f68 (patch) | |
| tree | 40ad3dea9a29caaa16344430d543a0bcfee68339 /sfx2 | |
| parent | e1c3c04822ded662a485e827c6f587de59b2bac3 (diff) | |
INTEGRATION: CWS chart2mst3 (1.23.24); FILE MERGED
2007/05/14 20:58:39 bm 1.23.24.4: RESYNC: (1.25-1.26); FILE MERGED
2007/04/25 05:14:31 bm 1.23.24.3: RESYNC: (1.24-1.25); FILE MERGED
2007/02/07 18:02:51 iha 1.23.24.2: RESYNC: (1.23-1.24); FILE MERGED
2006/11/29 16:11:42 mba 1.23.24.1: #i64497#: parent is now set before objects are loaded
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 2c13f2aad625..f344ba556462 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ipclient.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2007-05-09 13:22:32 $ + * last change: $Author: vg $ $Date: 2007-05-22 20:18:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -426,10 +426,6 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); - uno::Reference < container::XChild > xChild( m_xObject->getComponent(), uno::UNO_QUERY ); - if ( xChild.is() && !xChild->getParent().is() ) - xChild->setParent( m_pClient->GetViewShell()->GetObjectShell()->GetModel() ); - m_pClient->GetViewShell()->InplaceActivating( m_pClient ); } @@ -455,9 +451,6 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() throw uno::RuntimeException(); m_pClient->GetViewShell()->InplaceDeactivated( m_pClient ); - uno::Reference < container::XChild > xChild( m_xObject->getComponent(), uno::UNO_QUERY ); - if ( xChild.is() && xChild->getParent().is() ) - xChild->setParent( uno::Reference < uno::XInterface >() ); } //-------------------------------------------------------------------- |