diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-24 15:22:39 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-24 15:24:55 +0100 |
commit | 26333736f103342344b9b0fa20a3a04d426fac4f (patch) | |
tree | 9936dccf0408950932c26d91be13d301d7da6515 /sd/source/ui/annotations/annotationmanagerimpl.hxx | |
parent | opengl: prevent seg. fault - VCL_GL_INFO still needs the context (diff) | |
download | core-26333736f103342344b9b0fa20a3a04d426fac4f.tar.gz core-26333736f103342344b9b0fa20a3a04d426fac4f.zip |
Resolves: tdf#99712 Crash in impress annotation context menu
which is an issue since...
commit dd46727b99d4bb5135451aa7e5e1bdb197373843
Author: Caolán McNamara <caolanm@redhat.com>
Date: Tue Apr 5 15:27:38 2016 +0100
Resolves; tdf#87120 no keyboard navigation inside floating windows
lets try and treat these the same as we do normal toplevels
like dialogs if they popup with GrabFocus.
This way focus can be set on widgets inside the floating windows, and
so keyboard traversal of widgets etc all works.
which allows keyboard focus inside floating windows to allow a11y keyboard
navigation inside them without jumping through difficult hoops.
Change-Id: I6024c048e80d09a70cb3a628378975248a55d6b6
Diffstat (limited to 'sd/source/ui/annotations/annotationmanagerimpl.hxx')
-rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 5f6a6d409775..623631c6e428 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -112,6 +112,10 @@ public: void ShowAnnotations(bool bShow); + // tdf#99388 and tdf#99712 flag to transport if the PopupMenu is active + bool getPopupMenuActive() const { return mbPopupMenuActive; } + void setPopupMenuActive(bool bNew) { mbPopupMenuActive = bNew; } + private: ViewShellBase& mrBase; SdDrawDocument* mpDoc; @@ -123,6 +127,7 @@ private: css::uno::Reference< css::office::XAnnotation > mxSelectedAnnotation; bool mbShowAnnotations; + bool mbPopupMenuActive; ImplSVEvent * mnUpdateTagsEvent; vcl::Font maFont; }; |