use more VCLXPopupMenu instead of XPopupMenu

which avoids a bunch of casting and makes the dependency explicit
instead of implicit

Change-Id: I754da72916fbbc51e7edc3c806155da34d347bd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145472
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 7 insertions, 4 deletions

diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index ee445710b9c0..9b3fed6d5f23 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <rtl/ref.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/toolbarids.hxx>
 #include <sal/types.h>
@@ -39,6 +40,7 @@ class SfxItemSet;
 class SfxModule;
 class Point;
 struct SfxDispatcher_Impl;
+class VCLXPopupMenu;
 
 namespace com::sun::star::awt { class XPopupMenu; }
 namespace vcl { class Window; }
@@ -176,7 +178,7 @@ public:
     SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame const * pNew );
     SAL_DLLPRIVATE void InvalidateBindings_Impl(bool);
 
-    static boost::property_tree::ptree fillPopupMenu(const css::uno::Reference<css::awt::XPopupMenu>& rMenu);
+    static boost::property_tree::ptree fillPopupMenu(const rtl::Reference<VCLXPopupMenu>& rMenu);
 };
 
 #endif
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index bb805cdc4179..8efa98a13e4f 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -57,6 +57,7 @@ class NotifyEvent;
 class SfxInPlaceClient;
 class SfxLokCallbackInterface;
 class SfxStoringHelper;
+class VCLXPopupMenu;
 namespace rtl { class OStringBuffer; }
 namespace vcl { class PrinterController; }
 
@@ -304,11 +305,11 @@ public:
     void                        SetController( SfxBaseController* pController );
     css::uno::Reference<css::frame::XController> GetController() const;
 
-    bool                        TryContextMenuInterception(const css::uno::Reference<css::awt::XPopupMenu>& rIn,
+    bool                        TryContextMenuInterception(const rtl::Reference<VCLXPopupMenu>& rIn,
                                                            const OUString& rMenuIdentifier,
-                                                           css::uno::Reference<css::awt::XPopupMenu>& rOut,
+                                                           rtl::Reference<VCLXPopupMenu>& rOut,
                                                            css::ui::ContextMenuExecuteEvent aEvent);
-    bool                        TryContextMenuInterception(const css::uno::Reference<css::awt::XPopupMenu>&,
+    bool                        TryContextMenuInterception(const rtl::Reference<VCLXPopupMenu>&,
                                                            const OUString& rMenuIdentifier,
                                                            css::ui::ContextMenuExecuteEvent aEvent);