[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/sidebar/MasterPagesSelector.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 98675e5465a3293a964059dc5e6fd70511de4093
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 5 09:49:07 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 5 14:45:37 2021 +0100

    use valueset as the menu parent
    
    Change-Id: I99c4bc5110ce494287342db5c2d4c42b1a79ee38
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111993
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 45f1968f4177..95068a207ec8 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -207,11 +207,11 @@ void MasterPagesSelector::ShowContextMenu(const Point* pPos)
         aPosition = *pPos;
 
     // Setup the menu.
-    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, GetContextMenuUIFile()));
+    weld::Widget* pParent = mxPreviewValueSet->GetDrawingArea();
+    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pParent, GetContextMenuUIFile()));
     std::unique_ptr<weld::Menu> xMenu(xBuilder->weld_menu("menu"));
     ProcessPopupMenu(*xMenu);
     ::tools::Rectangle aRect(aPosition, Size(1,1));
-    weld::Window* pParent = weld::GetPopupParent(*this, aRect);
     // Show the menu.
     ExecuteCommand(xMenu->popup_at_rect(pParent, aRect));
 }