include/svx/galtheme.hxx | 22 +++++++++++-----------
svx/source/gallery2/gallery1.cxx | 4 ++--
svx/source/gallery2/galtheme.cxx | 36 ++++++++++++++++++------------------
3 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 6daa6b730b479121c8e2d8a70d3622c464d2701c
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Feb 24 08:04:00 2025 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 24 09:13:47 2025 +0100
svx: prefix members of GalleryTheme
See tdf#94879 for motivation.
Change-Id: I671da8408c1935a99a71e669c13abc3dfc687d1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182075
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index fc4d24419edd..dc61142fab0c 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -58,13 +58,13 @@ private:
std::unique_ptr<GalleryFileStorage> mpGalleryStorageEngine;
GalleryObjectCollection maGalleryObjectCollection;
- Gallery* pParent;
- GalleryThemeEntry* pThm;
+ Gallery* mpParent;
+ GalleryThemeEntry* mpThm;
sal_uInt32 mnThemeLockCount;
sal_uInt32 mnBroadcasterLockCount;
- sal_uInt32 nDragPos;
- bool bDragging;
- bool bAbortActualize;
+ sal_uInt32 mnDragPos;
+ bool mbDragging;
+ bool mbAbortActualize;
const std::unique_ptr<GalleryFileStorage>& getGalleryStorageEngine() const
{ return mpGalleryStorageEngine; }
@@ -95,8 +95,8 @@ public:
sal_uInt32 GetId() const;
SAL_DLLPRIVATE void SetId( sal_uInt32 nNewId, bool bResetThemeName
);
- SAL_DLLPRIVATE void SetDragging( bool bSet ) { bDragging = bSet; }
- SAL_DLLPRIVATE bool IsDragging() const { return bDragging; }
+ SAL_DLLPRIVATE void SetDragging( bool bSet ) { mbDragging = bSet; }
+ SAL_DLLPRIVATE bool IsDragging() const { return mbDragging; }
SAL_DLLPRIVATE void LockTheme() { ++mnThemeLockCount; }
SAL_DLLPRIVATE bool UnlockTheme();
@@ -105,16 +105,16 @@ public:
void UnlockBroadcaster();
SAL_DLLPRIVATE bool IsBroadcasterLocked() const { return
mnBroadcasterLockCount > 0; }
- SAL_DLLPRIVATE void SetDragPos(sal_uInt32 nPos) { nDragPos = nPos;
}
- SAL_DLLPRIVATE sal_uInt32 GetDragPos() const { return nDragPos; }
+ SAL_DLLPRIVATE void SetDragPos(sal_uInt32 nPos) { mnDragPos =
nPos; }
+ SAL_DLLPRIVATE sal_uInt32 GetDragPos() const { return mnDragPos; }
bool IsReadOnly() const;
bool IsDefault() const;
void Actualize( const Link<const INetURLObject&,
void>& rActualizeLink, GalleryProgress* pProgress = nullptr );
- SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; }
+ SAL_DLLPRIVATE void AbortActualize() { mbAbortActualize = true; }
- SAL_DLLPRIVATE Gallery* GetParent() const { return pParent; }
+ SAL_DLLPRIVATE Gallery* GetParent() const { return mpParent; }
public:
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 4813c724c98e..dac08e0bb73a 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -610,8 +610,8 @@ void Gallery::RenameTheme( const OUString& rOldName, const
OUString& rNewName )
if( pThm )
{
pThemeEntry->SetName( rNewName );
- if (pThm->pThm->IsModified())
- if (!pThm->mpGalleryStorageEngine->implWrite(*pThm, pThm->pThm))
+ if (pThm->mpThm->IsModified())
+ if (!pThm->mpGalleryStorageEngine->implWrite(*pThm, pThm->mpThm))
pThm->ImplSetModified(false);
Broadcast( GalleryHint( GalleryHintType::THEME_RENAMED, rOldName,
pThm->GetName() ) );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index d211ca1b1738..f2d7854d3aa7 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -50,21 +50,21 @@
using namespace ::com::sun::star;
GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
- : pParent(pGallery)
- , pThm(pThemeEntry)
+ : mpParent(pGallery)
+ , mpThm(pThemeEntry)
, mnThemeLockCount(0)
, mnBroadcasterLockCount(0)
- , nDragPos(0)
- , bDragging(false)
- , bAbortActualize(false)
+ , mnDragPos(0)
+ , mbDragging(false)
+ , mbAbortActualize(false)
{
- mpGalleryStorageEngine =
pThm->createGalleryStorageEngine(maGalleryObjectCollection);
+ mpGalleryStorageEngine =
mpThm->createGalleryStorageEngine(maGalleryObjectCollection);
}
GalleryTheme::~GalleryTheme()
{
- if(pThm->IsModified())
- if(!mpGalleryStorageEngine->implWrite(*this, pThm))
+ if(mpThm->IsModified())
+ if(!mpGalleryStorageEngine->implWrite(*this, mpThm))
ImplSetModified(false);
for (auto & pEntry : maGalleryObjectCollection.getObjectList())
@@ -210,13 +210,13 @@ void GalleryTheme::Actualize( const Link<const
INetURLObject&, void>& rActualize
const sal_uInt32 nCount = maGalleryObjectCollection.size();
LockBroadcaster();
- bAbortActualize = false;
+ mbAbortActualize = false;
// reset delete flag
for (sal_uInt32 i = 0; i < nCount; i++)
maGalleryObjectCollection.get(i)->mbDelete = false;
- for (sal_uInt32 i = 0; ( i < nCount ) && !bAbortActualize; i++)
+ for (sal_uInt32 i = 0; ( i < nCount ) && !mbAbortActualize; i++)
{
if( pProgress )
pProgress->Update( i, nCount - 1 );
@@ -288,8 +288,8 @@ void GalleryTheme::Actualize( const Link<const
INetURLObject&, void>& rActualize
// update theme
mpGalleryStorageEngine->updateTheme();
ImplSetModified( true );
- if (pThm->IsModified())
- if (!mpGalleryStorageEngine->implWrite(*this, pThm))
+ if (mpThm->IsModified())
+ if (!mpGalleryStorageEngine->implWrite(*this, mpThm))
ImplSetModified(false);
UnlockBroadcaster();
}
@@ -764,15 +764,15 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
void GalleryTheme::ImplSetModified( bool bModified )
{
- pThm->SetModified(bModified);
+ mpThm->SetModified(bModified);
}
-sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
-void GalleryTheme::SetId( sal_uInt32 nNewId, bool bResetThemeName ) {
pThm->SetId( nNewId, bResetThemeName ); }
-bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
-bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
+sal_uInt32 GalleryTheme::GetId() const { return mpThm->GetId(); }
+void GalleryTheme::SetId( sal_uInt32 nNewId, bool bResetThemeName ) {
mpThm->SetId( nNewId, bResetThemeName ); }
+bool GalleryTheme::IsReadOnly() const { return mpThm->IsReadOnly(); }
+bool GalleryTheme::IsDefault() const { return mpThm->IsDefault(); }
-const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
+const OUString& GalleryTheme::GetName() const { return mpThm->GetThemeName(); }
const INetURLObject& GalleryTheme::getThemeURL() const { return
mpGalleryStorageEngine->getThemeURL(); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
