[Libreoffice-commits] core.git: include/svx svx/source sw/source
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Mon Apr 12 07:59:13 UTC 2021
include/svx/svdobj.hxx | 62 ++---
include/svx/svdomeas.hxx | 2
include/svx/svdotext.hxx | 2
svx/source/engine3d/obj3d.cxx | 10
svx/source/engine3d/scene3d.cxx | 6
svx/source/svdraw/svdoashp.cxx | 20 -
svx/source/svdraw/svdoattr.cxx | 6
svx/source/svdraw/svdobj.cxx | 414 +++++++++++++++++++--------------------
svx/source/svdraw/svdocapt.cxx | 10
svx/source/svdraw/svdocirc.cxx | 14 -
svx/source/svdraw/svdoedge.cxx | 30 +-
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdogrp.cxx | 48 ++--
svx/source/svdraw/svdomeas.cxx | 4
svx/source/svdraw/svdoole2.cxx | 2
svx/source/svdraw/svdopage.cxx | 2
svx/source/svdraw/svdopath.cxx | 16 -
svx/source/svdraw/svdorect.cxx | 10
svx/source/svdraw/svdotext.cxx | 4
svx/source/svdraw/svdotxat.cxx | 2
svx/source/svdraw/svdotxdr.cxx | 2
svx/source/svdraw/svdotxtr.cxx | 4
svx/source/svdraw/svdouno.cxx | 6
svx/source/svdraw/svdovirt.cxx | 94 ++++----
svx/source/table/svdotable.cxx | 6
sw/source/core/draw/dcontact.cxx | 38 +--
sw/source/core/draw/dflyobj.cxx | 48 ++--
27 files changed, 433 insertions(+), 433 deletions(-)
New commits:
commit bd9b009491b9aed5160be870dc82af5709f41af2
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Apr 12 09:13:22 2021 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Apr 12 09:58:28 2021 +0200
svx: prefix members of SdrObject
So that nOrdNum doesn't cause -Wshadow in
SwDrawVirtObj::AddToDrawingPage().
Change-Id: Ie7b1401f5c3cb07bfa653c4268dbdce7ba7abea5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113966
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 2bc05e3b01ca..ec72c9d39a41 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -728,31 +728,31 @@ private:
public:
// if true, reference onto an object
- bool IsVirtualObj() const { return bVirtObj;}
+ bool IsVirtualObj() const { return m_bVirtObj;}
// is true, if object can probably be filled
// is false, if object has probably line ends
// is invalid, if this is a group object
- bool IsClosedObj() const { return bClosedObj;}
+ bool IsClosedObj() const { return m_bClosedObj;}
// tdf#118662 reorganize inserted state, no local bool needed anymore,
// it depends on being a member of a SdrObjList
void InsertedStateChange();
bool IsInserted() const { return nullptr != getParentSdrObjListFromSdrObject(); }
- bool IsEdgeObj() const { return bIsEdge;}
- bool Is3DObj() const { return bIs3DObj;}
- bool IsUnoObj() const { return bIsUnoObj;}
+ bool IsEdgeObj() const { return m_bIsEdge;}
+ bool Is3DObj() const { return m_bIs3DObj;}
+ bool IsUnoObj() const { return m_bIsUnoObj;}
void SetMoveProtect(bool bProt);
- bool IsMoveProtect() const { return bMovProt;}
+ bool IsMoveProtect() const { return m_bMovProt;}
void SetResizeProtect(bool bProt);
- bool IsResizeProtect() const { return bSizProt;}
+ bool IsResizeProtect() const { return m_bSizProt;}
void SetPrintable(bool bPrn);
- bool IsPrintable() const { return !bNoPrint;}
+ bool IsPrintable() const { return !m_bNoPrint;}
void SetVisible(bool bVisible);
bool IsVisible() const { return mbVisible;}
void SetMarkProtect(bool bProt);
- bool IsMarkProtect() const { return bMarkProt;}
+ bool IsMarkProtect() const { return m_bMarkProt;}
/// Whether the aspect ratio should be kept by default when resizing.
virtual bool shouldKeepAspectRatio() const { return false; }
@@ -826,18 +826,18 @@ public:
virtual bool IsTextBox() const;
void SetEmptyPresObj(bool bEpt);
- bool IsEmptyPresObj() const { return bEmptyPresObj;}
+ bool IsEmptyPresObj() const { return m_bEmptyPresObj;}
void SetNotVisibleAsMaster(bool bFlg);
- bool IsNotVisibleAsMaster() const { return bNotVisibleAsMaster;}
+ bool IsNotVisibleAsMaster() const { return m_bNotVisibleAsMaster;}
void SetUserCall(SdrObjUserCall* pUser);
- SdrObjUserCall* GetUserCall() const { return pUserCall;}
+ SdrObjUserCall* GetUserCall() const { return m_pUserCall;}
/// @see mbDoNotInsertIntoPageAutomatically
void SetDoNotInsertIntoPageAutomatically(bool bSet);
/// @see mbDoNotInsertIntoPageAutomatically
bool IsDoNotInsertIntoPageAutomatically() const { return mbDoNotInsertIntoPageAutomatically;}
// Warning: this method should only be used if you really know what you're doing
- sal_uInt32 GetOrdNumDirect() const { return nOrdNum;}
+ sal_uInt32 GetOrdNumDirect() const { return m_nOrdNum;}
// #i25616#
bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange;}
@@ -869,30 +869,30 @@ public:
const Graphic* getFillGraphic() const;
protected:
- mutable tools::Rectangle aOutRect; // surrounding rectangle for Paint (incl. LineWidth, ...)
- Point aAnchor; // anchor position (Writer)
- SdrObjUserCall* pUserCall;
+ mutable tools::Rectangle m_aOutRect; // surrounding rectangle for Paint (incl. LineWidth, ...)
+ Point m_aAnchor; // anchor position (Writer)
+ SdrObjUserCall* m_pUserCall;
std::unique_ptr<SdrObjPlusData>
- pPlusData; // Broadcaster, UserData, connectors, ... (this is the Bitsack)
+ m_pPlusData; // Broadcaster, UserData, connectors, ... (this is the Bitsack)
// object is only pointing to another one
- bool bVirtObj : 1;
- bool bSnapRectDirty : 1;
+ bool m_bVirtObj : 1;
+ bool m_bSnapRectDirty : 1;
// the following flags will be streamed
- bool bMovProt : 1; // if true, the position is protected
- bool bSizProt : 1; // if true, the size is protected
+ bool m_bMovProt : 1; // if true, the position is protected
+ bool m_bSizProt : 1; // if true, the size is protected
// If bEmptyPresObj is true, it is a presentation object that has no content yet.
// The flag's default value is false.
// The management is done by the application.
// Neither assign operator nor cloning copies the flag!
// The flag is persistent.
- bool bEmptyPresObj : 1; // empty presentation object (Draw)
+ bool m_bEmptyPresObj : 1; // empty presentation object (Draw)
// if true, object is invisible as object of the MasterPage
- bool bNotVisibleAsMaster : 1;
+ bool m_bNotVisibleAsMaster : 1;
// if true, the object is closed, i.e. no line, arc...
- bool bClosedObj : 1;
- bool bIsEdge : 1;
- bool bIs3DObj : 1;
- bool bIsUnoObj : 1;
+ bool m_bClosedObj : 1;
+ bool m_bIsEdge : 1;
+ bool m_bIs3DObj : 1;
+ bool m_bIsUnoObj : 1;
// #i25616#
bool mbLineIsOutsideGeometry : 1;
// #i25616#
@@ -948,14 +948,14 @@ private:
struct Impl;
std::unique_ptr<Impl> mpImpl;
SdrObjList* mpParentOfSdrObject; // list that includes this object
- sal_uInt32 nOrdNum; // order number of the object in the list
- std::unique_ptr<SfxGrabBagItem> pGrabBagItem; // holds the GrabBagItem property
+ sal_uInt32 m_nOrdNum; // order number of the object in the list
+ std::unique_ptr<SfxGrabBagItem> m_pGrabBagItem; // holds the GrabBagItem property
// Position in the navigation order. SAL_MAX_UINT32 when not used.
sal_uInt32 mnNavigationPosition;
SdrLayerID mnLayerID;
- bool bNoPrint : 1; // if true, the object is not printed.
+ bool m_bNoPrint : 1; // if true, the object is not printed.
bool mbVisible : 1; // if false, the object is not visible on screen (but maybe on printer, depending on bNoprint
- bool bMarkProt : 1; // marking forbidden, persistent
+ bool m_bMarkProt : 1; // marking forbidden, persistent
// on import of OLE object from MS documents the BLIP size might be retrieved,
// in this case the following member is initialized as nonempty rectangle
tools::Rectangle maBLIPSizeRectangle;
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 74c473e09e76..4e9738bc2906 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -65,7 +65,7 @@ protected:
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 (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } }
+ void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!m_aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } }
void UndirtyText() const;
virtual std::unique_ptr<SdrObjGeoData> NewGeoData() const override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 8d013d77ec8c..61a63f660950 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -336,7 +336,7 @@ public:
// Setting attributes can only be done on the text frame.
void SetTextLink(const OUString& rFileName, const OUString& rFilterName);
void ReleaseTextLink();
- bool IsLinkedText() const { return pPlusData!=nullptr && GetLinkUserData()!=nullptr; }
+ bool IsLinkedText() const { return m_pPlusData!=nullptr && GetLinkUserData()!=nullptr; }
bool ReloadLinkedText(bool bForceLoad);
bool LoadText(const OUString& rFileName, rtl_TextEncoding eCharSet);
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 441e3271d34d..f12780305615 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -57,8 +57,8 @@ E3dObject::E3dObject(SdrModel& rSdrModel)
mbTfHasChanged(true),
mbIsSelected(false)
{
- bIs3DObj = true;
- bClosedObj = true;
+ m_bIs3DObj = true;
+ m_bClosedObj = true;
}
E3dObject::E3dObject(SdrModel& rSdrModel, E3dObject const & rSource)
@@ -69,8 +69,8 @@ E3dObject::E3dObject(SdrModel& rSdrModel, E3dObject const & rSource)
mbTfHasChanged(true),
mbIsSelected(false)
{
- bIs3DObj = true;
- bClosedObj = true;
+ m_bIs3DObj = true;
+ m_bClosedObj = true;
// BoundVol can be copied since also the children are copied
maLocalBoundVol = rSource.maLocalBoundVol;
@@ -375,7 +375,7 @@ void E3dObject::SetTransform(const basegfx::B3DHomMatrix& rMatrix)
NbcSetTransform(rMatrix);
SetChanged();
BroadcastObjectChange();
- if (pUserCall != nullptr) pUserCall->Changed(*this, SdrUserCallType::Resize, tools::Rectangle());
+ if (m_pUserCall != nullptr) m_pUserCall->Changed(*this, SdrUserCallType::Resize, tools::Rectangle());
}
}
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 5b09cd9660f8..0589b1cc9e73 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -529,8 +529,8 @@ void E3dScene::RotateScene (const Point& rRef, double sn, double cs)
{
Point UpperLeft, LowerRight, Center, NewCenter;
- UpperLeft = aOutRect.TopLeft();
- LowerRight = aOutRect.BottomRight();
+ UpperLeft = m_aOutRect.TopLeft();
+ LowerRight = m_aOutRect.BottomRight();
tools::Long dxOutRectHalf = std::abs(UpperLeft.X() - LowerRight.X());
dxOutRectHalf /= 2;
@@ -709,7 +709,7 @@ bool E3dScene::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
NbcSetSnapRect(aRect1);
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
return true;
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0db559b15eea..88058049cf4e 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -791,7 +791,7 @@ SdrObjCustomShape::SdrObjCustomShape(SdrModel& rSdrModel)
, mbAdjustingTextFrameWidthAndHeight(false)
, mpLastShadowGeometry(nullptr)
{
- bClosedObj = true; // custom shapes may be filled
+ m_bClosedObj = true; // custom shapes may be filled
bTextFrame = true;
}
@@ -801,7 +801,7 @@ SdrObjCustomShape::SdrObjCustomShape(SdrModel& rSdrModel, SdrObjCustomShape cons
, mbAdjustingTextFrameWidthAndHeight(false)
, mpLastShadowGeometry(nullptr)
{
- bClosedObj = true; // custom shapes may be filled
+ m_bClosedObj = true; // custom shapes may be filled
bTextFrame = true;
fObjectRotation = rSource.fObjectRotation;
@@ -1429,7 +1429,7 @@ void SdrObjCustomShape::NbcSetSnapRect( const tools::Rectangle& rRect )
void SdrObjCustomShape::SetSnapRect( const tools::Rectangle& rRect )
{
tools::Rectangle aBoundRect0;
- if ( pUserCall )
+ if ( m_pUserCall )
aBoundRect0 = GetLastBoundRect();
NbcSetSnapRect( rRect );
BroadcastObjectChange();
@@ -1451,7 +1451,7 @@ void SdrObjCustomShape::NbcSetLogicRect( const tools::Rectangle& rRect )
void SdrObjCustomShape::SetLogicRect( const tools::Rectangle& rRect )
{
tools::Rectangle aBoundRect0;
- if ( pUserCall )
+ if ( m_pUserCall )
aBoundRect0 = GetLastBoundRect();
NbcSetLogicRect(rRect);
BroadcastObjectChange();
@@ -1463,7 +1463,7 @@ void SdrObjCustomShape::Move( const Size& rSiz )
if ( rSiz.Width() || rSiz.Height() )
{
tools::Rectangle aBoundRect0;
- if ( pUserCall )
+ if ( m_pUserCall )
aBoundRect0 = GetLastBoundRect();
NbcMove(rSiz);
SetChanged();
@@ -1814,9 +1814,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
// GluePointList should not be set, but we delivered by using GetGluePointList(),
// maybe on demand. Since the local object is changed here, this is assumed to
// be a result of GetGluePointList and thus the list is copied
- if(pPlusData)
+ if(m_pPlusData)
{
- pPlusData->SetGluePoints(aNewList);
+ m_pPlusData->SetGluePoints(aNewList);
}
}
@@ -2034,7 +2034,7 @@ void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point& rDestination,
sal_Int32 nYDiff = aPt.Y - aInteractionHandle.aPosition.Y;
maRect.Move( nXDiff, nYDiff );
- aOutRect.Move( nXDiff, nYDiff );
+ m_aOutRect.Move( nXDiff, nYDiff );
maSnapRect.Move( nXDiff, nYDiff );
SetRectsDirty(true);
InvalidateRenderGeometry();
@@ -2136,7 +2136,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
}
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
}
bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
@@ -2484,7 +2484,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight()
if ( bRet )
{
tools::Rectangle aBoundRect0;
- if ( pUserCall )
+ if ( m_pUserCall )
aBoundRect0 = GetCurrentBoundRect();
// taking care of handles that should not been changed
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 91c3c8de8324..be2f169b4b63 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -48,10 +48,10 @@ SdrAttrObj::~SdrAttrObj() {}
const tools::Rectangle& SdrAttrObj::GetSnapRect() const
{
- if (bSnapRectDirty)
+ if (m_bSnapRectDirty)
{
const_cast<SdrAttrObj*>(this)->RecalcSnapRect();
- const_cast<SdrAttrObj*>(this)->bSnapRectDirty = false;
+ const_cast<SdrAttrObj*>(this)->m_bSnapRectDirty = false;
}
return maSnapRect;
@@ -89,7 +89,7 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const
bool SdrAttrObj::HasFill() const
{
- return bClosedObj
+ return m_bClosedObj
&& GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE).GetValue()
!= drawing::FillStyle_NONE;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8b4dccd1c2e0..8a30af0054e5 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -312,7 +312,7 @@ SdrObjList* SdrObject::getChildrenOfSdrObject() const
void SdrObject::SetBoundRectDirty()
{
- aOutRect = tools::Rectangle();
+ m_aOutRect = tools::Rectangle();
}
#ifdef DBG_UTIL
@@ -333,24 +333,24 @@ void impRemoveIncarnatedSdrObjectToSdrModel(const SdrObject& rSdrObject, SdrMode
SdrObject::SdrObject(SdrModel& rSdrModel)
: mpFillGeometryDefiningShape(nullptr)
,mrSdrModelFromSdrObject(rSdrModel)
- ,pUserCall(nullptr)
+ ,m_pUserCall(nullptr)
,mpImpl(new Impl)
,mpParentOfSdrObject(nullptr)
- ,nOrdNum(0)
+ ,m_nOrdNum(0)
,mnNavigationPosition(SAL_MAX_UINT32)
,mnLayerID(0)
,mpSvxShape( nullptr )
,maWeakUnoShape()
,mbDoNotInsertIntoPageAutomatically(false)
{
- bVirtObj =false;
- bSnapRectDirty =true;
- bMovProt =false;
- bSizProt =false;
- bNoPrint =false;
- bEmptyPresObj =false;
- bNotVisibleAsMaster=false;
- bClosedObj =false;
+ m_bVirtObj =false;
+ m_bSnapRectDirty =true;
+ m_bMovProt =false;
+ m_bSizProt =false;
+ m_bNoPrint =false;
+ m_bEmptyPresObj =false;
+ m_bNotVisibleAsMaster=false;
+ m_bClosedObj =false;
mbVisible = true;
// #i25616#
@@ -359,10 +359,10 @@ SdrObject::SdrObject(SdrModel& rSdrModel)
// #i25616#
mbSupportTextIndentingOnLineWidthChange = false;
- bIsEdge=false;
- bIs3DObj=false;
- bMarkProt=false;
- bIsUnoObj=false;
+ m_bIsEdge=false;
+ m_bIs3DObj=false;
+ m_bMarkProt=false;
+ m_bIsUnoObj=false;
#ifdef DBG_UTIL
// SdrObjectLifetimeWatchDog:
impAddIncarnatedSdrObjectToSdrModel(*this, getSdrModelFromSdrObject());
@@ -372,24 +372,24 @@ SdrObject::SdrObject(SdrModel& rSdrModel)
SdrObject::SdrObject(SdrModel& rSdrModel, SdrObject const & rSource)
: mpFillGeometryDefiningShape(nullptr)
,mrSdrModelFromSdrObject(rSdrModel)
- ,pUserCall(nullptr)
+ ,m_pUserCall(nullptr)
,mpImpl(new Impl)
,mpParentOfSdrObject(nullptr)
- ,nOrdNum(0)
+ ,m_nOrdNum(0)
,mnNavigationPosition(SAL_MAX_UINT32)
,mnLayerID(0)
,mpSvxShape( nullptr )
,maWeakUnoShape()
,mbDoNotInsertIntoPageAutomatically(false)
{
- bVirtObj =false;
- bSnapRectDirty =true;
- bMovProt =false;
- bSizProt =false;
- bNoPrint =false;
- bEmptyPresObj =false;
- bNotVisibleAsMaster=false;
- bClosedObj =false;
+ m_bVirtObj =false;
+ m_bSnapRectDirty =true;
+ m_bMovProt =false;
+ m_bSizProt =false;
+ m_bNoPrint =false;
+ m_bEmptyPresObj =false;
+ m_bNotVisibleAsMaster=false;
+ m_bClosedObj =false;
mbVisible = true;
// #i25616#
@@ -398,10 +398,10 @@ SdrObject::SdrObject(SdrModel& rSdrModel, SdrObject const & rSource)
// #i25616#
mbSupportTextIndentingOnLineWidthChange = false;
- bIsEdge=false;
- bIs3DObj=false;
- bMarkProt=false;
- bIsUnoObj=false;
+ m_bIsEdge=false;
+ m_bIs3DObj=false;
+ m_bMarkProt=false;
+ m_bIsUnoObj=false;
#ifdef DBG_UTIL
// SdrObjectLifetimeWatchDog:
impAddIncarnatedSdrObjectToSdrModel(*this, getSdrModelFromSdrObject());
@@ -415,29 +415,29 @@ SdrObject::SdrObject(SdrModel& rSdrModel, SdrObject const & rSource)
// draw object, an SdrObject needs to be provided, as in the normal constructor.
mpProperties = rSource.GetProperties().Clone(*this);
- aOutRect=rSource.aOutRect;
+ m_aOutRect=rSource.m_aOutRect;
mnLayerID = rSource.mnLayerID;
- aAnchor =rSource.aAnchor;
- bVirtObj=rSource.bVirtObj;
- bSizProt=rSource.bSizProt;
- bMovProt=rSource.bMovProt;
- bNoPrint=rSource.bNoPrint;
+ m_aAnchor =rSource.m_aAnchor;
+ m_bVirtObj=rSource.m_bVirtObj;
+ m_bSizProt=rSource.m_bSizProt;
+ m_bMovProt=rSource.m_bMovProt;
+ m_bNoPrint=rSource.m_bNoPrint;
mbVisible=rSource.mbVisible;
- bMarkProt=rSource.bMarkProt;
- bEmptyPresObj =rSource.bEmptyPresObj;
- bNotVisibleAsMaster=rSource.bNotVisibleAsMaster;
- bSnapRectDirty=true;
- pPlusData.reset();
- if (rSource.pPlusData!=nullptr) {
- pPlusData.reset(rSource.pPlusData->Clone(this));
+ m_bMarkProt=rSource.m_bMarkProt;
+ m_bEmptyPresObj =rSource.m_bEmptyPresObj;
+ m_bNotVisibleAsMaster=rSource.m_bNotVisibleAsMaster;
+ m_bSnapRectDirty=true;
+ m_pPlusData.reset();
+ if (rSource.m_pPlusData!=nullptr) {
+ m_pPlusData.reset(rSource.m_pPlusData->Clone(this));
}
- if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) {
- pPlusData->pBroadcast.reset(); // broadcaster isn't copied
+ if (m_pPlusData!=nullptr && m_pPlusData->pBroadcast!=nullptr) {
+ m_pPlusData->pBroadcast.reset(); // broadcaster isn't copied
}
- pGrabBagItem.reset();
- if (rSource.pGrabBagItem!=nullptr)
- pGrabBagItem.reset(rSource.pGrabBagItem->Clone());
+ m_pGrabBagItem.reset();
+ if (rSource.m_pGrabBagItem!=nullptr)
+ m_pGrabBagItem.reset(rSource.m_pGrabBagItem->Clone());
}
SdrObject::~SdrObject()
@@ -455,9 +455,9 @@ SdrObject::~SdrObject()
// UserCall
SendUserCall(SdrUserCallType::Delete, GetLastBoundRect());
- o3tl::reset_preserve_ptr_during(pPlusData);
+ o3tl::reset_preserve_ptr_during(m_pPlusData);
- pGrabBagItem.reset();
+ m_pGrabBagItem.reset();
mpProperties.reset();
mpViewContact.reset();
@@ -511,7 +511,7 @@ void SdrObject::SetRectsDirty(bool bNotMyself, bool bRecursive)
if (!bNotMyself)
{
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
}
if (bRecursive && nullptr != getParentSdrObjListFromSdrObject())
@@ -680,27 +680,27 @@ void SdrObject::SetLayer(SdrLayerID nLayer)
void SdrObject::AddListener(SfxListener& rListener)
{
ImpForcePlusData();
- if (pPlusData->pBroadcast==nullptr) pPlusData->pBroadcast.reset(new SfxBroadcaster);
+ if (m_pPlusData->pBroadcast==nullptr) m_pPlusData->pBroadcast.reset(new SfxBroadcaster);
// SdrEdgeObj may be connected to same SdrObject on both ends so allow it
// to listen twice
SdrEdgeObj const*const pEdge(dynamic_cast<SdrEdgeObj const*>(&rListener));
- rListener.StartListening(*pPlusData->pBroadcast, pEdge ? DuplicateHandling::Allow : DuplicateHandling::Unexpected);
+ rListener.StartListening(*m_pPlusData->pBroadcast, pEdge ? DuplicateHandling::Allow : DuplicateHandling::Unexpected);
}
void SdrObject::RemoveListener(SfxListener& rListener)
{
- if (pPlusData!=nullptr && pPlusData->pBroadcast!=nullptr) {
- rListener.EndListening(*pPlusData->pBroadcast);
- if (!pPlusData->pBroadcast->HasListeners()) {
- pPlusData->pBroadcast.reset();
+ if (m_pPlusData!=nullptr && m_pPlusData->pBroadcast!=nullptr) {
+ rListener.EndListening(*m_pPlusData->pBroadcast);
+ if (!m_pPlusData->pBroadcast->HasListeners()) {
+ m_pPlusData->pBroadcast.reset();
}
}
}
const SfxBroadcaster* SdrObject::GetBroadcaster() const
{
- return pPlusData!=nullptr ? pPlusData->pBroadcast.get() : nullptr;
+ return m_pPlusData!=nullptr ? m_pPlusData->pBroadcast.get() : nullptr;
}
void SdrObject::AddReference(SdrVirtObj& rVrtObj)
@@ -737,12 +737,12 @@ SdrObject* SdrObject::getParentSdrObjectFromSdrObject() const
void SdrObject::SetName(const OUString& rStr, const bool bSetChanged)
{
- if (!rStr.isEmpty() && !pPlusData)
+ if (!rStr.isEmpty() && !m_pPlusData)
{
ImpForcePlusData();
}
- if(!(pPlusData && pPlusData->aObjName != rStr))
+ if(!(m_pPlusData && m_pPlusData->aObjName != rStr))
return;
// Undo/Redo for setting object's name (#i73249#)
@@ -759,7 +759,7 @@ void SdrObject::SetName(const OUString& rStr, const bool bSetChanged)
getSdrModelFromSdrObject().BegUndo( pUndoAction->GetComment() );
getSdrModelFromSdrObject().AddUndo( std::move(pUndoAction) );
}
- pPlusData->aObjName = rStr;
+ m_pPlusData->aObjName = rStr;
// Undo/Redo for setting object's name (#i73249#)
if ( bUndo )
{
@@ -774,9 +774,9 @@ void SdrObject::SetName(const OUString& rStr, const bool bSetChanged)
OUString SdrObject::GetName() const
{
- if(pPlusData)
+ if(m_pPlusData)
{
- return pPlusData->aObjName;
+ return m_pPlusData->aObjName;
}
return OUString();
@@ -784,12 +784,12 @@ OUString SdrObject::GetName() const
void SdrObject::SetTitle(const OUString& rStr)
{
- if (!rStr.isEmpty() && !pPlusData)
+ if (!rStr.isEmpty() && !m_pPlusData)
{
ImpForcePlusData();
}
- if(!(pPlusData && pPlusData->aObjTitle != rStr))
+ if(!(m_pPlusData && m_pPlusData->aObjTitle != rStr))
return;
// Undo/Redo for setting object's title (#i73249#)
@@ -806,7 +806,7 @@ void SdrObject::SetTitle(const OUString& rStr)
getSdrModelFromSdrObject().BegUndo( pUndoAction->GetComment() );
getSdrModelFromSdrObject().AddUndo( std::move(pUndoAction) );
}
- pPlusData->aObjTitle = rStr;
+ m_pPlusData->aObjTitle = rStr;
// Undo/Redo for setting object's title (#i73249#)
if ( bUndo )
{
@@ -818,9 +818,9 @@ void SdrObject::SetTitle(const OUString& rStr)
OUString SdrObject::GetTitle() const
{
- if(pPlusData)
+ if(m_pPlusData)
{
- return pPlusData->aObjTitle;
+ return m_pPlusData->aObjTitle;
}
return OUString();
@@ -828,12 +828,12 @@ OUString SdrObject::GetTitle() const
void SdrObject::SetDescription(const OUString& rStr)
{
- if (!rStr.isEmpty() && !pPlusData)
+ if (!rStr.isEmpty() && !m_pPlusData)
{
ImpForcePlusData();
}
- if(!(pPlusData && pPlusData->aObjDescription != rStr))
+ if(!(m_pPlusData && m_pPlusData->aObjDescription != rStr))
return;
// Undo/Redo for setting object's description (#i73249#)
@@ -850,7 +850,7 @@ void SdrObject::SetDescription(const OUString& rStr)
getSdrModelFromSdrObject().BegUndo( pUndoAction->GetComment() );
getSdrModelFromSdrObject().AddUndo( std::move(pUndoAction) );
}
- pPlusData->aObjDescription = rStr;
+ m_pPlusData->aObjDescription = rStr;
// Undo/Redo for setting object's description (#i73249#)
if ( bUndo )
{
@@ -862,9 +862,9 @@ void SdrObject::SetDescription(const OUString& rStr)
OUString SdrObject::GetDescription() const
{
- if(pPlusData)
+ if(m_pPlusData)
{
- return pPlusData->aObjDescription;
+ return m_pPlusData->aObjDescription;
}
return OUString();
@@ -878,30 +878,30 @@ sal_uInt32 SdrObject::GetOrdNum() const
{
getParentSdrObjListFromSdrObject()->RecalcObjOrdNums();
}
- } else const_cast<SdrObject*>(this)->nOrdNum=0;
- return nOrdNum;
+ } else const_cast<SdrObject*>(this)->m_nOrdNum=0;
+ return m_nOrdNum;
}
void SdrObject::SetOrdNum(sal_uInt32 nNum)
{
- nOrdNum = nNum;
+ m_nOrdNum = nNum;
}
void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const
{
- if (pGrabBagItem != nullptr)
- pGrabBagItem->QueryValue(rVal);
+ if (m_pGrabBagItem != nullptr)
+ m_pGrabBagItem->QueryValue(rVal);
else
rVal <<= uno::Sequence<beans::PropertyValue>();
}
void SdrObject::SetGrabBagItem(const css::uno::Any& rVal)
{
- if (pGrabBagItem == nullptr)
- pGrabBagItem.reset(new SfxGrabBagItem);
+ if (m_pGrabBagItem == nullptr)
+ m_pGrabBagItem.reset(new SfxGrabBagItem);
- pGrabBagItem->PutValue(rVal, 0);
+ m_pGrabBagItem->PutValue(rVal, 0);
SetChanged();
BroadcastObjectChange();
@@ -930,12 +930,12 @@ void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition)
// GetCurrentBoundRect().
const tools::Rectangle& SdrObject::GetCurrentBoundRect() const
{
- if(aOutRect.IsEmpty())
+ if(m_aOutRect.IsEmpty())
{
const_cast< SdrObject* >(this)->RecalcBoundRect();
}
- return aOutRect;
+ return m_aOutRect;
}
// To have a possibility to get the last calculated BoundRect e.g for producing
@@ -944,7 +944,7 @@ const tools::Rectangle& SdrObject::GetCurrentBoundRect() const
// a new method for accessing the last BoundRect.
const tools::Rectangle& SdrObject::GetLastBoundRect() const
{
- return aOutRect;
+ return m_aOutRect;
}
void SdrObject::RecalcBoundRect()
@@ -954,7 +954,7 @@ void SdrObject::RecalcBoundRect()
return;
// central new method which will calculate the BoundRect using primitive geometry
- if(!aOutRect.IsEmpty())
+ if(!m_aOutRect.IsEmpty())
return;
// Use view-independent data - we do not want any connections
@@ -970,7 +970,7 @@ void SdrObject::RecalcBoundRect()
if(!aRange.isEmpty())
{
- aOutRect = tools::Rectangle(
+ m_aOutRect = tools::Rectangle(
static_cast<tools::Long>(floor(aRange.getMinX())),
static_cast<tools::Long>(floor(aRange.getMinY())),
static_cast<tools::Long>(ceil(aRange.getMaxX())),
@@ -984,7 +984,7 @@ void SdrObject::BroadcastObjectChange() const
if ((getSdrModelFromSdrObject().isLocked()) || utl::ConfigManager::IsFuzzing())
return;
- bool bPlusDataBroadcast(pPlusData && pPlusData->pBroadcast);
+ bool bPlusDataBroadcast(m_pPlusData && m_pPlusData->pBroadcast);
bool bObjectChange(IsInserted());
if(!(bPlusDataBroadcast || bObjectChange))
@@ -994,7 +994,7 @@ void SdrObject::BroadcastObjectChange() const
if(bPlusDataBroadcast)
{
- pPlusData->pBroadcast->Broadcast(aHint);
+ m_pPlusData->pBroadcast->Broadcast(aHint);
}
if(bObjectChange)
@@ -1093,8 +1093,8 @@ OUString SdrObject::ImpGetDescriptionStr(const char* pStrCacheID) const
void SdrObject::ImpForcePlusData()
{
- if (!pPlusData)
- pPlusData.reset( new SdrObjPlusData );
+ if (!m_pPlusData)
+ m_pPlusData.reset( new SdrObjPlusData );
}
OUString SdrObject::GetMetrStr(tools::Long nVal) const
@@ -1362,23 +1362,23 @@ bool SdrObject::BegCreate(SdrDragStat& rStat)
tools::Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
aRect1.Justify();
rStat.SetActionRect(aRect1);
- aOutRect = aRect1;
+ m_aOutRect = aRect1;
return true;
}
bool SdrObject::MovCreate(SdrDragStat& rStat)
{
- rStat.TakeCreateRect(aOutRect);
- rStat.SetActionRect(aOutRect);
- aOutRect.Justify();
+ rStat.TakeCreateRect(m_aOutRect);
+ rStat.SetActionRect(m_aOutRect);
+ m_aOutRect.Justify();
return true;
}
bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
- rStat.TakeCreateRect(aOutRect);
- aOutRect.Justify();
+ rStat.TakeCreateRect(m_aOutRect);
+ m_aOutRect.Justify();
return (eCmd==SdrCreateCmd::ForceEnd || rStat.GetPointCount()>=2);
}
@@ -1411,7 +1411,7 @@ PointerStyle SdrObject::GetCreatePointer() const
// transformations
void SdrObject::NbcMove(const Size& rSiz)
{
- aOutRect.Move(rSiz);
+ m_aOutRect.Move(rSiz);
SetRectsDirty();
}
@@ -1432,7 +1432,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
NbcMirrorGluePoints(aRef1,aRef2);
}
}
- ResizeRect(aOutRect,rRef,xFact,yFact);
+ ResizeRect(m_aOutRect,rRef,xFact,yFact);
SetRectsDirty();
}
@@ -1448,26 +1448,26 @@ void SdrObject::NbcRotate(const Point& rRef, Degree100 nAngle)
void SdrObject::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
SetGlueReallyAbsolute(true);
- aOutRect.Move(-rRef.X(),-rRef.Y());
- tools::Rectangle R(aOutRect);
+ m_aOutRect.Move(-rRef.X(),-rRef.Y());
+ tools::Rectangle R(m_aOutRect);
if (sn==1.0 && cs==0.0) { // 90deg
- aOutRect.SetLeft(-R.Bottom() );
- aOutRect.SetRight(-R.Top() );
- aOutRect.SetTop(R.Left() );
- aOutRect.SetBottom(R.Right() );
+ m_aOutRect.SetLeft(-R.Bottom() );
+ m_aOutRect.SetRight(-R.Top() );
+ m_aOutRect.SetTop(R.Left() );
+ m_aOutRect.SetBottom(R.Right() );
} else if (sn==0.0 && cs==-1.0) { // 180deg
- aOutRect.SetLeft(-R.Right() );
- aOutRect.SetRight(-R.Left() );
- aOutRect.SetTop(-R.Bottom() );
- aOutRect.SetBottom(-R.Top() );
+ m_aOutRect.SetLeft(-R.Right() );
+ m_aOutRect.SetRight(-R.Left() );
+ m_aOutRect.SetTop(-R.Bottom() );
+ m_aOutRect.SetBottom(-R.Top() );
} else if (sn==-1.0 && cs==0.0) { // 270deg
- aOutRect.SetLeft(R.Top() );
- aOutRect.SetRight(R.Bottom() );
- aOutRect.SetTop(-R.Right() );
- aOutRect.SetBottom(-R.Left() );
+ m_aOutRect.SetLeft(R.Top() );
+ m_aOutRect.SetRight(R.Bottom() );
+ m_aOutRect.SetTop(-R.Right() );
+ m_aOutRect.SetBottom(-R.Left() );
}
- aOutRect.Move(rRef.X(),rRef.Y());
- aOutRect.Justify(); // just in case
+ m_aOutRect.Move(rRef.X(),rRef.Y());
+ m_aOutRect.Justify(); // just in case
SetRectsDirty();
NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
@@ -1476,29 +1476,29 @@ void SdrObject::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, doubl
void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
{
SetGlueReallyAbsolute(true);
- aOutRect.Move(-rRef1.X(),-rRef1.Y());
- tools::Rectangle R(aOutRect);
+ m_aOutRect.Move(-rRef1.X(),-rRef1.Y());
+ tools::Rectangle R(m_aOutRect);
tools::Long dx=rRef2.X()-rRef1.X();
tools::Long dy=rRef2.Y()-rRef1.Y();
if (dx==0) { // vertical axis
- aOutRect.SetLeft(-R.Right() );
- aOutRect.SetRight(-R.Left() );
+ m_aOutRect.SetLeft(-R.Right() );
+ m_aOutRect.SetRight(-R.Left() );
} else if (dy==0) { // horizontal axis
- aOutRect.SetTop(-R.Bottom() );
- aOutRect.SetBottom(-R.Top() );
+ m_aOutRect.SetTop(-R.Bottom() );
+ m_aOutRect.SetBottom(-R.Top() );
} else if (dx==dy) { // 45deg axis
- aOutRect.SetLeft(R.Top() );
- aOutRect.SetRight(R.Bottom() );
- aOutRect.SetTop(R.Left() );
- aOutRect.SetBottom(R.Right() );
+ m_aOutRect.SetLeft(R.Top() );
+ m_aOutRect.SetRight(R.Bottom() );
+ m_aOutRect.SetTop(R.Left() );
+ m_aOutRect.SetBottom(R.Right() );
} else if (dx==-dy) { // 45deg axis
- aOutRect.SetLeft(-R.Bottom() );
- aOutRect.SetRight(-R.Top() );
- aOutRect.SetTop(-R.Right() );
- aOutRect.SetBottom(-R.Left() );
+ m_aOutRect.SetLeft(-R.Bottom() );
+ m_aOutRect.SetRight(-R.Top() );
+ m_aOutRect.SetTop(-R.Right() );
+ m_aOutRect.SetBottom(-R.Left() );
}
- aOutRect.Move(rRef1.X(),rRef1.Y());
- aOutRect.Justify(); // just in case
+ m_aOutRect.Move(rRef1.X(),rRef1.Y());
+ m_aOutRect.Justify(); // just in case
SetRectsDirty();
NbcMirrorGluePoints(rRef1,rRef2);
SetGlueReallyAbsolute(false);
@@ -1514,7 +1514,7 @@ void SdrObject::NbcShear(const Point& rRef, Degree100 /*nAngle*/, double tn, boo
void SdrObject::Move(const Size& rSiz)
{
if (rSiz.Width()!=0 || rSiz.Height()!=0) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
@@ -1540,7 +1540,7 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction&
mpImpl->meRelativeHeightRelation = text::RelOrientation::PAGE_FRAME;
mpImpl->mnRelativeHeight.reset();
}
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcResize(rRef,xFact,yFact);
SetChanged();
BroadcastObjectChange();
@@ -1549,7 +1549,7 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction&
void SdrObject::Crop(const basegfx::B2DPoint& rRef, double fxFact, double fyFact)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcCrop(rRef, fxFact, fyFact);
SetChanged();
BroadcastObjectChange();
@@ -1559,7 +1559,7 @@ void SdrObject::Crop(const basegfx::B2DPoint& rRef, double fxFact, double fyFact
void SdrObject::Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
if (nAngle) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcRotate(rRef,nAngle,sn,cs);
SetChanged();
BroadcastObjectChange();
@@ -1569,7 +1569,7 @@ void SdrObject::Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs
void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcMirror(rRef1,rRef2);
SetChanged();
BroadcastObjectChange();
@@ -1579,7 +1579,7 @@ void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
void SdrObject::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear)
{
if (nAngle) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcShear(rRef,nAngle,tn,bVShear);
SetChanged();
BroadcastObjectChange();
@@ -1589,7 +1589,7 @@ void SdrObject::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVShe
void SdrObject::NbcSetRelativePos(const Point& rPnt)
{
- Point aRelPos0(GetSnapRect().TopLeft()-aAnchor);
+ Point aRelPos0(GetSnapRect().TopLeft()-m_aAnchor);
Size aSiz(rPnt.X()-aRelPos0.X(),rPnt.Y()-aRelPos0.Y());
NbcMove(aSiz); // This also calls SetRectsDirty()
}
@@ -1597,7 +1597,7 @@ void SdrObject::NbcSetRelativePos(const Point& rPnt)
void SdrObject::SetRelativePos(const Point& rPnt)
{
if (rPnt!=GetRelativePos()) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetRelativePos(rPnt);
SetChanged();
BroadcastObjectChange();
@@ -1607,25 +1607,25 @@ void SdrObject::SetRelativePos(const Point& rPnt)
Point SdrObject::GetRelativePos() const
{
- return GetSnapRect().TopLeft()-aAnchor;
+ return GetSnapRect().TopLeft()-m_aAnchor;
}
void SdrObject::ImpSetAnchorPos(const Point& rPnt)
{
- aAnchor = rPnt;
+ m_aAnchor = rPnt;
}
void SdrObject::NbcSetAnchorPos(const Point& rPnt)
{
- Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
- aAnchor=rPnt;
+ Size aSiz(rPnt.X()-m_aAnchor.X(),rPnt.Y()-m_aAnchor.Y());
+ m_aAnchor=rPnt;
NbcMove(aSiz); // This also calls SetRectsDirty()
}
void SdrObject::SetAnchorPos(const Point& rPnt)
{
- if (rPnt!=aAnchor) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ if (rPnt!=m_aAnchor) {
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetAnchorPos(rPnt);
SetChanged();
BroadcastObjectChange();
@@ -1635,7 +1635,7 @@ void SdrObject::SetAnchorPos(const Point& rPnt)
const Point& SdrObject::GetAnchorPos() const
{
- return aAnchor;
+ return m_aAnchor;
}
void SdrObject::RecalcSnapRect()
@@ -1644,12 +1644,12 @@ void SdrObject::RecalcSnapRect()
const tools::Rectangle& SdrObject::GetSnapRect() const
{
- return aOutRect;
+ return m_aOutRect;
}
void SdrObject::NbcSetSnapRect(const tools::Rectangle& rRect)
{
- aOutRect=rRect;
+ m_aOutRect=rRect;
}
const tools::Rectangle& SdrObject::GetLogicRect() const
@@ -1669,7 +1669,7 @@ void SdrObject::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool /* bShri
void SdrObject::SetSnapRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetSnapRect(rRect);
SetChanged();
BroadcastObjectChange();
@@ -1678,7 +1678,7 @@ void SdrObject::SetSnapRect(const tools::Rectangle& rRect)
void SdrObject::SetLogicRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetLogicRect(rRect);
SetChanged();
BroadcastObjectChange();
@@ -1722,7 +1722,7 @@ Point SdrObject::GetPoint(sal_uInt32 /*i*/) const
void SdrObject::SetPoint(const Point& rPnt, sal_uInt32 i)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetPoint(rPnt, i);
SetChanged();
BroadcastObjectChange();
@@ -1740,14 +1740,14 @@ bool SdrObject::HasTextEdit() const
bool SdrObject::Equals(const SdrObject& rOtherObj) const
{
- return (aAnchor.X() == rOtherObj.aAnchor.X() && aAnchor.Y() == rOtherObj.aAnchor.Y() &&
- nOrdNum == rOtherObj.nOrdNum && mnNavigationPosition == rOtherObj.mnNavigationPosition &&
+ return (m_aAnchor.X() == rOtherObj.m_aAnchor.X() && m_aAnchor.Y() == rOtherObj.m_aAnchor.Y() &&
+ m_nOrdNum == rOtherObj.m_nOrdNum && mnNavigationPosition == rOtherObj.mnNavigationPosition &&
mbSupportTextIndentingOnLineWidthChange == rOtherObj.mbSupportTextIndentingOnLineWidthChange &&
- mbLineIsOutsideGeometry == rOtherObj.mbLineIsOutsideGeometry && bMarkProt == rOtherObj.bMarkProt &&
- bIs3DObj == rOtherObj.bIs3DObj && bIsEdge == rOtherObj.bIsEdge && bClosedObj == rOtherObj.bClosedObj &&
- bNotVisibleAsMaster == rOtherObj.bNotVisibleAsMaster && bEmptyPresObj == rOtherObj.bEmptyPresObj &&
- mbVisible == rOtherObj.mbVisible && bNoPrint == rOtherObj.bNoPrint && bSizProt == rOtherObj.bSizProt &&
- bMovProt == rOtherObj.bMovProt && bVirtObj == rOtherObj.bVirtObj &&
+ mbLineIsOutsideGeometry == rOtherObj.mbLineIsOutsideGeometry && m_bMarkProt == rOtherObj.m_bMarkProt &&
+ m_bIs3DObj == rOtherObj.m_bIs3DObj && m_bIsEdge == rOtherObj.m_bIsEdge && m_bClosedObj == rOtherObj.m_bClosedObj &&
+ m_bNotVisibleAsMaster == rOtherObj.m_bNotVisibleAsMaster && m_bEmptyPresObj == rOtherObj.m_bEmptyPresObj &&
+ mbVisible == rOtherObj.mbVisible && m_bNoPrint == rOtherObj.m_bNoPrint && m_bSizProt == rOtherObj.m_bSizProt &&
+ m_bMovProt == rOtherObj.m_bMovProt && m_bVirtObj == rOtherObj.m_bVirtObj &&
mnLayerID == rOtherObj.mnLayerID && GetMergedItemSet().Equals(rOtherObj.GetMergedItemSet(), false) );
}
@@ -1760,11 +1760,11 @@ void SdrObject::dumpAsXml(xmlTextWriterPtr pWriter) const
(void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("title"), "%s", BAD_CAST(GetTitle().toUtf8().getStr()));
(void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("description"), "%s", BAD_CAST(GetDescription().toUtf8().getStr()));
(void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("nOrdNum"), "%" SAL_PRIuUINT32, GetOrdNumDirect());
- (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aOutRect"), BAD_CAST(aOutRect.toString().getStr()));
+ (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aOutRect"), BAD_CAST(m_aOutRect.toString().getStr()));
- if (pGrabBagItem)
+ if (m_pGrabBagItem)
{
- pGrabBagItem->dumpAsXml(pWriter);
+ m_pGrabBagItem->dumpAsXml(pWriter);
}
if (mpProperties)
@@ -1780,7 +1780,7 @@ void SdrObject::dumpAsXml(xmlTextWriterPtr pWriter) const
void SdrObject::SetOutlinerParaObject(std::unique_ptr<OutlinerParaObject> pTextObject)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetOutlinerParaObject(std::move(pTextObject));
SetChanged();
BroadcastObjectChange();
@@ -1883,20 +1883,20 @@ std::unique_ptr<SdrObjGeoData> SdrObject::NewGeoData() const
void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
{
rGeo.aBoundRect =GetCurrentBoundRect();
- rGeo.aAnchor =aAnchor ;
- rGeo.bMovProt =bMovProt ;
- rGeo.bSizProt =bSizProt ;
- rGeo.bNoPrint =bNoPrint ;
+ rGeo.aAnchor =m_aAnchor ;
+ rGeo.bMovProt =m_bMovProt ;
+ rGeo.bSizProt =m_bSizProt ;
+ rGeo.bNoPrint =m_bNoPrint ;
rGeo.mbVisible =mbVisible ;
- rGeo.bClosedObj =bClosedObj ;
+ rGeo.bClosedObj =m_bClosedObj ;
rGeo.mnLayerID = mnLayerID;
// user-defined glue points
- if (pPlusData!=nullptr && pPlusData->pGluePoints!=nullptr) {
+ if (m_pPlusData!=nullptr && m_pPlusData->pGluePoints!=nullptr) {
if (rGeo.pGPL!=nullptr) {
- *rGeo.pGPL=*pPlusData->pGluePoints;
+ *rGeo.pGPL=*m_pPlusData->pGluePoints;
} else {
- rGeo.pGPL.reset( new SdrGluePointList(*pPlusData->pGluePoints) );
+ rGeo.pGPL.reset( new SdrGluePointList(*m_pPlusData->pGluePoints) );
}
} else {
rGeo.pGPL.reset();
@@ -1906,26 +1906,26 @@ void SdrObject::SaveGeoData(SdrObjGeoData& rGeo) const
void SdrObject::RestoreGeoData(const SdrObjGeoData& rGeo)
{
SetRectsDirty();
- aOutRect =rGeo.aBoundRect ;
- aAnchor =rGeo.aAnchor ;
- bMovProt =rGeo.bMovProt ;
- bSizProt =rGeo.bSizProt ;
- bNoPrint =rGeo.bNoPrint ;
+ m_aOutRect =rGeo.aBoundRect ;
+ m_aAnchor =rGeo.aAnchor ;
+ m_bMovProt =rGeo.bMovProt ;
+ m_bSizProt =rGeo.bSizProt ;
+ m_bNoPrint =rGeo.bNoPrint ;
mbVisible =rGeo.mbVisible ;
- bClosedObj =rGeo.bClosedObj ;
+ m_bClosedObj =rGeo.bClosedObj ;
mnLayerID = rGeo.mnLayerID;
// user-defined glue points
if (rGeo.pGPL!=nullptr) {
ImpForcePlusData();
- if (pPlusData->pGluePoints!=nullptr) {
- *pPlusData->pGluePoints=*rGeo.pGPL;
+ if (m_pPlusData->pGluePoints!=nullptr) {
+ *m_pPlusData->pGluePoints=*rGeo.pGPL;
} else {
- pPlusData->pGluePoints.reset(new SdrGluePointList(*rGeo.pGPL));
+ m_pPlusData->pGluePoints.reset(new SdrGluePointList(*rGeo.pGPL));
}
} else {
- if (pPlusData!=nullptr && pPlusData->pGluePoints!=nullptr) {
- pPlusData->pGluePoints.reset();
+ if (m_pPlusData!=nullptr && m_pPlusData->pGluePoints!=nullptr) {
+ m_pPlusData->pGluePoints.reset();
}
}
}
@@ -1939,7 +1939,7 @@ std::unique_ptr<SdrObjGeoData> SdrObject::GetGeoData() const
void SdrObject::SetGeoData(const SdrObjGeoData& rGeo)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
RestoreGeoData(rGeo);
SetChanged();
BroadcastObjectChange();
@@ -2001,7 +2001,7 @@ void SdrObject::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClear
void SdrObject::ApplyNotPersistAttr(const SfxItemSet& rAttr)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcApplyNotPersistAttr(rAttr);
SetChanged();
BroadcastObjectChange();
@@ -2210,7 +2210,7 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHar
{
tools::Rectangle aBoundRect0;
- if(pUserCall)
+ if(m_pUserCall)
aBoundRect0 = GetLastBoundRect();
NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
@@ -2266,7 +2266,7 @@ SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const
const SdrGluePointList* SdrObject::GetGluePointList() const
{
- if (pPlusData!=nullptr) return pPlusData->pGluePoints.get();
+ if (m_pPlusData!=nullptr) return m_pPlusData->pGluePoints.get();
return nullptr;
}
@@ -2274,10 +2274,10 @@ const SdrGluePointList* SdrObject::GetGluePointList() const
SdrGluePointList* SdrObject::ForceGluePointList()
{
ImpForcePlusData();
- if (pPlusData->pGluePoints==nullptr) {
- pPlusData->pGluePoints.reset(new SdrGluePointList);
+ if (m_pPlusData->pGluePoints==nullptr) {
+ m_pPlusData->pGluePoints.reset(new SdrGluePointList);
}
- return pPlusData->pGluePoints.get();
+ return m_pPlusData->pGluePoints.get();
}
void SdrObject::SetGlueReallyAbsolute(bool bOn)
@@ -2516,19 +2516,19 @@ SdrObject* SdrObject::ImpConvertToContourObj(bool bForceLineDash)
void SdrObject::SetMarkProtect(bool bProt)
{
- bMarkProt = bProt;
+ m_bMarkProt = bProt;
}
void SdrObject::SetEmptyPresObj(bool bEpt)
{
- bEmptyPresObj = bEpt;
+ m_bEmptyPresObj = bEpt;
}
void SdrObject::SetNotVisibleAsMaster(bool bFlg)
{
- bNotVisibleAsMaster=bFlg;
+ m_bNotVisibleAsMaster=bFlg;
}
@@ -2611,10 +2611,10 @@ void SdrObject::InsertedStateChange()
SendUserCall(SdrUserCallType::Removed, aBoundRect0);
}
- if(nullptr != pPlusData && nullptr != pPlusData->pBroadcast)
+ if(nullptr != m_pPlusData && nullptr != m_pPlusData->pBroadcast)
{
SdrHint aHint(bIsInserted ? SdrHintKind::ObjectInserted : SdrHintKind::ObjectRemoved, *this);
- pPlusData->pBroadcast->Broadcast(aHint);
+ m_pPlusData->pBroadcast->Broadcast(aHint);
}
}
@@ -2623,7 +2623,7 @@ void SdrObject::SetMoveProtect(bool bProt)
if(IsMoveProtect() != bProt)
{
// #i77187# secured and simplified
- bMovProt = bProt;
+ m_bMovProt = bProt;
SetChanged();
BroadcastObjectChange();
}
@@ -2634,7 +2634,7 @@ void SdrObject::SetResizeProtect(bool bProt)
if(IsResizeProtect() != bProt)
{
// #i77187# secured and simplified
- bSizProt = bProt;
+ m_bSizProt = bProt;
SetChanged();
BroadcastObjectChange();
}
@@ -2642,9 +2642,9 @@ void SdrObject::SetResizeProtect(bool bProt)
void SdrObject::SetPrintable(bool bPrn)
{
- if( bPrn == bNoPrint )
+ if( bPrn == m_bNoPrint )
{
- bNoPrint=!bPrn;
+ m_bNoPrint=!bPrn;
SetChanged();
if (IsInserted())
{
@@ -2671,14 +2671,14 @@ void SdrObject::SetVisible(bool bVisible)
sal_uInt16 SdrObject::GetUserDataCount() const
{
- if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return 0;
- return pPlusData->pUserDataList->GetUserDataCount();
+ if (m_pPlusData==nullptr || m_pPlusData->pUserDataList==nullptr) return 0;
+ return m_pPlusData->pUserDataList->GetUserDataCount();
}
SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const
{
- if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return nullptr;
- return &pPlusData->pUserDataList->GetUserData(nNum);
+ if (m_pPlusData==nullptr || m_pPlusData->pUserDataList==nullptr) return nullptr;
+ return &m_pPlusData->pUserDataList->GetUserData(nNum);
}
void SdrObject::AppendUserData(std::unique_ptr<SdrObjUserData> pData)
@@ -2690,19 +2690,19 @@ void SdrObject::AppendUserData(std::unique_ptr<SdrObjUserData> pData)
}
ImpForcePlusData();
- if (!pPlusData->pUserDataList)
- pPlusData->pUserDataList.reset( new SdrObjUserDataList );
+ if (!m_pPlusData->pUserDataList)
+ m_pPlusData->pUserDataList.reset( new SdrObjUserDataList );
- pPlusData->pUserDataList->AppendUserData(std::move(pData));
+ m_pPlusData->pUserDataList->AppendUserData(std::move(pData));
}
void SdrObject::DeleteUserData(sal_uInt16 nNum)
{
sal_uInt16 nCount=GetUserDataCount();
if (nNum<nCount) {
- pPlusData->pUserDataList->DeleteUserData(nNum);
+ m_pPlusData->pUserDataList->DeleteUserData(nNum);
if (nCount==1) {
- pPlusData->pUserDataList.reset();
+ m_pPlusData->pUserDataList.reset();
}
} else {
OSL_FAIL("SdrObject::DeleteUserData(): Invalid Index.");
@@ -2711,7 +2711,7 @@ void SdrObject::DeleteUserData(sal_uInt16 nNum)
void SdrObject::SetUserCall(SdrObjUserCall* pUser)
{
- pUserCall = pUser;
+ m_pUserCall = pUser;
}
@@ -2719,9 +2719,9 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const tools::Rectangle&
{
SdrObject* pGroup(getParentSdrObjectFromSdrObject());
- if ( pUserCall )
+ if ( m_pUserCall )
{
- pUserCall->Changed( *this, eUserCall, rBoundRect );
+ m_pUserCall->Changed( *this, eUserCall, rBoundRect );
}
if(nullptr != pGroup && pGroup->GetUserCall())
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 2ef316fe14fe..6be4d7e7cdac 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -312,7 +312,7 @@ bool SdrCaptionObj::beginSpecialDrag(SdrDragStat& rDrag) const
if(!pHdl)
{
- if (bMovProt)
+ if (m_bMovProt)
return false;
rDrag.SetNoSnap();
@@ -538,7 +538,7 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
ImpCalcTail(aPara,aTailPoly,maRect);
rStat.SetActionRect(maRect);
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
return true;
}
@@ -594,14 +594,14 @@ void SdrCaptionObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fr
void SdrCaptionObj::NbcSetRelativePos(const Point& rPnt)
{
- Point aRelPos0(aTailPoly.GetPoint(0)-aAnchor);
+ Point aRelPos0(aTailPoly.GetPoint(0)-m_aAnchor);
Size aSiz(rPnt.X()-aRelPos0.X(),rPnt.Y()-aRelPos0.Y());
NbcMove(aSiz); // This also calls SetRectsDirty()
}
Point SdrCaptionObj::GetRelativePos() const
{
- return aTailPoly.GetPoint(0)-aAnchor;
+ return aTailPoly.GetPoint(0)-m_aAnchor;
}
const tools::Rectangle& SdrCaptionObj::GetLogicRect() const
@@ -623,7 +623,7 @@ const Point& SdrCaptionObj::GetTailPos() const
void SdrCaptionObj::SetTailPos(const Point& rPos)
{
if (aTailPoly.GetSize()==0 || aTailPoly[0]!=rPos) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetTailPos(rPos);
SetChanged();
BroadcastObjectChange();
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 57801461bd18..8c16d470d3f3 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -122,7 +122,7 @@ SdrCircObj::SdrCircObj(
nStartAngle=0_deg100;
nEndAngle=36000_deg100;
meCircleKind=eNewKind;
- bClosedObj=eNewKind!=SdrCircKind::Arc;
+ m_bClosedObj=eNewKind!=SdrCircKind::Arc;
}
SdrCircObj::SdrCircObj(SdrModel& rSdrModel, SdrCircObj const & rSource)
@@ -131,7 +131,7 @@ SdrCircObj::SdrCircObj(SdrModel& rSdrModel, SdrCircObj const & rSource)
meCircleKind = rSource.meCircleKind;
nStartAngle = rSource.nStartAngle;
nEndAngle = rSource.nEndAngle;
- bClosedObj = rSource.bClosedObj;
+ m_bClosedObj = rSource.m_bClosedObj;
}
SdrCircObj::SdrCircObj(
@@ -143,7 +143,7 @@ SdrCircObj::SdrCircObj(
nStartAngle=0_deg100;
nEndAngle=36000_deg100;
meCircleKind=eNewKind;
- bClosedObj=eNewKind!=SdrCircKind::Arc;
+ m_bClosedObj=eNewKind!=SdrCircKind::Arc;
}
SdrCircObj::SdrCircObj(
@@ -159,7 +159,7 @@ SdrCircObj::SdrCircObj(
nEndAngle=NormAngle36000(nNewEndAngle);
if (nAngleDif==36000_deg100) nEndAngle+=nAngleDif; // full circle
meCircleKind=eNewKind;
- bClosedObj=eNewKind!=SdrCircKind::Arc;
+ m_bClosedObj=eNewKind!=SdrCircKind::Arc;
}
SdrCircObj::~SdrCircObj()
@@ -719,7 +719,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat)
nStartAngle=pU->nStart;
nEndAngle=pU->nEnd;
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
SetXPolyDirty();
// #i103058# push current angle settings to ItemSet to
@@ -755,7 +755,7 @@ bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
nEndAngle=pU->nEnd;
}
}
- bClosedObj=meCircleKind!=SdrCircKind::Arc;
+ m_bClosedObj=meCircleKind!=SdrCircKind::Arc;
SetRectsDirty();
SetXPolyDirty();
ImpSetCircInfoToAttr();
@@ -818,7 +818,7 @@ PointerStyle SdrCircObj::GetCreatePointer() const
void SdrCircObj::NbcMove(const Size& aSiz)
{
maRect.Move(aSiz);
- aOutRect.Move(aSiz);
+ m_aOutRect.Move(aSiz);
maSnapRect.Move(aSiz);
SetXPolyDirty();
SetRectsDirty(true);
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 5f19e3fc26a6..4084f1e91dbe 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -164,8 +164,8 @@ SdrEdgeObj::SdrEdgeObj(SdrModel& rSdrModel)
mbBoundRectCalculationRunning(false),
mbSuppressed(false)
{
- bClosedObj=false;
- bIsEdge=true;
+ m_bClosedObj=false;
+ m_bIsEdge=true;
pEdgeTrack.reset(new XPolygon);
}
@@ -179,8 +179,8 @@ SdrEdgeObj::SdrEdgeObj(SdrModel& rSdrModel, SdrEdgeObj const & rSource)
mbBoundRectCalculationRunning(false),
mbSuppressed(false)
{
- bClosedObj = false;
- bIsEdge = true;
+ m_bClosedObj = false;
+ m_bIsEdge = true;
pEdgeTrack.reset(new XPolygon(*rSource.pEdgeTrack));
bEdgeTrackDirty=rSource.bEdgeTrackDirty;
aCon1 =rSource.aCon1;
@@ -603,7 +603,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
mbSuppressed = false;
}
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
SetRectsDirty();
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
ImpSetEdgeInfoToAttr(); // copy values from aEdgeInfo into the pool
@@ -731,9 +731,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
nSiz--;
aPt2=rTrack0[nSiz];
} else {
- if (!aOutRect.IsEmpty()) {
- aPt1=aOutRect.TopLeft();
- aPt2=aOutRect.BottomRight();
+ if (!m_aOutRect.IsEmpty()) {
+ aPt1=m_aOutRect.TopLeft();
+ aPt2=m_aOutRect.BottomRight();
}
}
@@ -747,7 +747,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
if (rCon1.pObj==static_cast<SdrObject const *>(this))
{
// check, just in case
- aBoundRect1=aOutRect;
+ aBoundRect1=m_aOutRect;
}
else
{
@@ -774,7 +774,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
{
if (rCon2.pObj==static_cast<SdrObject const *>(this))
{ // check, just in case
- aBoundRect2=aOutRect;
+ aBoundRect2=m_aOutRect;
}
else
{
@@ -1635,7 +1635,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
(pSdrHint && pSdrHint->GetKind()==SdrHintKind::ObjectRemoved))
{
// broadcasting only, if on the same page
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
ImpDirtyEdgeTrack();
// only redraw here, object hasn't actually changed
@@ -2083,7 +2083,7 @@ bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
rDragStat.GetView()->SetConnectMarker(aCon2);
}
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
ConnectToNode(false,aCon2.pObj);
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
bEdgeTrackDirty=false;
@@ -2527,9 +2527,9 @@ Point SdrEdgeObj::GetTailPoint( bool bTail ) const
else
{
if(bTail)
- return aOutRect.TopLeft();
+ return m_aOutRect.TopLeft();
else
- return aOutRect.BottomRight();
+ return m_aOutRect.BottomRight();
}
}
@@ -2547,7 +2547,7 @@ void SdrEdgeObj::SetTailPoint( bool bTail, const Point& rPt )
*/
void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ )
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetCurrentBoundRect();
SdrObjConnection& rConn1 = GetConnection( bTail );
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index bc0e125d46c1..1c8871127fe3 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -565,7 +565,7 @@ bool SdrGrafObj::IsLinkedGraphic() const
void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- bool bNoPresGrf = ( mpGraphicObject->GetType() != GraphicType::NONE ) && !bEmptyPresObj;
+ bool bNoPresGrf = ( mpGraphicObject->GetType() != GraphicType::NONE ) && !m_bEmptyPresObj;
rInfo.bResizeFreeAllowed = aGeo.nRotationAngle.get() % 9000 == 0 ||
aGeo.nRotationAngle.get() % 18000 == 0 ||
@@ -576,7 +576,7 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bRotate90Allowed = bNoPresGrf;
rInfo.bMirrorFreeAllowed = bNoPresGrf;
rInfo.bMirror45Allowed = bNoPresGrf;
- rInfo.bMirror90Allowed = !bEmptyPresObj;
+ rInfo.bMirror90Allowed = !m_bEmptyPresObj;
rInfo.bTransparenceAllowed = false;
// #i118485# Shear allowed and possible now
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 9124e0849090..c71cff4b279e 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -52,14 +52,14 @@ SdrObjGroup::SdrObjGroup(SdrModel& rSdrModel)
SdrObjList(),
aRefPoint(0, 0)
{
- bClosedObj=false;
+ m_bClosedObj=false;
}
SdrObjGroup::SdrObjGroup(SdrModel& rSdrModel, SdrObjGroup const & rSource)
: SdrObject(rSdrModel, rSource),
SdrObjList()
{
- bClosedObj=false;
+ m_bClosedObj=false;
// copy child SdrObjects
if(nullptr != rSource.GetSubList())
@@ -199,10 +199,10 @@ const tools::Rectangle& SdrObjGroup::GetCurrentBoundRect() const
// <aOutRect> has to contain the bounding rectangle
if(0 != GetObjCount())
{
- aOutRect = GetAllObjBoundRect();
+ m_aOutRect = GetAllObjBoundRect();
}
- return aOutRect;
+ return m_aOutRect;
}
const tools::Rectangle& SdrObjGroup::GetSnapRect() const
@@ -214,7 +214,7 @@ const tools::Rectangle& SdrObjGroup::GetSnapRect() const
}
else
{
- return aOutRect;
+ return m_aOutRect;
}
}
@@ -276,7 +276,7 @@ basegfx::B2DPolyPolygon SdrObjGroup::TakeXorPoly() const
if(!aRetval.count())
{
- const basegfx::B2DRange aRange = vcl::unotools::b2DRectangleFromRectangle(aOutRect);
+ const basegfx::B2DRange aRange = vcl::unotools::b2DRectangleFromRectangle(m_aOutRect);
aRetval.append(basegfx::utils::createPolygonFromRect(aRange));
}
@@ -366,7 +366,7 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
}
else
{
- aOutRect.Move(rSiz);
+ m_aOutRect.Move(rSiz);
SetRectsDirty();
}
}
@@ -403,7 +403,7 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
}
else
{
- ResizeRect(aOutRect,rRef,xFact,yFact);
+ ResizeRect(m_aOutRect,rRef,xFact,yFact);
SetRectsDirty();
}
}
@@ -462,8 +462,8 @@ void SdrObjGroup::NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool
void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
{
- aAnchor=rPnt;
- Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
+ m_aAnchor=rPnt;
+ Size aSiz(rPnt.X()-m_aAnchor.X(),rPnt.Y()-m_aAnchor.Y());
aRefPoint.Move(aSiz);
const size_t nObjCount(GetObjCount());
@@ -477,7 +477,7 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
void SdrObjGroup::SetSnapRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
tools::Rectangle aOld(GetSnapRect());
if (aOld.IsEmpty())
{
@@ -520,7 +520,7 @@ void SdrObjGroup::Move(const Size& rSiz)
if (rSiz.Width()==0 && rSiz.Height()==0)
return;
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
aRefPoint.Move(rSiz);
const size_t nObjCount(GetObjCount());
@@ -543,7 +543,7 @@ void SdrObjGroup::Move(const Size& rSiz)
}
else
{
- aOutRect.Move(rSiz);
+ m_aOutRect.Move(rSiz);
SetRectsDirty();
}
@@ -573,7 +573,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
NbcMirrorGluePoints(aRef1,aRef2);
}
}
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
ResizePoint(aRefPoint,rRef,xFact,yFact);
const size_t nObjCount(GetObjCount());
@@ -596,7 +596,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
}
else
{
- ResizeRect(aOutRect,rRef,xFact,yFact);
+ ResizeRect(m_aOutRect,rRef,xFact,yFact);
SetRectsDirty();
}
@@ -612,7 +612,7 @@ void SdrObjGroup::Rotate(const Point& rRef, Degree100 nAngle, double sn, double
return;
SetGlueReallyAbsolute(true);
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
RotatePoint(aRefPoint,rRef,sn,cs);
// move the connectors first, everything else afterwards
const size_t nObjCount(GetObjCount());
@@ -642,7 +642,7 @@ void SdrObjGroup::Rotate(const Point& rRef, Degree100 nAngle, double sn, double
void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
{
SetGlueReallyAbsolute(true);
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
MirrorPoint(aRefPoint,rRef1,rRef2); // implementation missing in SvdEtc!
// move the connectors first, everything else afterwards
const size_t nObjCount(GetObjCount());
@@ -675,7 +675,7 @@ void SdrObjGroup::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVS
return;
SetGlueReallyAbsolute(true);
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
ShearPoint(aRefPoint,rRef,tn);
// move the connectors first, everything else afterwards
const size_t nObjCount(GetObjCount());
@@ -705,10 +705,10 @@ void SdrObjGroup::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVS
void SdrObjGroup::SetAnchorPos(const Point& rPnt)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- bool bChg=aAnchor!=rPnt;
- aAnchor=rPnt;
- Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ bool bChg=m_aAnchor!=rPnt;
+ m_aAnchor=rPnt;
+ Size aSiz(rPnt.X()-m_aAnchor.X(),rPnt.Y()-m_aAnchor.Y());
aRefPoint.Move(aSiz);
// move the connectors first, everything else afterwards
const size_t nObjCount(GetObjCount());
@@ -738,14 +738,14 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
void SdrObjGroup::NbcSetRelativePos(const Point& rPnt)
{
- Point aRelPos0(GetSnapRect().TopLeft()-aAnchor);
+ Point aRelPos0(GetSnapRect().TopLeft()-m_aAnchor);
Size aSiz(rPnt.X()-aRelPos0.X(),rPnt.Y()-aRelPos0.Y());
NbcMove(aSiz); // this also calls SetRectsDirty()
}
void SdrObjGroup::SetRelativePos(const Point& rPnt)
{
- Point aRelPos0(GetSnapRect().TopLeft()-aAnchor);
+ Point aRelPos0(GetSnapRect().TopLeft()-m_aAnchor);
Size aSiz(rPnt.X()-aRelPos0.X(),rPnt.Y()-aRelPos0.Y());
if (aSiz.Width()!=0 || aSiz.Height()!=0) Move(aSiz); // this also calls SetRectsDirty() and Broadcast, ...
}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 5bf412089ee1..dcf0858705e5 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -964,7 +964,7 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat)
}
SetTextDirty();
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
return true;
}
@@ -1420,7 +1420,7 @@ void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, cons
return;
// set model values and broadcast
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
aPt1 = aNewPt1;
aPt2 = aNewPt2;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index d335f9eab90c..308c2ebfe1e5 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1333,7 +1333,7 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed )
{
// TODO/LATER: do we still need this hack?
// Allow changes to the closed state of OLE objects
- bClosedObj = bIsClosed;
+ m_bClosedObj = bIsClosed;
}
SdrObjectUniquePtr SdrOle2Obj::getFullDragClone() const
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 2f47da5b4a1f..d4f0bc208838 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -90,7 +90,7 @@ SdrPageObj::SdrPageObj(
mpShownPage->AddPageUser(*this);
}
- aOutRect = rRect;
+ m_aOutRect = rRect;
}
SdrPageObj::~SdrPageObj()
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 75c40504f115..dc6f6ce3df5d 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1624,14 +1624,14 @@ SdrPathObj::SdrPathObj(
: SdrTextObj(rSdrModel),
meKind(eNewKind)
{
- bClosedObj = IsClosed();
+ m_bClosedObj = IsClosed();
}
SdrPathObj::SdrPathObj(SdrModel& rSdrModel, SdrPathObj const & rSource)
: SdrTextObj(rSdrModel, rSource),
meKind(rSource.meKind)
{
- bClosedObj = IsClosed();
+ m_bClosedObj = IsClosed();
maPathPolygon = rSource.GetPathPoly();
}
@@ -1643,7 +1643,7 @@ SdrPathObj::SdrPathObj(
maPathPolygon(rPathPoly),
meKind(eNewKind)
{
- bClosedObj = IsClosed();
+ m_bClosedObj = IsClosed();
ImpForceKind();
}
@@ -1718,7 +1718,7 @@ void SdrPathObj::ImpForceKind()
if (meKind==OBJ_LINE && !lcl_ImpIsLine(GetPathPoly())) meKind=OBJ_PLIN;
if (meKind==OBJ_PLIN && lcl_ImpIsLine(GetPathPoly())) meKind=OBJ_LINE;
- bClosedObj=IsClosed();
+ m_bClosedObj=IsClosed();
if (meKind==OBJ_LINE)
{
@@ -1788,7 +1788,7 @@ void SdrPathObj::ImpSetClosed(bool bClose)
default: break;
}
- bClosedObj = true;
+ m_bClosedObj = true;
}
else
{
@@ -1801,7 +1801,7 @@ void SdrPathObj::ImpSetClosed(bool bClose)
default: break;
}
- bClosedObj = false;
+ m_bClosedObj = false;
}
ImpForceKind();
@@ -2740,7 +2740,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly)
{
if(GetPathPoly() != rPathPoly)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetPathPoly(rPathPoly);
SetChanged();
BroadcastObjectChange();
@@ -2751,7 +2751,7 @@ void SdrPathObj::SetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly)
void SdrPathObj::ToggleClosed()
{
tools::Rectangle aBoundRect0;
- if(pUserCall != nullptr)
+ if(m_pUserCall != nullptr)
aBoundRect0 = GetLastBoundRect();
ImpSetClosed(!IsClosed()); // set new ObjKind
ImpForceKind(); // because we want Line -> Poly -> PolyLine instead of Line -> Poly -> Line
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 553fd94380ab..bead75b27b44 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -54,13 +54,13 @@ std::unique_ptr<sdr::contact::ViewContact> SdrRectObj::CreateObjectSpecificViewC
SdrRectObj::SdrRectObj(SdrModel& rSdrModel)
: SdrTextObj(rSdrModel)
{
- bClosedObj=true;
+ m_bClosedObj=true;
}
SdrRectObj::SdrRectObj(SdrModel& rSdrModel, SdrRectObj const & rSource)
: SdrTextObj(rSdrModel, rSource)
{
- bClosedObj=true;
+ m_bClosedObj=true;
if ( rSource.mpXPoly )
mpXPoly.reset( new XPolygon( *rSource.mpXPoly ) );
else
@@ -72,7 +72,7 @@ SdrRectObj::SdrRectObj(
const tools::Rectangle& rRect)
: SdrTextObj(rSdrModel, rRect)
{
- bClosedObj=true;
+ m_bClosedObj=true;
}
SdrRectObj::SdrRectObj(
@@ -83,7 +83,7 @@ SdrRectObj::SdrRectObj(
DBG_ASSERT(eTextKind==OBJ_TEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind) can only be applied to text frames.");
- bClosedObj=true;
+ m_bClosedObj=true;
}
SdrRectObj::SdrRectObj(
@@ -95,7 +95,7 @@ SdrRectObj::SdrRectObj(
DBG_ASSERT(eTextKind==OBJ_TEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind,...) can only be applied to text frames.");
- bClosedObj=true;
+ m_bClosedObj=true;
}
SdrRectObj::~SdrRectObj()
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 518dc88cf1af..efb0c46f8c71 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -252,7 +252,7 @@ void SdrTextObj::NbcSetText(const OUString& rStr)
void SdrTextObj::SetText(const OUString& rStr)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetText(rStr);
SetChanged();
BroadcastObjectChange();
@@ -275,7 +275,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, EETextFo
void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcSetText(rInput,rBaseURL,eFormat);
SetChanged();
BroadcastObjectChange();
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 50908c1a24c1..a509ac290ccf 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -257,7 +257,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
tools::Rectangle aNewRect(maRect);
bool bRet=AdjustTextFrameWidthAndHeight(aNewRect);
if (bRet) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
maRect = aNewRect;
SetRectsDirty();
if (auto pRectObj = dynamic_cast<SdrRectObj *>(this)) { // this is a hack
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index e4727eb385ef..0d881c80041f 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -197,7 +197,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
maRect = aRect1; // for ObjName
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
if (auto pRectObj = dynamic_cast<SdrRectObj *>(this)) {
pRectObj->SetXPolyDirty();
}
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 906ed2bfbfb8..e4f7b65fc1b8 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -94,7 +94,7 @@ Degree100 SdrTextObj::GetShearAngle(bool /*bVertical*/) const
void SdrTextObj::NbcMove(const Size& rSiz)
{
maRect.Move(rSiz);
- aOutRect.Move(rSiz);
+ m_aOutRect.Move(rSiz);
maSnapRect.Move(rSiz);
SetRectsDirty(true);
}
@@ -449,7 +449,7 @@ SdrPathObjUniquePtr SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon&
pPathObj->SetPathPoly(basegfx::utils::expandToCurve(pPathObj->GetPathPoly()));
}
- pPathObj->ImpSetAnchorPos(aAnchor);
+ pPathObj->ImpSetAnchorPos(m_aAnchor);
pPathObj->NbcSetLayer(GetLayer());
sdr::properties::ItemChangeBroadcaster aC(*pPathObj);
pPathObj->ClearMergedItem();
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index e82ff0ae75a0..648463460622 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -140,7 +140,7 @@ SdrUnoObj::SdrUnoObj(
: SdrRectObj(rSdrModel),
m_pImpl( new SdrUnoObjDataHolder )
{
- bIsUnoObj = true;
+ m_bIsUnoObj = true;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
@@ -153,7 +153,7 @@ SdrUnoObj::SdrUnoObj( SdrModel& rSdrModel, SdrUnoObj const & rSource)
: SdrRectObj(rSdrModel, rSource),
m_pImpl( new SdrUnoObjDataHolder )
{
- bIsUnoObj = true;
+ m_bIsUnoObj = true;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
@@ -198,7 +198,7 @@ SdrUnoObj::SdrUnoObj(
: SdrRectObj(rSdrModel),
m_pImpl( new SdrUnoObjDataHolder )
{
- bIsUnoObj = true;
+ m_bIsUnoObj = true;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 34b1361d7521..204b67057c3f 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -44,9 +44,9 @@ SdrVirtObj::SdrVirtObj(
: SdrObject(rSdrModel),
rRefObj(rNewObj)
{
- bVirtObj=true; // this is only a virtual object
+ m_bVirtObj=true; // this is only a virtual object
rRefObj.AddReference(*this);
- bClosedObj=rRefObj.IsClosedObj();
+ m_bClosedObj=rRefObj.IsClosedObj();
}
SdrVirtObj::SdrVirtObj(
@@ -54,13 +54,13 @@ SdrVirtObj::SdrVirtObj(
: SdrObject(rSdrModel, rSource),
rRefObj(rSource.rRefObj)
{
- bVirtObj=true; // this is only a virtual object
- bClosedObj=rRefObj.IsClosedObj();
+ m_bVirtObj=true; // this is only a virtual object
+ m_bClosedObj=rRefObj.IsClosedObj();
rRefObj.AddReference(*this);
aSnapRect = rSource.aSnapRect;
- aAnchor = rSource.aAnchor;
+ m_aAnchor = rSource.m_aAnchor;
}
SdrVirtObj::~SdrVirtObj()
@@ -80,7 +80,7 @@ SdrObject& SdrVirtObj::ReferencedObj()
void SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
{
- bClosedObj=rRefObj.IsClosedObj();
+ m_bClosedObj=rRefObj.IsClosedObj();
SetRectsDirty(); // TODO: Optimize this.
// Only a repaint here, rRefObj may have changed and broadcasts
@@ -89,7 +89,7 @@ void SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos)
{
- aAnchor=rAnchorPos;
+ m_aAnchor=rAnchorPos;
}
void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
@@ -114,22 +114,22 @@ SdrObjList* SdrVirtObj::GetSubList() const
const tools::Rectangle& SdrVirtObj::GetCurrentBoundRect() const
{
- aOutRect = rRefObj.GetCurrentBoundRect(); // TODO: Optimize this.
- aOutRect += aAnchor;
- return aOutRect;
+ m_aOutRect = rRefObj.GetCurrentBoundRect(); // TODO: Optimize this.
+ m_aOutRect += m_aAnchor;
+ return m_aOutRect;
}
const tools::Rectangle& SdrVirtObj::GetLastBoundRect() const
{
- aOutRect = rRefObj.GetLastBoundRect(); // TODO: Optimize this.
- aOutRect += aAnchor;
- return aOutRect;
+ m_aOutRect = rRefObj.GetLastBoundRect(); // TODO: Optimize this.
+ m_aOutRect += m_aAnchor;
+ return m_aOutRect;
}
void SdrVirtObj::RecalcBoundRect()
{
- aOutRect=rRefObj.GetCurrentBoundRect();
- aOutRect+=aAnchor;
+ m_aOutRect=rRefObj.GetCurrentBoundRect();
+ m_aOutRect+=m_aAnchor;
}
SdrVirtObj* SdrVirtObj::CloneSdrObject(SdrModel& rTargetModel) const
@@ -179,9 +179,9 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeXorPoly() const
{
basegfx::B2DPolyPolygon aPolyPolygon(rRefObj.TakeXorPoly());
- if(aAnchor.X() || aAnchor.Y())
+ if(m_aAnchor.X() || m_aAnchor.Y())
{
- aPolyPolygon.transform(basegfx::utils::createTranslateB2DHomMatrix(aAnchor.X(), aAnchor.Y()));
+ aPolyPolygon.transform(basegfx::utils::createTranslateB2DHomMatrix(m_aAnchor.X(), m_aAnchor.Y()));
}
return aPolyPolygon;
@@ -200,7 +200,7 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const
for (size_t i=0; i<tempList.GetHdlCount(); ++i)
{
SdrHdl* pHdl = tempList.GetHdl(i);
- Point aP(pHdl->GetPos()+aAnchor);
+ Point aP(pHdl->GetPos()+m_aAnchor);
pHdl->SetPos(aP);
}
tempList.MoveTo(rHdlList);
@@ -213,7 +213,7 @@ void SdrVirtObj::AddToPlusHdlList(SdrHdlList& rHdlList, SdrHdl& rHdl) const
for (size_t i=0; i<tempList.GetHdlCount(); ++i)
{
SdrHdl* pHdl = tempList.GetHdl(i);
- Point aP(pHdl->GetPos()+aAnchor);
+ Point aP(pHdl->GetPos()+m_aAnchor);
pHdl->SetPos(aP);
}
tempList.MoveTo(rHdlList);
@@ -294,31 +294,31 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeCreatePoly(const SdrDragStat& rDrag) con
void SdrVirtObj::NbcMove(const Size& rSiz)
{
- aAnchor.Move(rSiz);
+ m_aAnchor.Move(rSiz);
SetRectsDirty();
}
void SdrVirtObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- rRefObj.NbcResize(rRef-aAnchor,xFact,yFact);
+ rRefObj.NbcResize(rRef-m_aAnchor,xFact,yFact);
SetRectsDirty();
}
void SdrVirtObj::NbcRotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
- rRefObj.NbcRotate(rRef-aAnchor,nAngle,sn,cs);
+ rRefObj.NbcRotate(rRef-m_aAnchor,nAngle,sn,cs);
SetRectsDirty();
}
void SdrVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- rRefObj.NbcMirror(rRef1-aAnchor,rRef2-aAnchor);
+ rRefObj.NbcMirror(rRef1-m_aAnchor,rRef2-m_aAnchor);
SetRectsDirty();
}
void SdrVirtObj::NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear)
{
- rRefObj.NbcShear(rRef-aAnchor,nAngle,tn,bVShear);
+ rRefObj.NbcShear(rRef-m_aAnchor,nAngle,tn,bVShear);
SetRectsDirty();
}
@@ -326,7 +326,7 @@ void SdrVirtObj::NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool b
void SdrVirtObj::Move(const Size& rSiz)
{
if (!rSiz.IsEmpty()) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
@@ -337,8 +337,8 @@ void SdrVirtObj::Move(const Size& rSiz)
void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative)
{
if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- rRefObj.Resize(rRef-aAnchor,xFact,yFact, bUnsetRelative);
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ rRefObj.Resize(rRef-m_aAnchor,xFact,yFact, bUnsetRelative);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -347,8 +347,8 @@ void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction
void SdrVirtObj::Rotate(const Point& rRef, Degree100 nAngle, double sn, double cs)
{
if (nAngle) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- rRefObj.Rotate(rRef-aAnchor,nAngle,sn,cs);
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ rRefObj.Rotate(rRef-m_aAnchor,nAngle,sn,cs);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -356,8 +356,8 @@ void SdrVirtObj::Rotate(const Point& rRef, Degree100 nAngle, double sn, double c
void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- rRefObj.Mirror(rRef1-aAnchor,rRef2-aAnchor);
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ rRefObj.Mirror(rRef1-m_aAnchor,rRef2-m_aAnchor);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -365,8 +365,8 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
void SdrVirtObj::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear)
{
if (nAngle) {
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- rRefObj.Shear(rRef-aAnchor,nAngle,tn,bVShear);
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ rRefObj.Shear(rRef-m_aAnchor,nAngle,tn,bVShear);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
}
@@ -376,21 +376,21 @@ void SdrVirtObj::Shear(const Point& rRef, Degree100 nAngle, double tn, bool bVSh
void SdrVirtObj::RecalcSnapRect()
{
aSnapRect=rRefObj.GetSnapRect();
- aSnapRect+=aAnchor;
+ aSnapRect+=m_aAnchor;
}
const tools::Rectangle& SdrVirtObj::GetSnapRect() const
{
const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetSnapRect();
- const_cast<SdrVirtObj*>(this)->aSnapRect+=aAnchor;
+ const_cast<SdrVirtObj*>(this)->aSnapRect+=m_aAnchor;
return aSnapRect;
}
void SdrVirtObj::SetSnapRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
tools::Rectangle aR(rRect);
- aR-=aAnchor;
+ aR-=m_aAnchor;
rRefObj.SetSnapRect(aR);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
@@ -399,7 +399,7 @@ void SdrVirtObj::SetSnapRect(const tools::Rectangle& rRect)
void SdrVirtObj::NbcSetSnapRect(const tools::Rectangle& rRect)
{
tools::Rectangle aR(rRect);
- aR-=aAnchor;
+ aR-=m_aAnchor;
SetRectsDirty();
rRefObj.NbcSetSnapRect(aR);
}
@@ -408,15 +408,15 @@ void SdrVirtObj::NbcSetSnapRect(const tools::Rectangle& rRect)
const tools::Rectangle& SdrVirtObj::GetLogicRect() const
{
const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect!
- const_cast<SdrVirtObj*>(this)->aSnapRect+=aAnchor; // If there's trouble, we need another Rectangle Member (or a Heap).
+ const_cast<SdrVirtObj*>(this)->aSnapRect+=m_aAnchor; // If there's trouble, we need another Rectangle Member (or a Heap).
return aSnapRect;
}
void SdrVirtObj::SetLogicRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
tools::Rectangle aR(rRect);
- aR-=aAnchor;
+ aR-=m_aAnchor;
rRefObj.SetLogicRect(aR);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
@@ -425,7 +425,7 @@ void SdrVirtObj::SetLogicRect(const tools::Rectangle& rRect)
void SdrVirtObj::NbcSetLogicRect(const tools::Rectangle& rRect)
{
tools::Rectangle aR(rRect);
- aR-=aAnchor;
+ aR-=m_aAnchor;
SetRectsDirty();
rRefObj.NbcSetLogicRect(aR);
}
@@ -450,7 +450,7 @@ sal_uInt32 SdrVirtObj::GetSnapPointCount() const
Point SdrVirtObj::GetSnapPoint(sal_uInt32 i) const
{
Point aP(rRefObj.GetSnapPoint(i));
- aP+=aAnchor;
+ aP+=m_aAnchor;
return aP;
}
@@ -466,13 +466,13 @@ sal_uInt32 SdrVirtObj::GetPointCount() const
Point SdrVirtObj::GetPoint(sal_uInt32 i) const
{
- return rRefObj.GetPoint(i) + aAnchor;
+ return rRefObj.GetPoint(i) + m_aAnchor;
}
void SdrVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
{
Point aP(rPnt);
- aP-=aAnchor;
+ aP-=m_aAnchor;
rRefObj.SetPoint(aP,i);
SetRectsDirty();
}
@@ -502,7 +502,7 @@ std::unique_ptr<SdrObjGeoData> SdrVirtObj::GetGeoData() const
void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo)
{
- tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (m_pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
rRefObj.SetGeoData(rGeo);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize,aBoundRect0);
@@ -542,7 +542,7 @@ bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec)
Point SdrVirtObj::GetOffset() const
{
// #i73248# default offset of SdrVirtObj is aAnchor
- return aAnchor;
+ return m_aAnchor;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 5d387afc5236..33b134dbe2c2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -906,7 +906,7 @@ SdrTableObj::SdrTableObj(
void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
{
- bClosedObj = true;
+ m_bClosedObj = true;
mpImpl = new SdrTableObjImpl;
mpImpl->init( this, nColumns, nRows );
@@ -1968,7 +1968,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight()
if (bRet)
{
tools::Rectangle aBoundRect0;
- if (pUserCall!=nullptr)
+ if (m_pUserCall!=nullptr)
aBoundRect0=GetLastBoundRect();
maRect = aNewRect;
SetRectsDirty();
@@ -2311,7 +2311,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
maRect = aRect1; // for ObjName
SetBoundRectDirty();
- bSnapRectDirty=true;
+ m_bSnapRectDirty=true;
return true;
}
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index f45d7278d59c..9ae68e2a05ef 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2282,7 +2282,7 @@ void SwDrawVirtObj::AddToDrawingPage(SwFrame const& rAnchorFrame)
// insert 'virtual' drawing object into page, set layer and user call.
SdrPage* pDrawPg = pOrgMasterSdrObj->getSdrPageFromSdrObject();
// default: insert before master object
- auto NOTM_nOrdNum(GetReferencedObj().GetOrdNum());
+ auto nOrdNum(GetReferencedObj().GetOrdNum());
// maintain invariant that a shape's textbox immediately follows the shape
// also for the multiple SdrDrawVirtObj created for shapes in header/footer
@@ -2297,33 +2297,33 @@ void SwDrawVirtObj::AddToDrawingPage(SwFrame const& rAnchorFrame)
if (&pAnchoredObj->GetFrameFormat() == pFlyFormat)
{
assert(dynamic_cast<SwFlyFrame const*>(pAnchoredObj));
- NOTM_nOrdNum = pAnchoredObj->GetDrawObj()->GetOrdNum();
+ nOrdNum = pAnchoredObj->GetDrawObj()->GetOrdNum();
// the master SdrObj should have the highest index
- assert(NOTM_nOrdNum < GetReferencedObj().GetOrdNum());
+ assert(nOrdNum < GetReferencedObj().GetOrdNum());
break;
}
}
}
// this happens on initial insertion, the draw object is created first
- SAL_INFO_IF(GetReferencedObj().GetOrdNum() == NOTM_nOrdNum, "sw", "AddToDrawingPage: cannot find SdrObject for text box's shape");
+ SAL_INFO_IF(GetReferencedObj().GetOrdNum() == nOrdNum, "sw", "AddToDrawingPage: cannot find SdrObject for text box's shape");
}
// #i27030# - apply order number of referenced object
if ( nullptr != pDrawPg )
{
// #i27030# - apply order number of referenced object
- pDrawPg->InsertObject(this, NOTM_nOrdNum);
+ pDrawPg->InsertObject(this, nOrdNum);
}
else
{
pDrawPg = getSdrPageFromSdrObject();
if ( pDrawPg )
{
- pDrawPg->SetObjectOrdNum(GetOrdNumDirect(), NOTM_nOrdNum);
+ pDrawPg->SetObjectOrdNum(GetOrdNumDirect(), nOrdNum);
}
else
{
- SetOrdNum(NOTM_nOrdNum);
+ SetOrdNum(nOrdNum);
}
}
SetUserCall( &mrDrawContact );
@@ -2357,30 +2357,30 @@ void SwDrawVirtObj::NbcSetAnchorPos(const Point& rPnt)
const tools::Rectangle& SwDrawVirtObj::GetCurrentBoundRect() const
{
- if(aOutRect.IsEmpty())
+ if(m_aOutRect.IsEmpty())
{
const_cast<SwDrawVirtObj*>(this)->RecalcBoundRect();
}
- return aOutRect;
+ return m_aOutRect;
}
const tools::Rectangle& SwDrawVirtObj::GetLastBoundRect() const
{
- return aOutRect;
+ return m_aOutRect;
}
Point SwDrawVirtObj::GetOffset() const
{
// do NOT use IsEmpty() here, there is already a useful offset
// in the position
- if(aOutRect == tools::Rectangle())
+ if(m_aOutRect == tools::Rectangle())
{
return Point();
}
else
{
- return aOutRect.TopLeft() - GetReferencedObj().GetCurrentBoundRect().TopLeft();
+ return m_aOutRect.TopLeft() - GetReferencedObj().GetCurrentBoundRect().TopLeft();
}
}
@@ -2396,7 +2396,7 @@ void SwDrawVirtObj::RecalcBoundRect()
// its value by the 'BoundRect' of the referenced object.
const Point aOffset(GetOffset());
- aOutRect = ReferencedObj().GetCurrentBoundRect() + aOffset;
+ m_aOutRect = ReferencedObj().GetCurrentBoundRect() + aOffset;
}
basegfx::B2DPolyPolygon SwDrawVirtObj::TakeXorPoly() const
@@ -2468,7 +2468,7 @@ void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fract
{
if(xFact.GetNumerator() != xFact.GetDenominator() || yFact.GetNumerator() != yFact.GetDenominator())
{
- tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Resize(rRef - GetOffset(), xFact, yFact, bUnsetRelative);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
@@ -2479,7 +2479,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, Degree100 nAngle, double sn, doubl
{
if(nAngle)
{
- tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Rotate(rRef - GetOffset(), nAngle, sn, cs);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
@@ -2488,7 +2488,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, Degree100 nAngle, double sn, doubl
void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
{
- tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Mirror(rRef1 - GetOffset(), rRef2 - GetOffset());
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
@@ -2498,7 +2498,7 @@ void SwDrawVirtObj::Shear(const Point& rRef, Degree100 nAngle, double tn, bool b
{
if(nAngle)
{
- tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
rRefObj.Shear(rRef - GetOffset(), nAngle, tn, bVShear);
SetRectsDirty();
SendUserCall(SdrUserCallType::Resize, aBoundRect0);
@@ -2521,7 +2521,7 @@ const tools::Rectangle& SwDrawVirtObj::GetSnapRect() const
void SwDrawVirtObj::SetSnapRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
tools::Rectangle aR(rRect);
aR -= GetOffset();
rRefObj.SetSnapRect(aR);
@@ -2547,7 +2547,7 @@ const tools::Rectangle& SwDrawVirtObj::GetLogicRect() const
void SwDrawVirtObj::SetLogicRect(const tools::Rectangle& rRect)
{
- tools::Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if(m_pUserCall) aBoundRect0 = GetLastBoundRect();
tools::Rectangle aR(rRect);
aR -= GetOffset();
rRefObj.SetLogicRect(aR);
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index a06f0e8415c3..93a66ba6b625 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -424,8 +424,8 @@ SwVirtFlyDrawObj::SwVirtFlyDrawObj(
m_pFlyFrame(pFly)
{
const SvxProtectItem &rP = m_pFlyFrame->GetFormat()->GetProtect();
- bMovProt = rP.IsPosProtected();
- bSizProt = rP.IsSizeProtected();
+ m_bMovProt = rP.IsPosProtected();
+ m_bSizProt = rP.IsSizeProtected();
}
SwVirtFlyDrawObj::~SwVirtFlyDrawObj()
@@ -549,15 +549,15 @@ void SwVirtFlyDrawObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
void SwVirtFlyDrawObj::SetRect() const
{
if ( GetFlyFrame()->getFrameArea().HasArea() )
- const_cast<SwVirtFlyDrawObj*>(this)->aOutRect = GetFlyFrame()->getFrameArea().SVRect();
+ const_cast<SwVirtFlyDrawObj*>(this)->m_aOutRect = GetFlyFrame()->getFrameArea().SVRect();
else
- const_cast<SwVirtFlyDrawObj*>(this)->aOutRect = tools::Rectangle();
+ const_cast<SwVirtFlyDrawObj*>(this)->m_aOutRect = tools::Rectangle();
}
const tools::Rectangle& SwVirtFlyDrawObj::GetCurrentBoundRect() const
{
SetRect();
- return aOutRect;
+ return m_aOutRect;
}
const tools::Rectangle& SwVirtFlyDrawObj::GetLastBoundRect() const
@@ -578,7 +578,7 @@ void SwVirtFlyDrawObj::RecalcSnapRect()
const tools::Rectangle& SwVirtFlyDrawObj::GetSnapRect() const
{
SetRect();
- return aOutRect;
+ return m_aOutRect;
}
void SwVirtFlyDrawObj::SetSnapRect(const tools::Rectangle& )
@@ -587,8 +587,8 @@ void SwVirtFlyDrawObj::SetSnapRect(const tools::Rectangle& )
SetRect();
SetChanged();
BroadcastObjectChange();
- if (pUserCall!=nullptr)
- pUserCall->Changed(*this, SdrUserCallType::Resize, aTmp);
+ if (m_pUserCall!=nullptr)
+ m_pUserCall->Changed(*this, SdrUserCallType::Resize, aTmp);
}
void SwVirtFlyDrawObj::NbcSetSnapRect(const tools::Rectangle& )
@@ -599,7 +599,7 @@ void SwVirtFlyDrawObj::NbcSetSnapRect(const tools::Rectangle& )
const tools::Rectangle& SwVirtFlyDrawObj::GetLogicRect() const
{
SetRect();
- return aOutRect;
+ return m_aOutRect;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list