commit 30a07561c19da050c7ca0a7a67868a6f6229a449
author Caolán McNamara <caolanm@redhat.com> Wed Nov 28 15:47:12 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Wed Nov 28 22:13:46 2018 +0100
tree 5cfeb260c90340b3c07d0fd354e474a5d6fbd5b1
parent fc98dac9eeff15a0d04e643017cb1d49a69bca00

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>

sw/source/core/frmedt/feshview.cxx

diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 4abc8f1..b056982 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;
            }