summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-10-24 12:15:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-10-24 12:15:52 +0100
commit124acbb11539f66aefb7d39fc61c7d99fb9409e7 (patch)
tree060ff6abbe4b3dce9ad16eb4b458e86da81287ae /sw
parent19d7c0348d7caadc42d557eb6d7a93446c7cd698 (diff)
Related: fdo#70571 allowing clicking on a hyperlink in a protected section
Change-Id: I6104ee3bb0928275a0e4ffb9a7ca1be37ebc1f9e
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/docvw/edtwin.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 9433cbffa033..3a71de77941f 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 );