Kaydet (Commit) 30a07561 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>
üst fc98dac9
...@@ -2241,11 +2241,6 @@ RndStdIds SwFEShell::GetAnchorId() const ...@@ -2241,11 +2241,6 @@ RndStdIds SwFEShell::GetAnchorId() const
break; break;
} }
SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj)); SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
if (!pContact)
{
nRet = RndStdIds::UNKNOWN;
break;
}
RndStdIds nId = pContact->GetFormat()->GetAnchor().GetAnchorId(); RndStdIds nId = pContact->GetFormat()->GetAnchor().GetAnchorId();
if ( nRet == RndStdIds(SHRT_MAX) ) if ( nRet == RndStdIds(SHRT_MAX) )
nRet = nId; nRet = nId;
...@@ -2350,13 +2345,11 @@ bool SwFEShell::IsGroupSelected() ...@@ -2350,13 +2345,11 @@ bool SwFEShell::IsGroupSelected()
SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj(); SdrObject *pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
// consider 'virtual' drawing objects. // consider 'virtual' drawing objects.
// Thus, use corresponding method instead of checking type. // Thus, use corresponding method instead of checking type.
if (!pObj->IsGroupObject()) if ( pObj->IsGroupObject() &&
continue; // --> #i38505# No ungroup allowed for 3d objects
// --> #i38505# No ungroup allowed for 3d objects !pObj->Is3DObj() &&
if (pObj->Is3DObj()) RndStdIds::FLY_AS_CHAR != static_cast<SwDrawContact*>(GetUserCall(pObj))->
continue; GetFormat()->GetAnchor().GetAnchorId() )
SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj));
if (!pContact || RndStdIds::FLY_AS_CHAR != pContact->GetFormat()->GetAnchor().GetAnchorId())
{ {
return true; 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