diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-06-20 09:26:10 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-06-20 09:26:10 +0000 |
| commit | 6437abf23c27cec7f7af77d6eff5bbdb07d1cba4 (patch) | |
| tree | 560e723c886141012ba900e411db7bbde716ff83 | |
| parent | eba3f155051eb8c9fb723171a36b78fce5c7d93a (diff) | |
INTEGRATION: CWS jl61 (1.18.68); FILE MERGED
2007/06/13 08:24:10 ab 1.18.68.1: #i76438# Tabpage support for UnoControlContainer
| -rw-r--r-- | toolkit/source/controls/unocontrolcontainer.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 140f38cb956a..f5ce1eb04293 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unocontrolcontainer.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2006-12-04 16:07:34 $ + * last change: $Author: kz $ $Date: 2007-06-20 10:26:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,6 +59,8 @@ #include <tools/debug.hxx> #include <tools/list.hxx> +#include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <limits> #include <map> @@ -66,6 +68,8 @@ using namespace ::com::sun::star; +extern WorkWindow* lcl_GetDefaultWindow(); + // ---------------------------------------------------- // class UnoControlHolder // ---------------------------------------------------- @@ -653,6 +657,7 @@ void UnoControlContainer::impl_createControlPeerIfNecessary( const uno::Referenc // if the container already has a peer, then also create a peer for the control uno::Reference< awt::XWindowPeer > xMyPeer( getPeer() ); + if( xMyPeer.is() ) { _rxControl->createPeer( NULL, xMyPeer ); |