[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source

[Heiko Tietze]

 sfx2/source/control/charwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7a0fefa3818e9218f3f871ce3156df39ee444703
Author: Heiko Tietze <tietze.heiko at gmail.com>
Date:   Wed Nov 29 11:09:35 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
    Tested-by: Heiko Tietze <tietze.heiko at googlemail.com>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 2246ab1a187a5ca73b35ca700c1db63c9b74054e)
    Reviewed-on: https://gerrit.libreoffice.org/45966

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;