[Libreoffice-commits] core.git: include/svx sd/source svx/source sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 17 08:41:21 UTC 2021
include/svx/scene3d.hxx | 2 -
include/svx/svdobj.hxx | 2 -
include/svx/svdomeas.hxx | 11 ++++++-
sd/source/ui/func/fucon3d.cxx | 2 -
svx/source/customshapes/EnhancedCustomShape3d.cxx | 2 -
svx/source/dialog/dlgctl3d.cxx | 4 +-
svx/source/engine3d/obj3d.cxx | 2 -
svx/source/engine3d/scene3d.cxx | 24 +++++++--------
svx/source/sdr/properties/attributeproperties.cxx | 10 +++---
svx/source/svdraw/svdoashp.cxx | 20 ++++++------
svx/source/svdraw/svdoattr.cxx | 2 -
svx/source/svdraw/svdobj.cxx | 12 +++----
svx/source/svdraw/svdocapt.cxx | 4 +-
svx/source/svdraw/svdocirc.cxx | 10 +++---
svx/source/svdraw/svdoedge.cxx | 12 +++----
svx/source/svdraw/svdograf.cxx | 2 -
svx/source/svdraw/svdogrp.cxx | 10 +++---
svx/source/svdraw/svdomeas.cxx | 12 +++----
svx/source/svdraw/svdopath.cxx | 8 ++---
svx/source/svdraw/svdotext.cxx | 4 +-
svx/source/svdraw/svdotxat.cxx | 4 +-
svx/source/svdraw/svdotxdr.cxx | 2 -
svx/source/svdraw/svdotxtr.cxx | 14 ++++-----
svx/source/svdraw/svdouno.cxx | 2 -
svx/source/svdraw/svdovirt.cxx | 34 +++++++++++-----------
svx/source/svdraw/svdpage.cxx | 2 -
svx/source/table/svdotable.cxx | 10 +++---
svx/source/unodraw/unopage.cxx | 2 -
sw/source/core/draw/dcontact.cxx | 26 ++++++++--------
sw/source/core/layout/fly.cxx | 2 -
sw/source/core/layout/tabfrm.cxx | 4 +-
31 files changed, 133 insertions(+), 124 deletions(-)
New commits:
commit 8c8d878632f4aa32a63080f6956b8cb76f48af0f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Aug 13 16:13:19 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 17 10:40:43 2021 +0200
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 at collabora.co.uk>
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;
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 32ec30b8fc48..eb0f35b84eae 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -412,7 +412,7 @@ SdrObjectUniquePtr FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID
p3DObj->SetMergedItemSet(aAttr);
// make object interactive at once
- pScene->SetRectsDirty();
+ pScene->SetBoundAndSnapRectsDirty();
// Take care of restrictions for the rectangle
::tools::Rectangle aRect(rRectangle);
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 9c933ef9313e..2f13eb8b986b 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -594,7 +594,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject(
rCamera.SetFocalLength( 1.0 );
rCamera.SetProjection( eProjectionType );
pScene->SetCamera( rCamera );
- pScene->SetRectsDirty();
+ pScene->SetBoundAndSnapRectsDirty();
double fOriginX, fOriginY;
GetOrigin( rGeometryItem, fOriginX, fOriginY );
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index ff12e03137cd..a45d266c1447 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -120,7 +120,7 @@ void Svx3DPreviewControl::Construct()
mpScene->SetTransform(aRotation * mpScene->GetTransform());
// invalidate SnapRects of objects
- mpScene->SetRectsDirty();
+ mpScene->SetBoundAndSnapRectsDirty();
SfxItemSet aSet( mpModel->GetItemPool(),
svl::Items<XATTR_LINESTYLE, XATTR_LINESTYLE,
@@ -360,7 +360,7 @@ void Svx3DLightControl::Construct2()
}
// invalidate SnapRects of objects
- mpScene->SetRectsDirty();
+ mpScene->SetBoundAndSnapRectsDirty();
}
void Svx3DLightControl::ConstructLightObjects()
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 9f9263b02587..148d359a2a1b 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -446,7 +446,7 @@ void E3dObject::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double
aRotateZ.rotate(0.0, 0.0, fAngleInRad);
NbcSetTransform(aRotateZ * GetTransform());
- SetRectsDirty(); // This forces a recalculation of all BoundRects
+ SetBoundAndSnapRectsDirty(); // This forces a recalculation of all BoundRects
NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the glue points (who still
// have coordinates relative to the
// original page)
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 099f3fb75f7d..3bfab4dc776a 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -196,7 +196,7 @@ E3dScene::E3dScene(SdrModel& rSdrModel, E3dScene const & rSource)
// tdf#116979: needed here, we need bSnapRectDirty to be true
// which it is after using SdrObject::operator= (see above),
// but set to false again using CopyObjects
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
// copy local data
@@ -318,7 +318,7 @@ void E3dScene::SetBoundRectDirty()
void E3dScene::NbcSetSnapRect(const tools::Rectangle& rRect)
{
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
E3dObject::NbcSetSnapRect(rRect);
aCamera.SetDeviceWindow(rRect);
aCameraSet.SetViewportRectangle(rRect);
@@ -349,7 +349,7 @@ void E3dScene::SetCamera(const Camera3D& rNewCamera)
aCamera = rNewCamera;
static_cast<sdr::properties::E3dSceneProperties&>(GetProperties()).SetSceneItemsFromCamera();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
// Turn off ratio
GetCameraSet().SetRatio(0.0);
@@ -380,7 +380,7 @@ void E3dScene::StructureChanged()
if(nullptr != pScene && !pScene->mbSkipSettingDirty)
{
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
ImpCleanup3DDepthMapper();
@@ -475,7 +475,7 @@ void E3dScene::SetAllSceneRectsDirty()
if(nullptr != pScene)
{
- pScene->SetRectsDirty();
+ pScene->SetBoundAndSnapRectsDirty();
}
}
@@ -521,7 +521,7 @@ void E3dScene::RestoreGeoData(const SdrObjGeoData& rGeo)
void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint)
{
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
E3dObject::Notify(rBC, rHint);
}
@@ -629,12 +629,12 @@ void E3dScene::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double
aRotation.rotate(0.0, 0.0, fAngleInRad);
NbcSetTransform(aRotation * GetTransform());
- SetRectsDirty(); // This forces a recalculation of all BoundRects
+ SetBoundAndSnapRectsDirty(); // This forces a recalculation of all BoundRects
NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the glue points (who still
// have coordinates relative to the
// original page)
SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void E3dScene::RecalcSnapRect()
@@ -714,7 +714,7 @@ bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
rStat.TakeCreateRect(aRect1);
aRect1.Justify();
NbcSetSnapRect(aRect1);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
@@ -803,10 +803,10 @@ SdrObject* E3dScene::RemoveObject(size_t nObjNum)
return pRetval;
}
-void E3dScene::SetRectsDirty(bool bNotMyself, bool bRecursive)
+void E3dScene::SetBoundAndSnapRectsDirty(bool bNotMyself, bool bRecursive)
{
// call parent
- E3dObject::SetRectsDirty(bNotMyself, bRecursive);
+ E3dObject::SetBoundAndSnapRectsDirty(bNotMyself, bRecursive);
for(size_t a = 0; a < GetObjCount(); ++a)
{
@@ -814,7 +814,7 @@ void E3dScene::SetRectsDirty(bool bNotMyself, bool bRecursive)
if(pCandidate)
{
- pCandidate->SetRectsDirty(bNotMyself, false);
+ pCandidate->SetBoundAndSnapRectsDirty(bNotMyself, false);
}
}
}
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index cfdd2ebb97a7..f24a4b03ab40 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -115,7 +115,7 @@ namespace sdr::properties
SdrObject& rObj = GetSdrObject();
rObj.SetBoundRectDirty();
- rObj.SetRectsDirty(true);
+ rObj.SetBoundAndSnapRectsDirty(/*bNotMyself*/true);
}
mpStyleSheet = nullptr;
@@ -282,7 +282,7 @@ namespace sdr::properties
SdrObject& rObj = GetSdrObject();
rObj.SetBoundRectDirty();
- rObj.SetRectsDirty(true);
+ rObj.SetBoundAndSnapRectsDirty(/*bNotMyself*/true);
rObj.SetChanged();
}
@@ -370,7 +370,7 @@ namespace sdr::properties
SdrObject& rObj = GetSdrObject();
rObj.SetBoundRectDirty();
- rObj.SetRectsDirty(true);
+ rObj.SetBoundAndSnapRectsDirty(true);
}
SfxStyleSheet* AttributeProperties::GetStyleSheet() const
@@ -418,7 +418,7 @@ namespace sdr::properties
// set necessary changes like in RemoveStyleSheet()
GetSdrObject().SetBoundRectDirty();
- GetSdrObject().SetRectsDirty(true);
+ GetSdrObject().SetBoundAndSnapRectsDirty(/*bNotMyself*/true);
mpStyleSheet = nullptr;
}
@@ -488,7 +488,7 @@ namespace sdr::properties
// in the ItemSet parts because GetBoundRect() may calculate a new
tools::Rectangle aBoundRect = rObj.GetLastBoundRect();
- rObj.SetRectsDirty(true);
+ rObj.SetBoundAndSnapRectsDirty(/*bNotMyself*/true);
// tell the object about the change
rObj.SetChanged();
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 158fd473c9ae..7956259d3ab7 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1423,7 +1423,7 @@ void SdrObjCustomShape::NbcSetSnapRect( const tools::Rectangle& rRect )
AdaptTextMinSize();
ImpCheckShear();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetChanged();
}
@@ -1445,7 +1445,7 @@ void SdrObjCustomShape::NbcSetLogicRect( const tools::Rectangle& rRect )
AdaptTextMinSize();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetChanged();
}
@@ -2037,7 +2037,7 @@ void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point& rDestination,
maRect.Move( nXDiff, nYDiff );
m_aOutRect.Move( nXDiff, nYDiff );
maSnapRect.Move( nXDiff, nYDiff );
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(/*bNotMyself*/true);
InvalidateRenderGeometry();
for (const auto& rInteraction : aInteractionHandles)
@@ -2067,7 +2067,7 @@ bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag)
{
rDrag.SetEndDragChangesGeoAndAttributes(true);
DragMoveCustomShapeHdl( rDrag.GetNow(), static_cast<sal_uInt16>(pHdl->GetPointNum()), !rDrag.GetDragMethod()->IsShiftPressed() );
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
InvalidateRenderGeometry();
SetChanged();
break;
@@ -2122,7 +2122,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
ImpJustifyRect( aRect1 );
rStat.SetActionRect( aRect1 );
maRect = aRect1;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
for (const auto& rInteraction : aInteractionHandles)
{
@@ -2148,7 +2148,7 @@ bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
InvalidateRenderGeometry();
}
DragCreateObject( rStat );
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
return true;
}
@@ -2158,7 +2158,7 @@ bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
AdaptTextMinSize();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
return ( eCmd == SdrCreateCmd::ForceEnd || rStat.GetPointCount() >= 2 );
}
@@ -2457,7 +2457,7 @@ bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
maRect = aNewTextRect;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetChanged();
for (const auto& rInteraction : aInteractionHandles)
@@ -2492,7 +2492,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight()
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
maRect = aNewTextRect;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
for (const auto& rInteraction : aInteractionHandles)
{
@@ -2763,7 +2763,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(std::optional<OutlinerParaObjec
{
SdrTextObj::NbcSetOutlinerParaObject( std::move(pTextObject) );
SetBoundRectDirty();
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(true);
InvalidateRenderGeometry();
}
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index be2f169b4b63..2c1b208d314d 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -66,7 +66,7 @@ void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
tools::Rectangle aBoundRect = GetLastBoundRect();
SetBoundRectDirty();
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(/*bNotMyself*/ true);
// This may have led to object change
SetChanged();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f7d93162e12e..75298438b77b 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -509,7 +509,7 @@ void SdrObject::Free( SdrObject*& _rpObject )
delete pObject;
}
-void SdrObject::SetRectsDirty(bool bNotMyself, bool bRecursive)
+void SdrObject::SetBoundAndSnapRectsDirty(bool bNotMyself, bool bRecursive)
{
if (!bNotMyself)
{
@@ -1436,7 +1436,7 @@ PointerStyle SdrObject::GetCreatePointer() const
void SdrObject::NbcMove(const Size& rSiz)
{
m_aOutRect.Move(rSiz);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
@@ -1457,7 +1457,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
}
}
ResizeRect(m_aOutRect,rRef,xFact,yFact);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrObject::NbcRotate(const Point& rRef, Degree100 nAngle)
@@ -1492,7 +1492,7 @@ void SdrObject::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, doubl
}
m_aOutRect.Move(rRef.X(),rRef.Y());
m_aOutRect.Justify(); // just in case
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
}
@@ -1523,7 +1523,7 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
}
m_aOutRect.Move(rRef1.X(),rRef1.Y());
m_aOutRect.Justify(); // just in case
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
NbcMirrorGluePoints(rRef1,rRef2);
SetGlueReallyAbsolute(false);
}
@@ -1929,7 +1929,7 @@ void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
void SdrObject::RestoreGeoData(const SdrObjGeoData& rGeo)
{
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
m_aOutRect =rGeo.aBoundRect ;
m_aAnchor =rGeo.aAnchor ;
m_bMovProt =rGeo.bMovProt ;
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index fdec2552981a..ca63798a2580 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -412,7 +412,7 @@ void SdrCaptionObj::ImpRecalcTail()
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
ImpCalcTail(aPara, aTailPoly, maRect);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetXPolyDirty();
}
@@ -543,7 +543,7 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
ImpGetCaptParams(aPara);
maRect.SetPos(rStat.GetNow());
ImpCalcTail(aPara,aTailPoly,maRect);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 9254c2bcefef..10c56a53db0f 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -564,7 +564,7 @@ bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
nEndAngle = nAngle;
}
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetXPolyDirty();
ImpSetCircInfoToAttr();
SetChanged();
@@ -749,7 +749,7 @@ bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
}
}
m_bClosedObj=meCircleKind!=SdrCircKind::Arc;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetXPolyDirty();
ImpSetCircInfoToAttr();
if (bRet)
@@ -814,7 +814,7 @@ void SdrCircObj::NbcMove(const Size& aSiz)
m_aOutRect.Move(aSiz);
maSnapRect.Move(aSiz);
SetXPolyDirty();
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(true);
}
void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
@@ -1051,7 +1051,7 @@ void SdrCircObj::NbcSetSnapRect(const tools::Rectangle& rRect)
maRect=rRect;
ImpJustifyRect(maRect);
}
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetXPolyDirty();
ImpSetCircInfoToAttr();
}
@@ -1102,7 +1102,7 @@ void SdrCircObj::ImpSetAttrToCircInfo()
if(bKindChg || (meCircleKind != SdrCircKind::Full && bAngleChg))
{
SetXPolyDirty();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
}
}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 3f4dc2b282f9..6af9b933c2e5 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -546,7 +546,7 @@ void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt)
else (*pEdgeTrack)[0]=rPt;
}
ImpRecalcEdgeTrack();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrEdgeObj::ImpDirtyEdgeTrack()
@@ -604,7 +604,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
}
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
ImpSetEdgeInfoToAttr(); // copy values from aEdgeInfo into the pool
bEdgeTrackDirty=false;
@@ -1965,7 +1965,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
ImpSetEdgeInfoToAttr();
bEdgeTrackUserDefined = false;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
if(bOriginalEdgeModified && rDragStat.GetView())
{
@@ -2096,7 +2096,7 @@ bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
}
ImpSetEdgeInfoToAttr(); // copy values from aEdgeInfo into the pool
}
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
return bOk;
}
@@ -2465,7 +2465,7 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
if (1 == i)
(*pEdgeTrack)[nCount-1]=rPnt;
SetEdgeTrackDirty();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
SdrEdgeObjGeoData::SdrEdgeObjGeoData()
@@ -2584,7 +2584,7 @@ void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ )
rConn1.SetConnectorId( static_cast<sal_uInt16>(nIndex) );
SetChanged();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
ImpRecalcEdgeTrack();
}
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3de8f5fa7f5f..03600b9b0759 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1067,7 +1067,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo()
aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() );
SetXPolyDirty();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrGrafObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly )
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index ef53f9b58ed1..485912e3859f 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -72,7 +72,7 @@ SdrObjGroup::SdrObjGroup(SdrModel& rSdrModel, SdrObjGroup const & rSource)
// tdf#116979: needed here, we need bSnapRectDirty to be true
// which it is after using SdrObject::operator= (see above),
// but set to false again using CopyObjects
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
// copy local parameters
@@ -362,7 +362,7 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
else
{
m_aOutRect.Move(rSiz);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
}
@@ -399,7 +399,7 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
else
{
ResizeRect(m_aOutRect,rRef,xFact,yFact);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
}
@@ -539,7 +539,7 @@ void SdrObjGroup::Move(const Size& rSiz)
else
{
m_aOutRect.Move(rSiz);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
SetChanged();
@@ -592,7 +592,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
else
{
ResizeRect(m_aOutRect,rRef,xFact,yFact);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
SetChanged();
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index a72040a4a792..b8e411f7c43e 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -859,7 +859,7 @@ bool SdrMeasureObj::applySpecialDrag(SdrDragStat& rDrag)
}
} // switch
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetChanged();
return true;
@@ -966,7 +966,7 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat)
bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
SetTextDirty();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
@@ -1030,7 +1030,7 @@ void SdrMeasureObj::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, do
aPt2.setY(aPt1.Y()+dy );
}
}
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrMeasureObj::NbcMirror(const Point& rRef1, const Point& rRef2)
@@ -1038,7 +1038,7 @@ void SdrMeasureObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SdrTextObj::NbcMirror(rRef1,rRef2);
MirrorPoint(aPt1,rRef1,rRef2);
MirrorPoint(aPt2,rRef1,rRef2);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrMeasureObj::NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear)
@@ -1046,7 +1046,7 @@ void SdrMeasureObj::NbcShear(const Point& rRef, Degree100 nAngle, double tn, boo
SdrTextObj::NbcShear(rRef,nAngle,tn,bVShear);
ShearPoint(aPt1,rRef,tn,bVShear);
ShearPoint(aPt2,rRef,tn,bVShear);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetTextDirty();
}
@@ -1099,7 +1099,7 @@ void SdrMeasureObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
aPt1=rPnt;
if (1 == i)
aPt2=rPnt;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetTextDirty();
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 1c36760ae929..33845217c79d 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2482,7 +2482,7 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum)
}
}
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj)
@@ -2520,7 +2520,7 @@ sal_uInt32 SdrPathObj::NbcInsPoint(const Point& rPos, bool bNewObj)
aNewPoly.append(aPoint);
aNewPoly.setClosed(IsClosed());
maPathPolygon.append(aNewPoly);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
nNewHdl = GetHdlCount();
}
else
@@ -2739,7 +2739,7 @@ void SdrPathObj::NbcSetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly)
{
maPathPolygon=rPathPoly;
ImpForceKind();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
}
@@ -2762,7 +2762,7 @@ void SdrPathObj::ToggleClosed()
aBoundRect0 = GetLastBoundRect();
ImpSetClosed(!IsClosed()); // set new ObjKind
ImpForceKind(); // because we want Line -> Poly -> PolyLine instead of Line -> Poly -> Line
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetChanged();
BroadcastObjectChange();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index bd492dfc50fa..d95927545e30 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1366,7 +1366,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( std::optional<OutlinerParaObje
if (!IsTextFrame())
{
// the SnapRect keeps its size
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(true);
}
// always invalidate BoundRect on change
@@ -1391,7 +1391,7 @@ void SdrTextObj::NbcReformatText()
{
// the SnapRect keeps its size
SetBoundRectDirty();
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(/*bNotMyself*/true);
}
SetTextSizeDirty();
ActionChanged();
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index adeb2412ced2..ef4184448507 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -242,7 +242,7 @@ bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
bool bRet = AdjustTextFrameWidthAndHeight(maRect,bHgt,bWdt);
if (bRet)
{
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
if (auto pRectObj = dynamic_cast<SdrRectObj *>(this)) { // this is a hack
pRectObj->SetXPolyDirty();
}
@@ -260,7 +260,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
if (bRet) {
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
maRect = aNewRect;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
if (auto pRectObj = dynamic_cast<SdrRectObj *>(this)) { // this is a hack
pRectObj->SetXPolyDirty();
}
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 4ea2b7edbf2b..ad2f79933a3e 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -211,7 +211,7 @@ bool SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
AdaptTextMinSize();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
if (auto pRectObj = dynamic_cast<SdrRectObj *>(this)) {
pRectObj->SetXPolyDirty();
}
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index f0abb2b9d5a2..e499a332400c 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -62,7 +62,7 @@ void SdrTextObj::NbcSetSnapRect(const tools::Rectangle& rRect)
AdaptTextMinSize();
ImpCheckShear();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
}
@@ -78,7 +78,7 @@ void SdrTextObj::NbcSetLogicRect(const tools::Rectangle& rRect)
AdaptTextMinSize();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
Degree100 SdrTextObj::GetRotateAngle() const
@@ -96,7 +96,7 @@ void SdrTextObj::NbcMove(const Size& rSiz)
maRect.Move(rSiz);
m_aOutRect.Move(rSiz);
maSnapRect.Move(rSiz);
- SetRectsDirty(true);
+ SetBoundAndSnapRectsDirty(true);
}
void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
@@ -180,7 +180,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
}
ImpCheckShear();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrTextObj::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
@@ -202,7 +202,7 @@ void SdrTextObj::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, doubl
maGeo.nRotationAngle=NormAngle36000(maGeo.nRotationAngle+nAngle);
maGeo.RecalcSinCos();
}
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
}
@@ -224,7 +224,7 @@ void SdrTextObj::NbcShear(const Point& rRef, Degree100 /*nAngle*/, double tn, bo
NbcAdjustTextFrameWidthAndHeight();
}
ImpCheckShear();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
NbcShearGluePoints(rRef,tn,bVShear);
SetGlueReallyAbsolute(false);
}
@@ -277,7 +277,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
NbcAdjustTextFrameWidthAndHeight();
}
ImpCheckShear();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
NbcMirrorGluePoints(rRef1,rRef2);
SetGlueReallyAbsolute(false);
}
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 9d16d3a12332..01414bfe2962 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -304,7 +304,7 @@ void SdrUnoObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
maGeo.mfSinRotationAngle = 0.0;
maGeo.mfCosRotationAngle = 1.0;
maGeo.mfTanShearAngle = 0.0;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 0bc2a393a400..9dcbb6754ddf 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -81,7 +81,7 @@ SdrObject& SdrVirtObj::ReferencedObj()
void SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
{
m_bClosedObj=rRefObj.IsClosedObj();
- SetRectsDirty(); // TODO: Optimize this.
+ SetBoundAndSnapRectsDirty(); // TODO: Optimize this.
// Only a repaint here, rRefObj may have changed and broadcasts
ActionChanged();
@@ -285,31 +285,31 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeCreatePoly(const SdrDragStat& rDrag) con
void SdrVirtObj::NbcMove(const Size& rSiz)
{
m_aAnchor.Move(rSiz);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrVirtObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
rRefObj.NbcResize(rRef-m_aAnchor,xFact,yFact);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrVirtObj::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
rRefObj.NbcRotate(rRef-m_aAnchor,nAngle,sn,cs);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
rRefObj.NbcMirror(rRef1-m_aAnchor,rRef2-m_aAnchor);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SdrVirtObj::NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear)
{
rRefObj.NbcShear(rRef-m_aAnchor,nAngle,tn,bVShear);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
@@ -329,7 +329,7 @@ void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction
if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Resize(rRef-m_aAnchor,xFact,yFact, bUnsetRelative);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -339,7 +339,7 @@ void SdrVirtObj::Rotate(const Point& rRef, Degree100 nAngle, double sn, double c
if (nAngle) {
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Rotate(rRef-m_aAnchor,nAngle,sn,cs);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -348,7 +348,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
{
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Mirror(rRef1-m_aAnchor,rRef2-m_aAnchor);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -357,7 +357,7 @@ void SdrVirtObj::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVSh
if (nAngle) {
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.Shear(rRef-m_aAnchor,nAngle,tn,bVShear);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
}
@@ -382,7 +382,7 @@ void SdrVirtObj::SetSnapRect(const tools::Rectangle& rRect)
tools::Rectangle aR(rRect);
aR-=m_aAnchor;
rRefObj.SetSnapRect(aR);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -390,7 +390,7 @@ void SdrVirtObj::NbcSetSnapRect(const tools::Rectangle& rRect)
{
tools::Rectangle aR(rRect);
aR-=m_aAnchor;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
rRefObj.NbcSetSnapRect(aR);
}
@@ -408,7 +408,7 @@ void SdrVirtObj::SetLogicRect(const tools::Rectangle& rRect)
tools::Rectangle aR(rRect);
aR-=m_aAnchor;
rRefObj.SetLogicRect(aR);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -416,7 +416,7 @@ void SdrVirtObj::NbcSetLogicRect(const tools::Rectangle& rRect)
{
tools::Rectangle aR(rRect);
aR-=m_aAnchor;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
rRefObj.NbcSetLogicRect(aR);
}
@@ -464,7 +464,7 @@ void SdrVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
Point aP(rPnt);
aP-=m_aAnchor;
rRefObj.SetPoint(aP,i);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
@@ -481,7 +481,7 @@ void SdrVirtObj::SaveGeoData(SdrObjGeoData& rGeo) const
void SdrVirtObj::RestoreGeoData(const SdrObjGeoData& rGeo)
{
rRefObj.RestoreGeoData(rGeo);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
@@ -494,7 +494,7 @@ void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo)
{
tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.SetGeoData(rGeo);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 0e723da67e40..5b39e61bc901 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -270,7 +270,7 @@ void SdrObjList::SetSdrObjListRectsDirty()
if(nullptr != pParentSdrObject)
{
- pParentSdrObject->SetRectsDirty();
+ pParentSdrObject->SetBoundAndSnapRectsDirty();
}
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index bbb653501b8d..ab353e0a1ec4 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -696,7 +696,7 @@ void SdrTableObjImpl::update()
mpTableObj->maRect = mpTableObj->maLogicRect;
LayoutTable( mpTableObj->maRect, false, false );
- mpTableObj->SetRectsDirty();
+ mpTableObj->SetBoundAndSnapRectsDirty();
mpTableObj->ActionChanged();
mpTableObj->BroadcastObjectChange();
}
@@ -1446,7 +1446,7 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
tools::Rectangle aRect0( maRect );
maRect = maLogicRect;
mpImpl->LayoutTable( maRect, false, false );
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
ActionChanged();
BroadcastObjectChange();
if (aRect0 != maRect)
@@ -1928,7 +1928,7 @@ void SdrTableObj::NbcSetLogicRect(const tools::Rectangle& rRect)
NbcAdjustTextFrameWidthAndHeight();
else
NbcAdjustTextFrameWidthAndHeight(!bHeight, !bWidth);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
@@ -1956,7 +1956,7 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
maRect = maLogicRect;
NbcAdjustTextFrameWidthAndHeight( maLogicRect.GetHeight() == aOldRect.GetHeight(), maLogicRect.GetWidth() == aOldRect.GetWidth() );
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
@@ -1970,7 +1970,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight()
if (m_pUserCall!=nullptr)
aBoundRect0=GetLastBoundRect();
maRect = aNewRect;
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SetChanged();
BroadcastObjectChange();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 0cc4f7d954e5..b094ed1ee08f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -531,7 +531,7 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS
aCam.SetFocalLength(100.0);
pScene->SetCamera(aCam);
- pScene->SetRectsDirty();
+ pScene->SetBoundAndSnapRectsDirty();
}
else if(auto pObj = dynamic_cast<E3dExtrudeObj* >(pNewObj))
{
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3019b3ebba1b..45766b78d879 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2439,25 +2439,25 @@ void SwDrawVirtObj::NbcMove(const Size& rSiz)
void SwDrawVirtObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
rRefObj.NbcResize(rRef - GetOffset(), xFact, yFact);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SwDrawVirtObj::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
rRefObj.NbcRotate(rRef - GetOffset(), nAngle, sn, cs);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SwDrawVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
rRefObj.NbcMirror(rRef1 - GetOffset(), rRef2 - GetOffset());
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SwDrawVirtObj::NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear)
{
rRefObj.NbcShear(rRef - GetOffset(), nAngle, tn, bVShear);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
void SwDrawVirtObj::Move(const Size& rSiz)
@@ -2471,7 +2471,7 @@ void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fract
{
tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Resize(rRef - GetOffset(), xFact, yFact, bUnsetRelative);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
}
@@ -2482,7 +2482,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, Degree100 nAngle, double sn, doubl
{
tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Rotate(rRef - GetOffset(), nAngle, sn, cs);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
}
@@ -2491,7 +2491,7 @@ void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
{
tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Mirror(rRef1 - GetOffset(), rRef2 - GetOffset());
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
@@ -2501,7 +2501,7 @@ void SwDrawVirtObj::Shear(const Point& rRef, Degree100 nAngle, double tn, bool b
{
tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Shear(rRef - GetOffset(), nAngle, tn, bVShear);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
}
@@ -2526,7 +2526,7 @@ void SwDrawVirtObj::SetSnapRect(const tools::Rectangle& rRect)
tools::Rectangle aR(rRect);
aR -= GetOffset();
rRefObj.SetSnapRect(aR);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
@@ -2534,7 +2534,7 @@ void SwDrawVirtObj::NbcSetSnapRect(const tools::Rectangle& rRect)
{
tools::Rectangle aR(rRect);
aR -= GetOffset();
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
rRefObj.NbcSetSnapRect(aR);
}
@@ -2552,7 +2552,7 @@ void SwDrawVirtObj::SetLogicRect(const tools::Rectangle& rRect)
tools::Rectangle aR(rRect);
aR -= GetOffset();
rRefObj.SetLogicRect(aR);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
}
@@ -2561,7 +2561,7 @@ void SwDrawVirtObj::NbcSetLogicRect(const tools::Rectangle& rRect)
tools::Rectangle aR(rRect);
aR -= GetOffset();
rRefObj.NbcSetLogicRect(aR);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
Point SwDrawVirtObj::GetSnapPoint(sal_uInt32 i) const
@@ -2582,7 +2582,7 @@ void SwDrawVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
Point aP(rPnt);
aP -= GetOffset();
rRefObj.SetPoint(aP, i);
- SetRectsDirty();
+ SetBoundAndSnapRectsDirty();
}
bool SwDrawVirtObj::HasTextEdit() const
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index ed2786d5dd14..bdc5f9d60a77 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2479,7 +2479,7 @@ void SwFlyFrame::NotifyDrawObj()
{
SwVirtFlyDrawObj* pObj = GetVirtDrawObj();
pObj->SetRect();
- pObj->SetRectsDirty();
+ pObj->SetBoundAndSnapRectsDirty();
pObj->SetChanged();
pObj->BroadcastObjectChange();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index bf9b6161f8bb..3ec2a091749a 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -282,7 +282,7 @@ static void lcl_InvalidateLowerObjs( SwLayoutFrame& _rLayoutFrame,
}
if ( pFly != nullptr )
{
- pFly->GetVirtDrawObj()->SetRectsDirty();
+ pFly->GetVirtDrawObj()->SetBoundAndSnapRectsDirty();
pFly->GetVirtDrawObj()->SetChanged();
}
}
@@ -5022,7 +5022,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrame *pLay, tools::Long lYStart, bool bI
aRectFnSet.AddBottom( aFrm, lDiff );
}
- pFly->GetVirtDrawObj()->SetRectsDirty();
+ pFly->GetVirtDrawObj()->SetBoundAndSnapRectsDirty();
// --> OD 2004-08-17 - also notify view of <SdrObject>
// instance, which represents the Writer fly frame in
// the drawing layer
More information about the Libreoffice-commits
mailing list