[Libreoffice-commits] core.git: svx/source

Stephan Bergmann sbergman at redhat.com
Wed Sep 9 06:38:28 PDT 2015


 svx/source/svdraw/svdedtv2.cxx |   13 -------------
 1 file changed, 13 deletions(-)

New commits:
commit 1cab99d99646eee12afff1ded8f6e3fd1a273bb1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 9 15:35:30 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...since the SdrInsertReason ctor lost its second parameter in
    1d852b32d7ad89b2317c04958060f366f8922ca4 "loplugin:unusedmethods svx"
    
    Change-Id: I2db0b5b87c50c29113f7a9ef2de065ee32cce8d7

diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 4d6698d..770c610 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1745,13 +1745,10 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
             SdrObjList* pAktLst=pPV->GetObjList();
             SdrObjList* pSrcLst=pAktLst;
             SdrObjList* pSrcLst0=pSrcLst;
-            SdrPage*    pPage=pPV->GetPage();
             // make sure OrdNums are correct
             if (pSrcLst->IsObjOrdNumsDirty())
                 pSrcLst->RecalcObjOrdNums();
             SdrObject*  pGrp=NULL;
-            SdrObject*  pRefObj=NULL; // reference for InsertReason (-> anchors in Writer)
-            SdrObject*  pRefObj1=NULL; // reference for InsertReason (-> anchors in Writer)
             SdrObjList* pDstLst=NULL;
             // if all selected objects come from foreign object lists.
             // the group object is the last one in the list.
@@ -1780,7 +1777,6 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
                             pSrcLst->RecalcObjOrdNums();
                     }
                     bool bForeignList=pSrcLst!=pAktLst;
-                    bool bGrouped=pSrcLst!=pPage;
                     if (!bForeignList && bNeedInsPos)
                     {
                         nInsPos=pObj->GetOrdNum(); // this way, all ObjOrdNum of the page are set
@@ -1793,18 +1789,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
                     SdrInsertReason aReason(SDRREASON_VIEWCALL);
                     pDstLst->InsertObject(pObj,0,&aReason);
                     GetMarkedObjectListWriteAccess().DeleteMark(nm);
-                    if (pRefObj1==NULL)
-                        pRefObj1=pObj; // the topmost visible object
-                    if (!bGrouped)
-                    {
-                        if (pRefObj==NULL)
-                            pRefObj=pObj; // the topmost visible non-group object
-                    }
                     pSrcLst0=pSrcLst;
                 }
             }
-            if (pRefObj==NULL)
-                pRefObj=pRefObj1;
             if (pGrp!=NULL)
             {
                 aNewMark.InsertEntry(SdrMark(pGrp,pPV));


More information about the Libreoffice-commits mailing list