[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

Caolán McNamara caolanm at redhat.com
Tue Oct 29 13:21:37 CET 2013


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

New commits:
commit 46d4789bdf14208d927d58e7a871cb14c8c7f917
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 10:19:36 2013 +0100

    Resolves: fdo#70571 don't crash when clicking link in toc
    
    when link is in a toc, and Cursor in protected areas is
    disabled, causing the cursor to leap before the toc
    before trying to see what's under the cursor in order
    to jump to it
    
    Change-Id: Iaf348e3621df02628b4d2ac8c1165df7082237ed
    (cherry picked from commit e9ce405103036b2fa0ae26d331a6cfc3465de10b)
    Reviewed-on: https://gerrit.libreoffice.org/6416
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 6e208f0..3dd87c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4368,7 +4368,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                             }
                             else
                             {
-                                if ( bExecHyperlinks )
+                                if ( bExecHyperlinks && aCntntAtPos.aFnd.pAttr )
                                     rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );
                             }
 


More information about the Libreoffice-commits mailing list