use more Color in sfx2..svtools

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

3 files changed, 11 insertions, 11 deletions

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 22d5af1c38b1..8f2e4017234b 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -254,7 +254,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getForeground()
 
     if (!pWin)
         throw RuntimeException();
-    return static_cast<sal_Int32>(pWin->GetTextColor().GetColor());
+    return static_cast<sal_Int32>(pWin->GetTextColor());
 }
 
 sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
@@ -266,9 +266,9 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground()
     Wallpaper aWall( pWin->GetDisplayBackground() );
     Color nCol;
     if (aWall.IsBitmap() || aWall.IsGradient())
-        nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor().GetColor();
+        nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor();
     else
-        nCol = aWall.GetColor().GetColor();
+        nCol = aWall.GetColor();
     return static_cast<sal_Int32>(nCol);
 }
 
@@ -356,7 +356,7 @@ Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStat
             pStateSet->AddState( AccessibleStateType::SHOWING );
         if (pWin->IsReallyVisible())
             pStateSet->AddState( AccessibleStateType::VISIBLE );
-        if (COL_TRANSPARENT != pWin->GetBackground().GetColor().GetColor())
+        if (COL_TRANSPARENT != pWin->GetBackground().GetColor())
             pStateSet->AddState( AccessibleStateType::OPAQUE );
     }
 
@@ -1677,7 +1677,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getForeground()
 
     if (!pWin)
         throw RuntimeException();
-    return static_cast<sal_Int32>(pWin->GetTextColor().GetColor());
+    return static_cast<sal_Int32>(pWin->GetTextColor());
 }
 
 sal_Int32 SAL_CALL SmEditAccessible::getBackground()
@@ -1689,9 +1689,9 @@ sal_Int32 SAL_CALL SmEditAccessible::getBackground()
     Wallpaper aWall( pWin->GetDisplayBackground() );
     Color nCol;
     if (aWall.IsBitmap() || aWall.IsGradient())
-        nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor().GetColor();
+        nCol = pWin->GetSettings().GetStyleSettings().GetWindowColor();
     else
-        nCol = aWall.GetColor().GetColor();
+        nCol = aWall.GetColor();
     return static_cast<sal_Int32>(nCol);
 }
 
@@ -1784,7 +1784,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleSt
             pStateSet->AddState( AccessibleStateType::SHOWING );
         if (pWin->IsReallyVisible())
             pStateSet->AddState( AccessibleStateType::VISIBLE );
-        if (COL_TRANSPARENT != pWin->GetBackground().GetColor().GetColor())
+        if (COL_TRANSPARENT != pWin->GetBackground().GetColor())
             pStateSet->AddState( AccessibleStateType::OPAQUE );
     }
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 756eb67b675d..ee3e1f5cbf5b 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -54,8 +54,8 @@ void lclGetSettingColors(Color& rBackgroundColor, Color& rTextColor)
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     if (rStyleSettings.GetHighContrastMode())
     {
-        rBackgroundColor = rStyleSettings.GetFieldColor().GetColor();
-        rTextColor = rStyleSettings.GetFieldTextColor().GetColor();
+        rBackgroundColor = rStyleSettings.GetFieldColor();
+        rTextColor = rStyleSettings.GetFieldTextColor();
     }
     else
     {
diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx
index a6bb67a7d77f..231204ea4631 100644
--- a/starmath/source/tmpdevice.cxx
+++ b/starmath/source/tmpdevice.cxx
@@ -45,7 +45,7 @@ SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) :
 
 Color SmTmpDevice::Impl_GetColor( const Color& rColor )
 {
-    Color nNewCol = rColor.GetColor();
+    Color nNewCol = rColor;
     if (nNewCol == COL_AUTO)
     {
         if (OUTDEV_PRINTER == rOutDev.GetOutDevType())