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

[Stephan Bergmann]

 vcl/source/window/dialog.cxx        |    2 +-
 vcl/source/window/menubarwindow.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd383c3f74a31366b139044ad21b48cc671e2213
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Jan 22 20:53:47 2016 +0100

    Dialog's ImplAsyncCloseHdl is IMPL_LINK_NOARG_TYPED
    
    ...so no need to pass it an actual argument
    
    Change-Id: Idd349aec9a93bf9097f4a2f868d5e4cc9eb0aaed

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1849b72..d06ca87 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -649,7 +649,7 @@ bool Dialog::Notify( NotifyEvent& rNEvt )
                 // like e.g. SfxModelessDialog which destroy themselves inside 
Close()
                 // post this Close asynchronous so we can leave our key 
handler before
                 // we get destroyed
-                PostUserEvent( LINK( this, Dialog, ImplAsyncCloseHdl ), this, 
true);
+                PostUserEvent( LINK( this, Dialog, ImplAsyncCloseHdl ), 
nullptr, true);
                 return true;
             }
         }
commit 8ccd76c6ea8fa50f88c76c6c250cee76290a1f90
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Fri Jan 22 20:49:44 2016 +0100

    MenuBar's CloseButtonClickHdl doesn't need an argument
    
    ...the only actual use of it, LayoutManager's MenuBarClose in
    framework/source/layoutmanager/layoutmanager.cxx is IMPL_LINK_NOARG_TYPED.
    
    Change-Id: Idf12fe5735cd452954a9d2ddbce305fa96b832a0

diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index aa9c355..8954513 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -233,7 +233,7 @@ IMPL_LINK_NOARG_TYPED(MenuBarWindow, CloseHdl, ToolBox *, 
void)
         // #i106052# call close hdl asynchronously to ease handler 
implementation
         // this avoids still being in the handler while the DecoToolBox already
         // gets destroyed
-        
Application::PostUserEvent(static_cast<MenuBar*>(pMenu)->GetCloseButtonClickHdl(),
 pMenu);
+        
Application::PostUserEvent(static_cast<MenuBar*>(pMenu)->GetCloseButtonClickHdl());
     }
     else
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits