svx: change instances of maName to more descriptive names

maName is just not descriptive enough and hard to search the source for.

Also in this patch:
- tracked down what ASE, GPL and SOC stand for and added a comment
- found instances of aName, local variables and changed these to
aPaletteName

Change-Id: I4c7eee31b604a8ef2ebef5fd1daa81e193dd7295
Reviewed-on: https://gerrit.libreoffice.org/20958
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

3 files changed, 15 insertions, 9 deletions

diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index b8c32ff1350b..a05097b3a825 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -21,7 +21,7 @@ namespace svx
 
 class SVX_DLLPUBLIC ColorSet
 {
-    OUString maName;
+    OUString maColorSetName;
     std::vector<Color> maColors;
 public:
     ColorSet(OUString const & aName);
@@ -34,7 +34,7 @@ public:
 
     const OUString& getName() const
     {
-        return maName;
+        return maColorSetName;
     }
     const Color& getColor(sal_uInt32 nIndex) const
     {
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index 9c50899ec687..fa2c1798ff1e 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -40,11 +40,13 @@ public:
     virtual bool                IsValid() = 0;
 };
 
+// ASE = Adobe Swatch Exchange
+
 class PaletteASE : public Palette
 {
     bool        mbValidPalette;
     OUString    maFPath;
-    OUString    maName;
+    OUString    maASEPaletteName;
     ColorList   maColors;
 
     void        LoadPalette();
@@ -58,13 +60,15 @@ public:
     virtual bool                IsValid() override;
 };
 
+// GPL - this is *not* GNU Public License, but is the Gimp PaLette
+
 class PaletteGPL : public Palette
 {
     bool        mbLoadedPalette;
     bool        mbValidPalette;
     OUString    maFName;
     OUString    maFPath;
-    OUString    maName;
+    OUString    maGPLPaletteName;
     ColorList   maColors;
 
     bool        ReadPaletteHeader(SvFileStream& rFileStream);
@@ -80,11 +84,13 @@ public:
     virtual bool                IsValid() override;
 };
 
+// SOC - Star Office Color-table
+
 class PaletteSOC : public Palette
 {
     bool            mbLoadedPalette;
     OUString        maFPath;
-    OUString        maName;
+    OUString        maSOCPaletteName;
     XColorListRef   mpColorList;
 public:
     PaletteSOC( const OUString &rFPath, const OUString &rFName );
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 9859fc061caa..004aa3f1418d 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -29,18 +29,18 @@
 class SVX_DLLPUBLIC XPropertyEntry
 {
 private:
-    OUString maName;
+    OUString maPropEntryName;
     Bitmap   maUiBitmap;
 
 protected:
-    XPropertyEntry(const OUString& rName);
+    XPropertyEntry(const OUString& rPropEntryName);
     XPropertyEntry(const XPropertyEntry& rOther);
 
 public:
     virtual ~XPropertyEntry();
 
-    void SetName(const OUString& rName) { maName = rName; }
-    const OUString& GetName() const { return maName; }
+    void SetName(const OUString& rPropEntryName) { maPropEntryName = rPropEntryName; }
+    const OUString& GetName() const { return maPropEntryName; }
     void SetUiBitmap(const Bitmap& rUiBitmap) { maUiBitmap = rUiBitmap; }
     const Bitmap& GetUiBitmap() const { return maUiBitmap; }
 };