sw/source/uibase/docvw/edtwin.cxx | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 51dac33cfd7d6c52577f9d6d300f85a632f4371d
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Sep 20 10:17:28 2018 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Sep 20 12:37:39 2018 +0200
tdf#119356 fix hand cursor for none input fields
Inside the input field the cursor still changes to "edit", as
expected.
Change-Id: I4cec6ae5233143f5a0e4f1979deeb674d909f76c
Reviewed-on: https://gerrit.libreoffice.org/60796
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index c0d838e3a982..c44b2db80faf 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -575,15 +575,13 @@ void SwEditWin::UpdatePointer(const Point &rLPt,
sal_uInt16 nModifier )
if( rSh.GetContentAtPos( rLPt, aSwContentAtPos) )
{
// Is edit inline input field
- if (IsAttrAtPos::Field == aSwContentAtPos.eContentAtPos)
+ if (IsAttrAtPos::Field == aSwContentAtPos.eContentAtPos
+ && aSwContentAtPos.pFndTextAttr != nullptr
+ && aSwContentAtPos.pFndTextAttr->Which() ==
RES_TXTATR_INPUTFIELD)
{
- if ( aSwContentAtPos.pFndTextAttr != nullptr
- && aSwContentAtPos.pFndTextAttr->Which() ==
RES_TXTATR_INPUTFIELD)
- {
- const SwField *pCursorField =
rSh.CursorInsideInputField() ? rSh.GetCurField( true ) : nullptr;
- if (!(pCursorField && pCursorField ==
aSwContentAtPos.pFndTextAttr->GetFormatField().GetField()))
- eStyle = PointerStyle::RefHand;
- }
+ const SwField *pCursorField =
rSh.CursorInsideInputField() ? rSh.GetCurField( true ) : nullptr;
+ if (!(pCursorField && pCursorField ==
aSwContentAtPos.pFndTextAttr->GetFormatField().GetField()))
+ eStyle = PointerStyle::RefHand;
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
