diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-28 15:47:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-03 11:24:52 +0100 |
| commit | e45c30858dec1dd705b9144fab981a3c8819ba96 (patch) | |
| tree | c5bbe272b8c2cc09e80c0c9507133f18ee9845fe | |
| parent | 196f174b5707760d41d8062aed6410ba08878326 (diff) | |
Revert "Resolves: tdf#112696 survive missing SwDrawContact"
This reverts commit 2cb9c55e4da18fbfb2f578c46d094e6ca0d56fa1.
Change-Id: I2d276d0171103d45be2cd66990fb5cf8d2fb4161
Reviewed-on: https://gerrit.libreoffice.org/64178
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 30a07561c19da050c7ca0a7a67868a6f6229a449)
Reviewed-on: https://gerrit.libreoffice.org/64257
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index ae1259ce55ca..0343286e18b5 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2241,11 +2241,6 @@ RndStdIds SwFEShell::GetAnchorId() const break; } SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj)); - if (!pContact) - { - nRet = RndStdIds::UNKNOWN; - break; - } RndStdIds nId = pContact->GetFormat()->GetAnchor().GetAnchorId(); if ( nRet == RndStdIds(SHRT_MAX) ) nRet = nId; @@ -2350,13 +2345,11 @@ bool SwFEShell::IsGroupSelected() SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); // consider 'virtual' drawing objects. // Thus, use corresponding method instead of checking type. - if (!pObj->IsGroupObject()) - continue; - // --> #i38505# No ungroup allowed for 3d objects - if (pObj->Is3DObj()) - continue; - SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj)); - if (!pContact || RndStdIds::FLY_AS_CHAR != pContact->GetFormat()->GetAnchor().GetAnchorId()) + if ( pObj->IsGroupObject() && + // --> #i38505# No ungroup allowed for 3d objects + !pObj->Is3DObj() && + RndStdIds::FLY_AS_CHAR != static_cast<SwDrawContact*>(GetUserCall(pObj))-> + GetFormat()->GetAnchor().GetAnchorId() ) { return true; } |