diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2022-07-12 23:19:47 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2022-07-13 14:52:18 +0200 |
commit | 421688a4c2fc64e64ce211d579bad2174e005db4 (patch) | |
tree | d9ced081c953c04452d6ce05bf67bc055ba9b1d1 /include/vcl/toolkit/button.hxx | |
parent | ca1b528972235c16dab74e3662ff768c68a6cc38 (diff) |
tdf#149956 Pass the correct frame to VclStatusListener
Starting directly to Writer (i.e. with "--writer") will attempt
to create VclStatusListeners for .uno:ImageOrientation before
the frame is activated, causing the dispatcher to not be found.
Also defer that stuff to after a toolbar is filled, so we get a
correct initial state for toolbars which shown when the current
paragraph is rtl already. (There is a similar problem with the
NB, but it isn't handled in this patch.)
Change-Id: Ie482007c10a4014b4a2fd4d53f05d433777ecfb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137014
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'include/vcl/toolkit/button.hxx')
-rw-r--r-- | include/vcl/toolkit/button.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index e894f9e28bfb..df67a243c52c 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -30,7 +30,7 @@ #include <memory> #include <vector> -namespace com::sun::star::frame { struct FeatureStateEvent; } +namespace com::sun::star::frame { struct FeatureStateEvent; class XFrame; } template <class T> class VclPtr; class Color; @@ -80,7 +80,7 @@ public: const Link<Button*,void>& GetClickHdl() const { return maClickHdl; } /// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button. - void SetCommandHandler(const OUString& aCommand); + void SetCommandHandler(const OUString& aCommand, const css::uno::Reference<css::frame::XFrame>& rFrame); OUString const & GetCommand() const { return maCommand; } void SetModeImage( const Image& rImage ); |