ColorData->Color in sd..svx

Change-Id: I70de56b6bfb1ea4655ec03510fad92bf6645f64e
Reviewed-on: https://gerrit.libreoffice.org/50046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 24 insertions, 25 deletions

diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 97b53cbcf162..5d1f3db27f0d 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -836,7 +836,7 @@ sal_Int32 SAL_CALL AccessibleDocumentViewBase::getBackground(  )
 {
      ThrowIfDisposed ();
     ::osl::MutexGuard aGuard (maMutex);
-    return mpViewShell->GetView()->getColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
+    return sal_Int32(mpViewShell->GetView()->getColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor);
 }
 } // end of namespace accessibility
 
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 99f7b360fdaf..756395796bcc 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -370,7 +370,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground()
 {
     ThrowIfDisposed ();
     svtools::ColorConfig aColorConfig;
-    sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+    Color nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
     return static_cast<sal_Int32>(nColor);
 }
 
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index d070bcd14a6d..6e9348f475ba 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -480,7 +480,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground()
 {
     ThrowIfDisposed();
     svtools::ColorConfig aColorConfig;
-    sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
+    Color nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
     return static_cast<sal_Int32>(nColor);
 }
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index e9d5d6b29b2c..1f4827c0c5a6 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -73,7 +73,7 @@ public:
         Color_PageCountFontColor,
         ColorType_Size_
     };
-    ColorData GetColor (const ColorType eType);
+    Color GetColor (const ColorType eType);
 
     enum GradientColorType {
         Gradient_NormalPage,
@@ -91,12 +91,12 @@ public:
         Fill1,
         Fill2
     };
-    ColorData GetGradientColor (
+    Color GetGradientColor (
         const GradientColorType eType,
         const GradientColorClass eClass);
     void SetGradient (
         const GradientColorType eType,
-        const ColorData aBaseColor,
+        const Color aBaseColor,
         const sal_Int32 nSaturationOverride,
         const sal_Int32 nBrightnessOverride,
         const sal_Int32 nFillStartOffset,
@@ -118,15 +118,15 @@ private:
     class GradientDescriptor
     {
     public:
-        ColorData maFillColor1;
-        ColorData maFillColor2;
-        ColorData maBorderColor1;
-        ColorData maBorderColor2;
+        Color maFillColor1;
+        Color maFillColor2;
+        Color maBorderColor1;
+        Color maBorderColor2;
     };
-    ColorData maBackgroundColor;
+    Color maBackgroundColor;
     ::std::vector<GradientDescriptor> maGradients;
     ::std::vector<BitmapEx> maIcons;
-    ::std::vector<ColorData> maColor;
+    ::std::vector<Color> maColor;
 
     GradientDescriptor& GetGradient (const GradientColorType eType);
     /** Guarded initialization of the specified icon in the maIcons
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index bc38109a7f75..5b22ad40f474 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -32,28 +32,27 @@
 
 namespace sd { namespace slidesorter { namespace view {
 
-const static ColorData Black = 0x000000;
-const static ColorData White = 0xffffff;
+const static Color Black = 0x000000;
+const static Color White = 0xffffff;
 
-ColorData ChangeLuminance (const ColorData aColorData, const int nValue)
+Color ChangeLuminance (Color aColor, const int nValue)
 {
-    Color aColor (aColorData);
     if (nValue > 0)
         aColor.IncreaseLuminance(nValue);
     else
         aColor.DecreaseLuminance(-nValue);
-    return aColor.GetColor();
+    return aColor;
 }
 
-ColorData HGBAdapt (
-    const ColorData aColorData,
+Color HGBAdapt (
+    const Color aColor,
     const sal_Int32 nNewSaturation,
     const sal_Int32 nNewBrightness)
 {
     sal_uInt16 nHue (0);
     sal_uInt16 nSaturation (0);
     sal_uInt16 nBrightness (0);
-    Color(aColorData).RGBtoHSB(nHue, nSaturation, nBrightness);
+    aColor.RGBtoHSB(nHue, nSaturation, nBrightness);
     return Color::HSBtoRGB(
         nHue,
         nNewSaturation>=0 ? nNewSaturation : nSaturation,
@@ -88,7 +87,7 @@ void Theme::Update (const std::shared_ptr<controller::Properties>& rpProperties)
     maGradients.resize(GradientColorType_Size_);
 
     maColor[Color_Background] = maBackgroundColor;
-    const ColorData aSelectionColor (rpProperties->GetSelectionColor().GetColor());
+    const Color aSelectionColor (rpProperties->GetSelectionColor());
     maColor[Color_Selection] = aSelectionColor;
     if (Color(aSelectionColor).IsBright())
         maColor[Color_PageCountFontColor] = Black;
@@ -160,7 +159,7 @@ std::shared_ptr<vcl::Font> Theme::GetFont (
     return pFont;
 }
 
-ColorData Theme::GetColor (const ColorType eType)
+Color Theme::GetColor (const ColorType eType)
 {
     if (sal_uInt32(eType)<maColor.size())
         return maColor[eType];
@@ -168,7 +167,7 @@ ColorData Theme::GetColor (const ColorType eType)
         return 0;
 }
 
-ColorData Theme::GetGradientColor (
+Color Theme::GetGradientColor (
     const GradientColorType eType,
     const GradientColorClass eClass)
 {
@@ -186,7 +185,7 @@ ColorData Theme::GetGradientColor (
 
 void Theme::SetGradient (
     const GradientColorType eType,
-    const ColorData aBaseColor,
+    const Color aBaseColor,
     const sal_Int32 nSaturationOverride,
     const sal_Int32 nBrightnessOverride,
     const sal_Int32 nFillStartOffset,
@@ -196,7 +195,7 @@ void Theme::SetGradient (
 {
     GradientDescriptor& rGradient (GetGradient(eType));
 
-    const ColorData aColor (nSaturationOverride>=0 || nBrightnessOverride>=0
+    const Color aColor (nSaturationOverride>=0 || nBrightnessOverride>=0
         ? HGBAdapt(aBaseColor, nSaturationOverride, nBrightnessOverride)
         : aBaseColor);