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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Dec 4 16:21:08 UTC 2020


 dbaccess/source/ui/app/AppDetailPageHelper.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 51d7f7717b12171d215df3a9920d431b0beae85a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 4 14:24:07 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 4 17:20:19 2020 +0100

    create an awt::XPopupMenu the standard way
    
    Change-Id: If3349380d29ba56b5f61dc948a770ab2fe1fb671
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107226
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 3dd2195f7965..02a80d2046d7 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -21,6 +21,7 @@
 #include <tools/diagnose_ex.h>
 #include <tabletree.hxx>
 #include <dbtreelistbox.hxx>
+#include <com/sun/star/awt/PopupMenu.hpp>
 #include <com/sun/star/awt/XTabController.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XContainer.hpp>
@@ -50,7 +51,6 @@
 #include <imageprovider.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/cvtgrf.hxx>
-#include <toolkit/awt/vclxmenu.hxx>
 #include <tools/stream.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "AppController.hxx"
@@ -1117,8 +1117,8 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, weld::ToggleButton&, v
     if (!xPopupController.is())
         return;
 
-    rtl::Reference xPopupMenu(new VCLXPopupMenu);
-    xPopupController->setPopupMenu(xPopupMenu.get());
+    css::uno::Reference<css::awt::XPopupMenu> xPopupMenu(css::awt::PopupMenu::create(xContext));
+    xPopupController->setPopupMenu(xPopupMenu);
 
     css::util::URL aTargetURL;
     Reference<XDispatchProvider> xDispatchProvider(xFrame, css::uno::UNO_QUERY);


More information about the Libreoffice-commits mailing list