diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-13 16:13:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-17 10:40:43 +0200 |
| commit | 8c8d878632f4aa32a63080f6956b8cb76f48af0f (patch) | |
| tree | a6cd4890b98f294ec6bbe5ca407bbc187818fe5f /include/svx | |
| parent | c64f221fc2e22ffa60c4d78240893f7f04531b3e (diff) | |
rename SetRectsDirty->SetBoundAndSnapRectsDirty
because there are lots of things being marked dirty, and I like to be
sure I know what the code is doing
Change-Id: Ifd0380c5560adc4a054495551885fe33af4f3e5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120460
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/scene3d.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdobj.hxx | 2 | ||||
| -rw-r--r-- | include/svx/svdomeas.hxx | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index d2d91f3c3e9c..8903e3bd4f2d 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -174,7 +174,7 @@ public: virtual SdrObject* RemoveObject(size_t nObjNum) override; // needed for group functionality - virtual void SetRectsDirty(bool bNotMyself = false, bool bRecursive = true) override; + virtual void SetBoundAndSnapRectsDirty(bool bNotMyself = false, bool bRecursive = true) override; virtual void NbcSetLayer(SdrLayerID nLayer) override; // react on model/page change diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index d3b8089d4d64..5a4460dd9ddd 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -339,7 +339,7 @@ public: /// /// This is needed for instance for NbcMove, because usually one moves SnapRect and aOutRect /// at the same time to avoid recomputation. - virtual void SetRectsDirty(bool bNotMyself = false, bool bRecursive = true); + virtual void SetBoundAndSnapRectsDirty(bool bNotMyself = false, bool bRecursive = true); // frees the SdrObject pointed to by the argument // In case the object has an SvxShape, which has the ownership of the object, it diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 15a6d0e0026e..cd00b7d26d1c 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -61,7 +61,16 @@ private: void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; static basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol); void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; - void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!m_aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } } + void SetTextDirty() + { + bTextDirty=true; + SetTextSizeDirty(); + if (!m_aOutRect.IsEmpty()) + { + SetBoundRectDirty(); + SetBoundAndSnapRectsDirty(/*bNotMyself*/true); + } + } void UndirtyText() const; virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override; |