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

[Caolán McNamara (via logerrit)]

 reportdesign/source/ui/report/ReportSection.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit acb442a5ffce156e6af4781643df76d4bebe5df5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 23 10:28:23 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Feb 23 14:53:48 2021 +0100

    construct XPopupMenu without directly creating a VCLXPopupMenu
    
    Change-Id: If890828855a61cb315939424499949300549a968
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111382
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 45b04485c51e..2e1f294b24d8 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -42,8 +42,8 @@
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <comphelper/propertyvalue.hxx>
-#include <toolkit/awt/vclxmenu.hxx>
 #include <toolkit/helper/convert.hxx>
+#include <tools/diagnose_ex.h>
 #include <RptDef.hxx>
 #include <SectionWindow.hxx>
 #include <helpids.h>
@@ -432,7 +432,13 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
     if (!xMenuController.is())
         return;
 
-    rtl::Reference<VCLXPopupMenu> xPopupMenu(new VCLXPopupMenu);
+    css::uno::Reference<css::awt::XPopupMenu> xPopupMenu(
+        xContext->getServiceManager()->createInstanceWithContext(
+        "com.sun.star.awt.PopupMenu", xContext), css::uno::UNO_QUERY);
+
+    if (!xPopupMenu.is())
+        return;
+
     xMenuController->setPopupMenu(xPopupMenu);
 
     Point aPos = _rCEvt.GetMousePosPixel();