editeng: move "tint or shade" variable into SvxThemeColor

Change-Id: Ia2094854a8275082cf7444307e17fe5449c43b3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143698
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

1 files changed, 14 insertions, 12 deletions

diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index cbd52844b059..05a7183c8582 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -34,6 +34,8 @@ class EDITENG_DLLPUBLIC SvxThemeColor
     /// Luminance Offset: 100th percentage, defaults to 0%.
     sal_Int16 mnLumOff;
 
+    sal_Int16 mnTintOrShade;
+
 public:
     explicit SvxThemeColor();
     bool operator==(const SvxThemeColor& rThemeColor) const;
@@ -46,8 +48,8 @@ public:
     void SetThemeIndex(sal_Int16 nIndex)
     {
         maThemeIndex = nIndex;
-    }
 
+    }
     void SetLumMod(sal_Int16 nLumMod) { mnLumMod = nLumMod; }
 
     sal_Int16 GetLumMod() const { return mnLumMod; }
@@ -56,6 +58,16 @@ public:
 
     sal_Int16 GetLumOff() const { return mnLumOff; }
 
+    sal_Int16 GetTintOrShade() const
+    {
+        return mnTintOrShade;
+    }
+
+    void SetTintOrShade(sal_Int16 nTintOrShade)
+    {
+        mnTintOrShade = nTintOrShade;
+    }
+
     void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
@@ -66,7 +78,7 @@ class EDITENG_DLLPUBLIC SvxColorItem final : public SfxPoolItem
 private:
     Color mColor;
     SvxThemeColor maThemeColor;
-    sal_Int16 maTintShade;
+
 
 public:
     static SfxPoolItem* CreateDefault();
@@ -93,16 +105,6 @@ public:
     }
     void SetValue(const Color& rNewColor);
 
-    sal_Int16 GetTintOrShade() const
-    {
-        return maTintShade;
-    }
-
-    void SetTintOrShade(sal_Int16 nTintOrShade)
-    {
-        maTintShade = nTintOrShade;
-    }
-
     SvxThemeColor& GetThemeColor() { return maThemeColor; }
 
     const SvxThemeColor& GetThemeColor() const { return maThemeColor; }