core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/PaletteManager.hxx         |    2 +-
 svx/source/tbxctrls/PaletteManager.cxx |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9e1a9d7f43112880ba119a61912f306ff29c7987
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jun 10 09:18:12 2025 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Jun 10 11:36:50 2025 +0200

    svx: prefix members of PaletteManager
    
    See tdf#94879 for motivation.
    
    Change-Id: I25ae3bd1de7a07f6c8b4ab2977570381ca688fbc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186318
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index c09fd73dfbc1..2b39dee9fd8b 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -43,7 +43,7 @@ class SVXCORE_DLLPUBLIC PaletteManager : public 
std::enable_shared_from_this<Pal
     tools::Long                    mnColorCount;
     svx::ToolboxButtonColorUpdaterBase* mpBtnUpdater;
 
-    XColorListRef           pColorList;
+    XColorListRef           mpColorList;
     std::deque<NamedColor>  maRecentColors;
     std::vector<std::unique_ptr<Palette>> m_Palettes;
 
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index a208b218605c..0e2dd510ec04 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -63,10 +63,10 @@ PaletteManager::PaletteManager() :
     {
         const SfxPoolItem* pItem = nullptr;
         if( nullptr != ( pItem = pDocSh->GetItem(SID_COLOR_TABLE) ) )
-            pColorList = 
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
+            mpColorList = 
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
     }
-    if(!pColorList.is())
-        pColorList = XColorList::CreateStdColorList();
+    if(!mpColorList.is())
+        mpColorList = XColorList::CreateStdColorList();
     LoadPalettes();
     mnNumOfPalettes += m_Palettes.size();
 
@@ -286,17 +286,17 @@ void PaletteManager::SetPalette( sal_Int32 nPos )
     mnCurrentPalette = nPos;
     if( nPos != mnNumOfPalettes - 1 && nPos != 0)
     {
-        pColorList = XPropertyList::AsColorList(
+        mpColorList = XPropertyList::AsColorList(
                             XPropertyList::CreatePropertyListFromURL(
                             XPropertyListType::Color, 
GetSelectedPalettePath()));
         auto name = GetPaletteName(); // may change pColorList
-        pColorList->SetName(name);
-        if(pColorList->Load())
+        mpColorList->SetName(name);
+        if(mpColorList->Load())
         {
             SfxObjectShell* pShell = SfxObjectShell::Current();
             if (pShell != nullptr)
             {
-                SvxColorListItem aColorItem(pColorList, SID_COLOR_TABLE);
+                SvxColorListItem aColorItem(mpColorList, SID_COLOR_TABLE);
                 pShell->PutItem( aColorItem );
             }
         }
@@ -325,7 +325,7 @@ OUString PaletteManager::GetPaletteName()
         {
             const SfxPoolItem* pItem = nullptr;
             if( nullptr != ( pItem = pDocSh->GetItem(SID_COLOR_TABLE) ) )
-                pColorList = 
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
+                mpColorList = 
pItem->StaticWhichCast(SID_COLOR_TABLE).GetColorList();
         }
     }
     return aNames[mnCurrentPalette];