diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-08-01 21:47:30 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-08-02 10:53:47 +0200 |
| commit | 4804a1474ccba8df57f0a0151bd69237e82eb618 (patch) | |
| tree | 256b0ec8ff72983a6c00d412ab5fff022f52c03e /svx | |
| parent | bd8320952522165ee7f5f6cbe2675ea674ec5749 (diff) | |
Directly prevent multiple change broadcasts
Instead of using members in SdrObject and a class
(SdrDelayBroadcastObjectChange) to prevent special,
selected SdrObnjects from executing BroadcastObjectChange,
use existing possibilities.
Change-Id: Iccab28249cfdc73219143b681495c84d7f520b62
Reviewed-on: https://gerrit.libreoffice.org/58451
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index f2b2db4086cb..40aab0eb572c 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -361,8 +361,6 @@ SdrObject::SdrObject(SdrModel& rSdrModel) ,mnLayerID(0) ,mpProperties(nullptr) ,mpViewContact(nullptr) - ,mbDelayBroadcastObjectChange(false) - ,mbBroadcastObjectChangePending(false) ,mpSvxShape( nullptr ) ,maWeakUnoShape() ,mbDoNotInsertIntoPageAutomatically(false) @@ -925,12 +923,6 @@ void SdrObject::BroadcastObjectChange() const if ((getSdrModelFromSdrObject().isLocked()) || utl::ConfigManager::IsFuzzing()) return; - if (mbDelayBroadcastObjectChange) - { - mbBroadcastObjectChangePending = true; - return; - } - bool bPlusDataBroadcast(pPlusData && pPlusData->pBroadcast); bool bObjectChange(IsInserted()); @@ -3000,26 +2992,6 @@ bool SdrObject::IsTextBox() const return false; } -SdrDelayBroadcastObjectChange::SdrDelayBroadcastObjectChange( SdrObject& rObj ) : - mrObj(rObj), mbOldDelayBroadcastObjectChange( rObj.mbDelayBroadcastObjectChange) -{ - mrObj.mbDelayBroadcastObjectChange = true; -} - -SdrDelayBroadcastObjectChange::~SdrDelayBroadcastObjectChange() -{ - if (!mbOldDelayBroadcastObjectChange) - { - mrObj.mbDelayBroadcastObjectChange = false; - if (mrObj.mbBroadcastObjectChangePending) - { - mrObj.mbBroadcastObjectChangePending = false; - mrObj.BroadcastObjectChange(); - } - } -} - - SdrObject* SdrObjFactory::CreateObjectFromFactory(SdrModel& rSdrModel, SdrInventor nInventor, sal_uInt16 nObjIdentifier) { SdrObjCreatorParams aParams { nInventor, nObjIdentifier, rSdrModel }; |