From e73ae4363b55dd544184be1c938f7103f0e64ee3 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 9 Mar 2012 20:30:56 +0100 Subject: fdo#45962: fix context menu key yanking cursor out of header/footer For the "context menu" key VCL synthesizes a cursor position that is the center of the window, hence likely to be in the document body. When SwEditWin::Command calls lcl_CheckHeaderFooterClick, it then moves the document view cursor; prevent that by only calling that for actual mouse events. (regression from a6176612ff1a6a142a68964b2c0834d28125fc45) (cherry picked from commit 87279e0e812bac7f2c17f2758a39bcfd942214af) Signed-off-by: Miklos Vajna --- sw/source/ui/docvw/edtwin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 66b8fad08d5a..05883ee3b171 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -4737,7 +4737,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) if (rView.GetPostItMgr()->IsHit(rCEvt.GetMousePosPixel())) return; - if ( lcl_CheckHeaderFooterClick( rSh, + if (rCEvt.IsMouseEvent() && lcl_CheckHeaderFooterClick( rSh, PixelToLogic( rCEvt.GetMousePosPixel() ), 1 ) ) return; -- cgit v1.2.3