[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - vcl/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 8d1ab6f3c3f752bc027df7ca39fd080f83f71c55
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Mar 27 16:20:43 2021 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Jul 29 15:14:29 2021 +0200

    tdf#141141 sync SalFrame::GetFrameWeld and weld::GetPopupParent
    
    so they both use the same FrameWindow
    
    (cherry picked from commit 618cb39b558b7e3f9a6f2aa8cf0a935602118388)
    
    Conflicts:
            vcl/source/app/weldutils.cxx
    
    Change-Id: I7c58a4f2c8e82abc45eaf1dfee8eb2720503ecc7

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index ccfe3ac7d542..cc1f3e85aa66 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6703,10 +6703,11 @@ weld::Window* SalFrame::GetFrameWeld() const
     if (!m_xFrameWeld)
     {
         vcl::Window* pWindow = GetWindow();
-        pWindow = pWindow ? pWindow->ImplGetWindow() : nullptr;
-        assert(!pWindow || (pWindow->IsSystemWindow() || pWindow->IsDockingWindow()));
         if (pWindow)
+        {
+            assert(pWindow == pWindow->GetFrameWindow());
             m_xFrameWeld.reset(new SalInstanceWindow(pWindow, nullptr, false));
+        }
     }
     return m_xFrameWeld.get();
 }