summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-04-11 14:56:54 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-04-11 14:56:54 +0100
commite9696b975afeae970575cbd6bc782fbba484b2f3 (patch)
tree685d2d2413e72052a644c150f4bc9defce0f0503 /toolkit
parentfbdef593def24941db2a6123501277fe20b8b1d2 (diff)
Fix more misc. lifecycle mistakes.
Change-Id: Iadf0767d41830296a441299bf10aaa1e7629a824
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxwindow.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 0cfeff1fd4af..ba8e5b3feb11 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -924,8 +924,9 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException, std:
{
VclPtr<OutputDevice> pOutDev = GetOutputDevice();
SetWindow( NULL ); // so that handlers are logged off, if necessary (virtual)
- SetOutputDevice( NULL );
+ SetOutputDevice( pOutDev );
pOutDev.disposeAndClear();
+ SetOutputDevice( NULL );
}
// #i14103# dispose the accessible context after the window has been destroyed,