vcl/source/window/menu.cxx | 2 --
vcl/source/window/menubarwindow.cxx | 1 -
vcl/source/window/menufloatingwindow.cxx | 1 -
vcl/source/window/window2.cxx | 1 -
4 files changed, 5 deletions(-)
New commits:
commit 57dfefa71070d2168df7115856f468dfc0ccaccc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jul 8 14:44:30 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jul 9 13:47:42 2021 +0200
drop some calls to SetParentToDefaultWindow
when the next thing called is disposeAndClear now that
all SetParentToDefaultWindow does it hide the Window
Change-Id: Ied3200eb3656594d446d65dadcb1cf27e6a7bd15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118646
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 5cc01ef41df1..6225f25a6d16 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3021,7 +3021,6 @@ sal_uInt16 PopupMenu::ImplExecute( const
VclPtr<vcl::Window>& pW, const tools::R
{
pWin->StopExecute();
pWin->doShutdown();
- pWindow->SetParentToDefaultWindow();
pWindow.disposeAndClear();
ImplClosePopupToolBox(pW);
ImplFlushPendingSelect();
@@ -3082,7 +3081,6 @@ sal_uInt16 PopupMenu::ImplExecute( const
VclPtr<vcl::Window>& pW, const tools::R
}
}
pWin->doShutdown();
- pWindow->SetParentToDefaultWindow();
pWindow.disposeAndClear();
ImplClosePopupToolBox(pW);
ImplFlushPendingSelect();
diff --git a/vcl/source/window/menubarwindow.cxx
b/vcl/source/window/menubarwindow.cxx
index 1f945e0a95c3..09dd1d569edf 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -373,7 +373,6 @@ void MenuBarWindow::KillActivePopup()
}
m_pActivePopup->ImplGetFloatingWindow()->StopExecute();
m_pActivePopup->ImplGetFloatingWindow()->doShutdown();
- m_pActivePopup->pWindow->SetParentToDefaultWindow();
m_pActivePopup->pWindow.disposeAndClear();
}
m_pActivePopup = nullptr;
diff --git a/vcl/source/window/menufloatingwindow.cxx
b/vcl/source/window/menufloatingwindow.cxx
index 7597e170fe5f..1737e80da843 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -499,7 +499,6 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu*
pThisOnly )
{
pPopup->ImplGetFloatingWindow()->StopExecute();
pPopup->ImplGetFloatingWindow()->doShutdown();
- pPopup->pWindow->SetParentToDefaultWindow();
pPopup->pWindow.disposeAndClear();
PaintImmediately();
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index db6f493cc342..555bbef324e3 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -338,7 +338,6 @@ void Window::EndAutoScroll()
pSVData->mpWinData->mpAutoScrollWin = nullptr;
pSVData->mpWinData->mnAutoScrollFlags = StartAutoScrollFlags::NONE;
pSVData->maAppData.mpWheelWindow->ImplStop();
- pSVData->maAppData.mpWheelWindow->SetParentToDefaultWindow();
pSVData->maAppData.mpWheelWindow.disposeAndClear();
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
