[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Miklos Vajna]

 sw/source/ui/docvw/edtwin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e73ae4363b55dd544184be1c938f7103f0e64ee3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Mar 9 20:30:56 2012 +0100

    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 <vmiklos at suse.cz>

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 66b8fad..05883ee 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;