From e9696b975afeae970575cbd6bc782fbba484b2f3 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Sat, 11 Apr 2015 14:56:54 +0100
Subject: Fix more misc. lifecycle mistakes.

Change-Id: Iadf0767d41830296a441299bf10aaa1e7629a824
---
 toolkit/source/awt/vclxwindow.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'toolkit')

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,
-- 
cgit