summaryrefslogtreecommitdiff
path: root/toolkit/source/awt
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2003-09-04 06:43:25 +0000
committerOliver Bolte <obo@openoffice.org>2003-09-04 06:43:25 +0000
commitfa7659104f9bcf1168214c9de6e9b6021155fe1e (patch)
tree724c2e25ec5550526705b08ed74462d46c2fa6a7 /toolkit/source/awt
parent8118fe50ace725a4ada1dc57daff341233e3b2f1 (diff)
INTEGRATION: CWS mt801 (1.32.66); FILE MERGED
2003/08/29 13:02:43 mt 1.32.66.1: #110840# createWindow: show only after component is registered to the window
Diffstat (limited to 'toolkit/source/awt')
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 3130a346bb4c..cf79962ec08f 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: vclxtoolkit.cxx,v $
*
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
- * last change: $Author: vg $ $Date: 2003-04-24 15:09:51 $
+ * last change: $Author: obo $ $Date: 2003-09-04 07:43:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -631,9 +631,6 @@ void SAL_CALL VCLXToolkit::disposing()
pNewWindow->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() );
}
- if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::SHOW )
- pNewWindow->Show();
-
if ( !pNewComp )
{
// Default-Interface
@@ -645,6 +642,9 @@ void SAL_CALL VCLXToolkit::disposing()
pNewWindow->SetComponentInterface( pNewComp );
xRef = pNewComp;
}
+
+ if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::SHOW )
+ pNewWindow->Show();
}
return xRef;