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

Resolves: tdf#112696 survive missing SwDrawContact

its removed when the object was removed from the page to be reinserted
as as a group member

Change-Id: I8edeb89ae07b73572b65413817212a79ef8957b3
Reviewed-on: https://gerrit.libreoffice.org/63578
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 4e467724
...@@ -2241,6 +2241,11 @@ RndStdIds SwFEShell::GetAnchorId() const ...@@ -2241,6 +2241,11 @@ 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;
...@@ -2345,11 +2350,13 @@ bool SwFEShell::IsGroupSelected() ...@@ -2345,11 +2350,13 @@ 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())
// --> #i38505# No ungroup allowed for 3d objects continue;
!pObj->Is3DObj() && // --> #i38505# No ungroup allowed for 3d objects
RndStdIds::FLY_AS_CHAR != static_cast<SwDrawContact*>(GetUserCall(pObj))-> if (pObj->Is3DObj())
GetFormat()->GetAnchor().GetAnchorId() ) continue;
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