svx: combine svx::NamedThemedColor into NamedColor

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

3 files changed, 14 insertions, 14 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 64ec01ef5abf..7399f03eb0be 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -658,7 +658,7 @@ private:
     ColorModel          eCM;
 
     Color               aPreviousColor;
-    svx::NamedThemedColor aCurrentColor;
+    NamedColor aCurrentColor;
 
     PaletteManager maPaletteManager;
     SvxXRectPreview m_aCtlPreviewOld;
@@ -714,7 +714,7 @@ private:
     DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void);
     DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void );
     DECL_LINK( SelectColorModeHdl_Impl, weld::Toggleable&, void );
-    void ChangeColor(const svx::NamedThemedColor &rNewColor, bool bUpdatePreset = true);
+    void ChangeColor(const NamedColor &rNewColor, bool bUpdatePreset = true);
     void SetColorModel(ColorModel eModel);
     void ChangeColorModel();
     void UpdateColorValues( bool bUpdatePreset = true );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 601dae8dce0e..87984d573281 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1572,7 +1572,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
     sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR );
     const SfxItemSet& rOldSet = GetItemSet();
 
-    svx::NamedThemedColor aSelectedColor;
+    NamedColor aSelectedColor;
     bool bChanged = m_bNewFontColor;
 
     if (bChanged)
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 799f53957678..470b1c13a866 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -209,9 +209,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
         ChangeColorModel();
 
         const Color aColor = pFillColorItem->GetColorValue();
-        svx::NamedThemedColor aThemedColor;
-        aThemedColor.m_aColor = aColor;
-        ChangeColor( aThemedColor );
+        NamedColor aNamedColor;
+        aNamedColor.m_aColor = aColor;
+        ChangeColor(aNamedColor);
         sal_Int32 nPos = FindInPalette( aColor );
 
         if ( nPos != -1 )
@@ -288,9 +288,9 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
     SetColorModel( eCM );
     ChangeColorModel();
 
-    svx::NamedThemedColor aThemedColor;
-    aThemedColor.m_aColor = aNewColor;
-    ChangeColor(aThemedColor);
+    NamedColor aColor;
+    aColor.m_aColor = aNewColor;
+    ChangeColor(aColor);
 
     UpdateModified();
 }
@@ -518,14 +518,14 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void)
     {
         bThemePaletteSelected = maPaletteManager.IsThemePaletteSelected();
     }
-    svx::NamedThemedColor aThemedColor;
-    aThemedColor.m_aColor = aColor;
+    NamedColor aNamedColor;
+    aNamedColor.m_aColor = aColor;
     if (bThemePaletteSelected)
     {
-        PaletteManager::GetThemeIndexLumModOff(nPos, aThemedColor.m_nThemeIndex, aThemedColor.m_nLumMod, aThemedColor.m_nLumOff);
+        PaletteManager::GetThemeIndexLumModOff(nPos, aNamedColor.m_nThemeIndex, aNamedColor.m_nLumMod, aNamedColor.m_nLumOff);
     }
 
-    ChangeColor(aThemedColor, false);
+    ChangeColor(aNamedColor, false);
 
     if (pValSet == m_xValSetColorList.get())
     {
@@ -588,7 +588,7 @@ IMPL_STATIC_LINK_NOARG(SvxColorTabPage, OnMoreColorsClick, weld::Button&, void)
     comphelper::dispatchCommand(".uno:AdditionsDialog", aArgs);
 }
 
-void SvxColorTabPage::ChangeColor(const svx::NamedThemedColor &rNewColor, bool bUpdatePreset )
+void SvxColorTabPage::ChangeColor(const NamedColor &rNewColor, bool bUpdatePreset )
 {
     aPreviousColor = rNewColor.m_aColor;
     aCurrentColor = rNewColor;