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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 9 13:58:30 UTC 2021


 include/vcl/window.hxx       |    8 --------
 vcl/source/window/window.cxx |    6 ------
 2 files changed, 14 deletions(-)

New commits:
commit 2dbdaa2840f9e1b176464c132465ea5bb32208f0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 8 15:40:31 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 9 15:57:55 2021 +0200

    drop newly unused SetParentToDefaultWindow
    
    Change-Id: I7586924bfc44dd7d28992515291089469a723c39
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118651
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a0bc04cd4523..4fb9e4ab15e0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1450,14 +1450,6 @@ public:
     // a helper method for a Control's Draw method
     void PaintToDevice( ::OutputDevice* pDevice, const Point& rPos );
 
-    /* tdf#119390 set parent to default window. Typically for use in advance of destroying
-     * a floating windows which has the current focus so focus will revert to the main
-     * document window and not the first widget in the current parent of the floating
-     * window.
-    */
-    SAL_DLLPRIVATE void SetParentToDefaultWindow();
-
-
     //  Keyboard access functions
 
     /** Query the states of keyboard indicators - Caps Lock, Num Lock and
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 61bcc8ce57a0..41751c015a43 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1782,12 +1782,6 @@ void Window::SetModalHierarchyHdl(const Link<bool, void>& rLink)
     ImplGetFrame()->SetModalHierarchyHdl(rLink);
 }
 
-void Window::SetParentToDefaultWindow()
-{
-    Show(false);
-    // don't reparent: this window dies anyway and any children must have been disposed already
-}
-
 KeyIndicatorState Window::GetIndicatorState() const
 {
     return mpWindowImpl->mpFrame->GetIndicatorState();


More information about the Libreoffice-commits mailing list