[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/docvw/edtwin.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 124acbb11539f66aefb7d39fc61c7d99fb9409e7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 12:15:21 2013 +0100

    Related: fdo#70571 allowing clicking on a hyperlink in a protected section
    
    Change-Id: I6104ee3bb0928275a0e4ffb9a7ca1be37ebc1f9e

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 9433cbf..3a71de7 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4429,8 +4429,9 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
 
                         if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_False ) )
                         {
-                            // Do it again if we're not on a field to update the cursor accordingly
-                            if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos )
+                            // Do it again if we're not on a field/hyperlink to update the cursor accordingly
+                            if ( SwContentAtPos::SW_FIELD != aCntntAtPos.eCntntAtPos
+                                 && SwContentAtPos::SW_INETATTR != aCntntAtPos.eCntntAtPos )
                                 rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True );
 
                             sal_Bool bViewLocked = rSh.IsViewLocked();
@@ -4487,7 +4488,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                                     }
                                 }
                             }
-                            else
+                            else if ( SwContentAtPos::SW_INETATTR == aCntntAtPos.eCntntAtPos )
                             {
                                 if ( bExecHyperlinks && aCntntAtPos.aFnd.pAttr )
                                     rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );