core.git: Branch 'libreoffice-24-2' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a7c155dcf7c1897ebc2f87f1227d0ebd4fc64313
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 27 20:25:35 2024 +0100
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sun Jul 28 23:12:34 2024 +0200

    Resolves: tdf#160509 use BorderWindow client for dialog parent
    
    the BorderWindow has no ultimate SystemWindow parent so dialogs
    using this as a parent end up automatically picking a parent
    of whatever happens to be in the foreground and not the intended
    associated frame
    
    Change-Id: I713e3c40b0cad934b978ba0b1b46a3c6064be24f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171104
    Reviewed-by: Patrick Luby <guibomac...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 85511e27d259d6b19cc6c463fc06368c14511bb8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171117
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 8dc0edf814fd..8b818be83da7 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -7569,6 +7569,8 @@ weld::Window* SalFrame::GetFrameWeld() const
         if (pWindow)
         {
             assert(pWindow == pWindow->GetFrameWindow());
+            // resolve from a possible BorderWindow to the ClientWindow 
(returns itself if not)
+            pWindow = pWindow->ImplGetWindow();
             m_xFrameWeld.reset(new SalInstanceWindow(pWindow, nullptr, false));
         }
     }