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

[Caolán McNamara]

 vcl/source/window/menufloatingwindow.cxx |    6 +++---
 vcl/source/window/menufloatingwindow.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 95a6d24ed7a231c42ccd608fb93cbed989a62e3a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 27 15:14:46 2016 +0100

    the only place the default xFocusId arg isn't used...
    
    the argument is (effectively) equal to the default
    
    Change-Id: I26fcd43d2bc8e37e6887c244f728e3231328e34e

diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 66bb23d..715398d 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -403,8 +403,9 @@ void MenuFloatingWindow::Execute()
     pSVData->maAppData.mpActivePopupMenu = nullptr;
 }
 
-void MenuFloatingWindow::StopExecute( VclPtr<vcl::Window> xFocusId )
+void MenuFloatingWindow::StopExecute()
 {
+    VclPtr<vcl::Window> xFocusId;
     // restore focus
     // (could have been restored in Select)
     if ( xSaveFocusId != nullptr )
@@ -461,7 +462,6 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly )
 void MenuFloatingWindow::EndExecute()
 {
     Menu* pStart = pMenu ? pMenu->ImplGetStartMenu() : nullptr;
-    VclPtr<vcl::Window> xFocusId;
 
     // if started elsewhere, cleanup there as well
     MenuFloatingWindow* pCleanUpFrom = this;
@@ -478,7 +478,7 @@ void MenuFloatingWindow::EndExecute()
     Menu* pM = pMenu;
     sal_uInt16 nItem = nHighlightedItem;
 
-    pCleanUpFrom->StopExecute( xFocusId );
+    pCleanUpFrom->StopExecute();
 
     if ( nItem != ITEMPOS_INVALID && pM )
     {
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index 8ffd7be..9b508bb 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -108,7 +108,7 @@ public:
     sal_uInt16 GetScrollerHeight() const   { return nScrollerHeight; }
 
     void Execute();
-    void StopExecute( VclPtr<vcl::Window> xFocusId = nullptr );
+    void StopExecute();
     void EndExecute();
     void EndExecute( sal_uInt16 nSelectId );