diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-12-11 20:25:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-12-12 13:33:27 +0100 |
| commit | 569de88e9c7eda964252518282d26a8f7d059718 (patch) | |
| tree | e8a8988ea61bbd3b398ed63e517145e9a1088012 /include/framework | |
| parent | 73e9e027e9978cf5136731118f18b832bd361181 (diff) | |
prefer css::awt::XPopupMenu api
and using GetXGraphic will return a vcl unographic::XGraphic which
also supports XBitmap as well as XGraphic so we can check if
the XBitmap we're passing around supports XGraphic and use that
if it does and drop the imagewrapper in favor of doing that
Change-Id: I3bd7963b53c3f715fca4b5cfb2ddad650ca92e1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126691
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/framework')
| -rw-r--r-- | include/framework/actiontriggerhelper.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx index ceccea40433b..227535648950 100644 --- a/include/framework/actiontriggerhelper.hxx +++ b/include/framework/actiontriggerhelper.hxx @@ -17,16 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX -#define INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX +#pragma once #include <framework/fwkdllapi.h> #include <com/sun/star/uno/Reference.hxx> +namespace com::sun::star::awt { class XPopupMenu; } namespace com::sun::star::container { class XIndexContainer; } class Menu; - namespace framework { class FWK_DLLPUBLIC ActionTriggerHelper @@ -38,8 +37,8 @@ namespace framework // @param rActionTriggerContainer = must be an instance of service "com.sun.star.ui.ActionTriggerContainer" static void CreateMenuFromActionTriggerContainer( - Menu* pNewMenu, - const css::uno::Reference< css::container::XIndexContainer >& rActionTriggerContainer ); + const css::uno::Reference<css::awt::XPopupMenu>& rNewMenu, + const css::uno::Reference<css::container::XIndexContainer>& rActionTriggerContainer); // Creates a "css::ui::ActionTriggerContainer" with the structure of the menu // provided as a parameter. The implementation class stores the menu pointer @@ -64,6 +63,4 @@ namespace framework }; } -#endif // INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |