Kaydet (Commit) e45c3085 authored tarafından Caolán McNamara's avatar Caolán McNamara

Revert "Resolves: tdf#112696 survive missing SwDrawContact"

This reverts commit 2cb9c55e.

Change-Id: I2d276d0171103d45be2cd66990fb5cf8d2fb4161
Reviewed-on: https://gerrit.libreoffice.org/64178
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit 30a07561)
Reviewed-on: https://gerrit.libreoffice.org/64257
üst 196f174b
......@@ -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;
}
......
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