mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: prefix members of SdrLayerAdmin

Browse Source 
See tdf#94879 for motivation.

Change-Id: I8ea80a3f2121c5c29168aa185e6278d924874c72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166815
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna
2024-04-29 08:15:16 +02:00
parent 9648f81f98
commit 5a61b590ae
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/svdlayer.hxx
View File

@@ -105,8 +105,8 @@ friend class SdrModel;
friend class SdrPage; friend class SdrPage;
std::vector<std::unique_ptr<SdrLayer>> maLayers; std::vector<std::unique_ptr<SdrLayer>> maLayers;
SdrLayerAdmin* pParent; // The page's admin knows the doc's admin SdrLayerAdmin* m_pParent; // The page's admin knows the doc's admin
SdrModel* pModel; // For broadcasting SdrModel* m_pModel; // For broadcasting
OUString maControlLayerName; OUString maControlLayerName;
// Find a LayerID which is not in use yet. If all have been used up, // Find a LayerID which is not in use yet. If all have been used up,
// we return 0. // we return 0.

30
svx/source/svdraw/svdlayer.cxx
View File

@@ -99,15 +99,15 @@ bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const
} }
SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent): SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdmin* pNewParent):
pParent(pNewParent), m_pParent(pNewParent),
pModel(nullptr), m_pModel(nullptr),
maControlLayerName("controls") maControlLayerName("controls")
{ {
} }
SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin): SdrLayerAdmin::SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin):
pParent(nullptr), m_pParent(nullptr),
pModel(nullptr), m_pModel(nullptr),
maControlLayerName("controls") maControlLayerName("controls")
{ {
*this = rSrcLayerAdmin; *this = rSrcLayerAdmin;
@@ -127,7 +127,7 @@ SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmin)
if (this != &rSrcLayerAdmin) if (this != &rSrcLayerAdmin)
{ {
maLayers.clear(); maLayers.clear();
pParent=rSrcLayerAdmin.pParent; m_pParent=rSrcLayerAdmin.m_pParent;
sal_uInt16 i; sal_uInt16 i;
sal_uInt16 nCount=rSrcLayerAdmin.GetLayerCount(); sal_uInt16 nCount=rSrcLayerAdmin.GetLayerCount();
for (i=0; i<nCount; i++) { for (i=0; i<nCount; i++) {
@@ -139,8 +139,8 @@ SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmin)
void SdrLayerAdmin::SetModel(SdrModel* pNewModelel) void SdrLayerAdmin::SetModel(SdrModel* pNewModelel)
{ {
if (pNewModelel!=pModel) { if (pNewModelel!=m_pModel) {
pModel=pNewModelel; m_pModel=pNewModelel;
sal_uInt16 nCount=GetLayerCount(); sal_uInt16 nCount=GetLayerCount();
sal_uInt16 i; sal_uInt16 i;
for (i=0; i<nCount; i++) { for (i=0; i<nCount; i++) {
@@ -151,16 +151,16 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModelel)
void SdrLayerAdmin::Broadcast() const void SdrLayerAdmin::Broadcast() const
{ {
if (pModel!=nullptr) { if (m_pModel!=nullptr) {
SdrHint aHint(SdrHintKind::LayerOrderChange); SdrHint aHint(SdrHintKind::LayerOrderChange);
pModel->Broadcast(aHint); m_pModel->Broadcast(aHint);
pModel->SetChanged(); m_pModel->SetChanged();
} }
} }
void SdrLayerAdmin::InsertLayer(std::unique_ptr<SdrLayer> pLayer, sal_uInt16 nPos) void SdrLayerAdmin::InsertLayer(std::unique_ptr<SdrLayer> pLayer, sal_uInt16 nPos)
{ {
pLayer->SetModel(pModel); pLayer->SetModel(m_pModel);
if(nPos==0xFFFF) if(nPos==0xFFFF)
maLayers.push_back(std::move(pLayer)); maLayers.push_back(std::move(pLayer));
else else
@@ -180,7 +180,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const OUString& rName, sal_uInt16 nPos)
{ {
SdrLayerID nID=GetUniqueLayerID(); SdrLayerID nID=GetUniqueLayerID();
SdrLayer* pLay=new SdrLayer(nID,rName); SdrLayer* pLay=new SdrLayer(nID,rName);
pLay->SetModel(pModel); pLay->SetModel(m_pModel);
if(nPos==0xFFFF) if(nPos==0xFFFF)
maLayers.push_back(std::unique_ptr<SdrLayer>(pLay)); maLayers.push_back(std::unique_ptr<SdrLayer>(pLay));
else else
@@ -220,9 +220,9 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName) const
i++; i++;
} }
if(!pLay && pParent) if(!pLay && m_pParent)
{ {
pLay = pParent->GetLayer(rName); pLay = m_pParent->GetLayer(rName);
} }
return pLay; return pLay;
@@ -256,7 +256,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
aSet.Set(GetLayer(j)->GetID()); aSet.Set(GetLayer(j)->GetID());
} }
sal_uInt8 i; sal_uInt8 i;
if (pParent != nullptr) if (m_pParent != nullptr)
{ {
i = 254; i = 254;
while (i && aSet.IsSet(SdrLayerID(i))) while (i && aSet.IsSet(SdrLayerID(i)))