Kaydet (Commit) 1cab99d9 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

clang-analyzer-deadcode.DeadStores

...since the SdrInsertReason ctor lost its second parameter in
1d852b32 "loplugin:unusedmethods svx"

Change-Id: I2db0b5b87c50c29113f7a9ef2de065ee32cce8d7
üst 4c91e94e
...@@ -1745,13 +1745,10 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) ...@@ -1745,13 +1745,10 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
SdrObjList* pAktLst=pPV->GetObjList(); SdrObjList* pAktLst=pPV->GetObjList();
SdrObjList* pSrcLst=pAktLst; SdrObjList* pSrcLst=pAktLst;
SdrObjList* pSrcLst0=pSrcLst; SdrObjList* pSrcLst0=pSrcLst;
SdrPage* pPage=pPV->GetPage();
// make sure OrdNums are correct // make sure OrdNums are correct
if (pSrcLst->IsObjOrdNumsDirty()) if (pSrcLst->IsObjOrdNumsDirty())
pSrcLst->RecalcObjOrdNums(); pSrcLst->RecalcObjOrdNums();
SdrObject* pGrp=NULL; SdrObject* pGrp=NULL;
SdrObject* pRefObj=NULL; // reference for InsertReason (-> anchors in Writer)
SdrObject* pRefObj1=NULL; // reference for InsertReason (-> anchors in Writer)
SdrObjList* pDstLst=NULL; SdrObjList* pDstLst=NULL;
// if all selected objects come from foreign object lists. // if all selected objects come from foreign object lists.
// the group object is the last one in the list. // the group object is the last one in the list.
...@@ -1780,7 +1777,6 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) ...@@ -1780,7 +1777,6 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
pSrcLst->RecalcObjOrdNums(); pSrcLst->RecalcObjOrdNums();
} }
bool bForeignList=pSrcLst!=pAktLst; bool bForeignList=pSrcLst!=pAktLst;
bool bGrouped=pSrcLst!=pPage;
if (!bForeignList && bNeedInsPos) if (!bForeignList && bNeedInsPos)
{ {
nInsPos=pObj->GetOrdNum(); // this way, all ObjOrdNum of the page are set nInsPos=pObj->GetOrdNum(); // this way, all ObjOrdNum of the page are set
...@@ -1793,18 +1789,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) ...@@ -1793,18 +1789,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
SdrInsertReason aReason(SDRREASON_VIEWCALL); SdrInsertReason aReason(SDRREASON_VIEWCALL);
pDstLst->InsertObject(pObj,0,&aReason); pDstLst->InsertObject(pObj,0,&aReason);
GetMarkedObjectListWriteAccess().DeleteMark(nm); 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; pSrcLst0=pSrcLst;
} }
} }
if (pRefObj==NULL)
pRefObj=pRefObj1;
if (pGrp!=NULL) if (pGrp!=NULL)
{ {
aNewMark.InsertEntry(SdrMark(pGrp,pPV)); aNewMark.InsertEntry(SdrMark(pGrp,pPV));
......
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