diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2017-11-29 11:09:35 +0100 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@googlemail.com> | 2017-12-06 18:58:26 +0100 |
| commit | 7a0fefa3818e9218f3f871ce3156df39ee444703 (patch) | |
| tree | 9c540effd56695835efabf4a64b1d1ec1d348e83 /sfx2 | |
| parent | 72172b4568fb74669fd2269ef29176527363f024 (diff) | |
tdf#113343 Floating charmap window must not have a context menu
Change-Id: I76c567047b0033ae766ab6c5161c96416e478e8e
Reviewed-on: https://gerrit.libreoffice.org/45475
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Tested-by: Heiko Tietze <tietze.heiko@googlemail.com>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 2246ab1a187a5ca73b35ca700c1db63c9b74054e)
Reviewed-on: https://gerrit.libreoffice.org/45966
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/charwin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index 7a7ec777f124..8bd37fc67452 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -53,7 +53,8 @@ void SvxCharView::MouseButtonDown( const MouseEvent& rMEvt ) maMouseClickHdl.Call(this); } - if(rMEvt.IsRight()) + // suppress context menu on floating windows + if (rMEvt.IsRight() && GetSystemWindow()->GetType() != WindowType::FLOATINGWINDOW) { Point aPosition (rMEvt.GetPosPixel()); maPosition = aPosition; |