summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/menufloatingwindow.cxx6
-rw-r--r--vcl/source/window/menufloatingwindow.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 66bb23d447ea..715398d01a41 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 8ffd7be32182..9b508bbfab27 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 );