Kaydet (Commit) 7eebbf5c authored tarafından Miklos Vajna's avatar Miklos Vajna

n#778148 SwEditWin::UpdatePointer: fix mouse pointer wrt. hyperlinks

This moves up the check introduced in commit
1223dd3b, so that not only images are
handled, but also hyperlinks. With checking early, bCntAtPos is set to
True, then hyperlinks are handled properly.

Change-Id: I2dad38867c492d07ef0a1ce17824c114faa5decb
üst b410acd1
......@@ -492,10 +492,12 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
}
else
{
// Background images don't count.
SdrObject* pSelectableObj = rSh.GetObjAt(rLPt);
// dvo: IsObjSelectable() eventually calls SdrView::PickObj, so
// apparently this is used to determine whether this is a
// drawling layer object or not.
if ( rSh.IsObjSelectable( rLPt ) )
if ( rSh.IsObjSelectable( rLPt ) && pSelectableObj->GetLayer() != rSh.GetDoc()->GetHellId())
{
if (pSdrView->IsTextEdit())
{
......@@ -523,10 +525,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
(rSh.IsObjSelected() || rSh.IsFrmSelected()) &&
(!rSh.IsSelObjProtected(FLYPROTECT_POS));
SdrObject* pSelectableObj = rSh.GetObjAt(rLPt);
// Don't update pointer if this is a background image only.
if (pSelectableObj->GetLayer() != rSh.GetDoc()->GetHellId())
eStyle = bMovable ? POINTER_MOVE : POINTER_ARROW;
eStyle = bMovable ? POINTER_MOVE : POINTER_ARROW;
aActHitType = SDRHIT_OBJECT;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment