diff options
| -rw-r--r-- | include/svx/svdpage.hxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpage.cxx | 56 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 6 |
3 files changed, 60 insertions, 5 deletions
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 40268b3248fb..d16a9dc3887e 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -125,6 +125,9 @@ public: /// Modify ZOrder of an SdrObject virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum); + /// Modify ZOrder of an SdrObject, object must already be in the list + virtual void SetExistingObjectOrdNum(SdrObject* pExistingObj, size_t nNewObjNum); + void SetSdrObjListRectsDirty(); const tools::Rectangle& GetAllObjSnapRect() const; diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 40044d78aa4f..0c56086d1097 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -561,6 +561,62 @@ SdrObject* SdrObjList::SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) return pObj; } +void SdrObjList::SetExistingObjectOrdNum(SdrObject* pObj, size_t nNewObjNum) +{ + assert(std::find(maList.begin(), maList.end(), pObj) != maList.end() && "This method requires that the child object already be inserted"); + assert(pObj->IsInserted() && "SdrObjList::SetObjectOrdNum: the object does not have status Inserted."); + + // I am deliberately bypassing getOrdNum() because I dont want to unnecessarily + // trigger RecalcObjOrdNums() + const sal_uInt32 nOldOrdNum = pObj->m_nOrdNum; + if (!mbObjOrdNumsDirty && nOldOrdNum == nNewObjNum) + return; + + // Update the navigation positions. + if (HasObjectNavigationOrder()) + { + tools::WeakReference<SdrObject> aReference (pObj); + auto iObject = ::std::find( + mxNavigationOrder->begin(), + mxNavigationOrder->end(), + aReference); + mxNavigationOrder->erase(iObject); + mbIsNavigationOrderDirty = true; + // The new object does not have a user defined position so append it + // to the list. + pObj->SetNavigationPosition(mxNavigationOrder->size()); + mxNavigationOrder->push_back(pObj); + } + if (nOldOrdNum < maList.size() && maList[nOldOrdNum] == pObj) + maList.erase(maList.begin()+nOldOrdNum); + else + { + auto it = std::find(maList.begin(), maList.end(), pObj); + maList.erase(it); + } + // Insert object into object list. Because the insert() method requires + // a valid iterator as insertion position, we have to use push_back() to + // insert at the end of the list. + if (nNewObjNum >= maList.size()) + maList.push_back(pObj); + else + maList.insert(maList.begin()+nNewObjNum, pObj); + + mbObjOrdNumsDirty=true; + + // No need to delete visualisation data since same object + // gets inserted again. Also a single ActionChanged is enough + pObj->ActionChanged(); + + pObj->SetOrdNum(nNewObjNum); + mbObjOrdNumsDirty=true; + + // TODO: We need a different broadcast here. + if (pObj->getSdrPageFromSdrObject()!=nullptr) + pObj->getSdrModelFromSdrObject().Broadcast(SdrHint(SdrHintKind::ObjectChange, *pObj)); + pObj->getSdrModelFromSdrObject().SetChanged(); +} + void SdrObjList::sort( std::vector<sal_Int32>& sortOrder) { // no negative indexes and indexes larger than maList size are allowed diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6445b81e06db..759f61d107ac 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -2126,11 +2126,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertyMapEn { SdrObjList* pObjList = GetSdrObject()->getParentSdrObjListFromSdrObject(); if( pObjList ) - { - SdrObject* pCheck = - pObjList->SetObjectOrdNum( GetSdrObject()->GetOrdNum(), static_cast<size_t>(nNewOrdNum) ); - DBG_ASSERT( pCheck == GetSdrObject(), "GetOrdNum() failed!" ); - } + pObjList->SetExistingObjectOrdNum( GetSdrObject(), static_cast<size_t>(nNewOrdNum) ); return true; } break; |