[Libreoffice-commits] core.git: vcl/source

Stephan Bergmann sbergman at redhat.com
Thu Sep 29 18:15:49 UTC 2016


 vcl/source/window/dialog.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ebf5a786cadfc562ed9ec05ca9fd751068868d89
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 29 20:13:16 2016 +0200

    loplugin:vclwidgets
    
    "VclReferenceBase subclass dispose() function MUST call dispose() of its
    superclass as the last thing it does"
    
    Change-Id: Iab326014d3de805f68729f6d2912f7e960368f11

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 07ceaaa..30ba461 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -580,7 +580,6 @@ void Dialog::dispose()
     mpPrevExecuteDlg.clear();
     mpActionArea.clear();
     mpContentArea.clear();
-    SystemWindow::dispose();
 
     css::uno::Reference< css::uno::XComponentContext > xContext(
             comphelper::getProcessComponentContext() );
@@ -588,6 +587,8 @@ void Dialog::dispose()
     css::document::DocumentEvent aObject;
     aObject.EventName = "DialogClosed";
     xEventBroadcaster->documentEventOccured(aObject);
+
+    SystemWindow::dispose();
 }
 
 IMPL_LINK_NOARG_TYPED(Dialog, ImplAsyncCloseHdl, void*, void)


More information about the Libreoffice-commits mailing list