strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

svx: prefix members of E3dCubeObj

Browse source 
See tdf#94879 for motivation.

Change-Id: I0e1dcb44cd46fdf40ae21c264017c8fc9ca96b53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175980
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2024-11-04 08:18:14 +01:00
parent 910d67e442
commit c8606fc09b
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/svx/cube3d.hxx
View file

@ -47,11 +47,11 @@ class E3dDefaultAttributes;
class SAL_WARN_UNUSED E3dCubeObj final : public E3dCompoundObject
{
// Parameter
basegfx::B3DPoint aCubePos;
basegfx::B3DVector aCubeSize;
basegfx::B3DPoint m_aCubePos;
basegfx::B3DVector m_aCubeSize;
// BOOLeans
bool bPosIsCenter : 1;
bool m_bPosIsCenter : 1;
void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
@ -75,13 +75,13 @@ public:
// Set local parameters with geometry recreation
void SetCubePos(const basegfx::B3DPoint& rNew);
const basegfx::B3DPoint& GetCubePos() const { return aCubePos; }
const basegfx::B3DPoint& GetCubePos() const { return m_aCubePos; }
void SetCubeSize(const basegfx::B3DVector& rNew);
const basegfx::B3DVector& GetCubeSize() const { return aCubeSize; }
const basegfx::B3DVector& GetCubeSize() const { return m_aCubeSize; }
void SetPosIsCenter(bool bNew);
bool GetPosIsCenter() const { return bPosIsCenter; }
bool GetPosIsCenter() const { return m_bPosIsCenter; }
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual OUString TakeObjNameSingul() const override;

28
svx/source/engine3d/cube3d.cxx
View file

@ -46,8 +46,8 @@ E3dCubeObj::E3dCubeObj(
SetDefaultAttributes(rDefault);
// position centre or left, bottom, back (dependent on bPosIsCenter)
aCubePos = aPos;
aCubeSize = r3DSize;
m_aCubePos = aPos;
m_aCubeSize = r3DSize;
}
E3dCubeObj::E3dCubeObj(SdrModel& rSdrModel)
@ -67,9 +67,9 @@ E3dCubeObj::E3dCubeObj(SdrModel& rSdrModel, E3dCubeObj const & rSource)
SetDefaultAttributes(aDefault);
aCubePos = rSource.aCubePos;
aCubeSize = rSource.aCubeSize;
bPosIsCenter = rSource.bPosIsCenter;
m_aCubePos = rSource.m_aCubePos;
m_aCubeSize = rSource.m_aCubeSize;
m_bPosIsCenter = rSource.m_bPosIsCenter;
}
E3dCubeObj::~E3dCubeObj()
@ -78,9 +78,9 @@ E3dCubeObj::~E3dCubeObj()
void E3dCubeObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
{
aCubePos = rDefault.GetDefaultCubePos();
aCubeSize = rDefault.GetDefaultCubeSize();
bPosIsCenter = rDefault.GetDefaultCubePosIsCenter();
m_aCubePos = rDefault.GetDefaultCubePos();
m_aCubeSize = rDefault.GetDefaultCubeSize();
m_bPosIsCenter = rDefault.GetDefaultCubePosIsCenter();
}
SdrObjKind E3dCubeObj::GetObjIdentifier() const
@ -104,27 +104,27 @@ rtl::Reference<SdrObject> E3dCubeObj::CloneSdrObject(SdrModel& rTargetModel) con
void E3dCubeObj::SetCubePos(const basegfx::B3DPoint& rNew)
{
if(aCubePos != rNew)
if(m_aCubePos != rNew)
{
aCubePos = rNew;
m_aCubePos = rNew;
ActionChanged();
}
}
void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
{
if(aCubeSize != rNew)
if(m_aCubeSize != rNew)
{
aCubeSize = rNew;
m_aCubeSize = rNew;
ActionChanged();
}
}
void E3dCubeObj::SetPosIsCenter(bool bNew)
{
if(bPosIsCenter != bNew)
if(m_bPosIsCenter != bNew)
{
bPosIsCenter = bNew;
m_bPosIsCenter = bNew;
ActionChanged();
}
}