replace Color(COL_*) with COL_*

using

    git grep -lwP "Color\s*\(\s*(COL_\w+)\s*\)"
    | xargs perl -pi -e "s/Color\s*\(\s*(COL_\w+)\s*\)/
/g"

and then some manual fixup where the resulting expression no longer
compiled

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

39 files changed, 90 insertions, 90 deletions

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 4784c54a6fa2..33fd03046fc9 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -402,11 +402,11 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window*
     get(m_pCbxTrans, "cbx5");
     get(m_pLbColorTrans, "color5");
 
-    m_pLbColorTrans->SelectEntry(Color(COL_BLACK));
-    m_pLbColor1->SelectEntry(Color(COL_TRANSPARENT));
-    m_pLbColor2->SelectEntry(Color(COL_TRANSPARENT));
-    m_pLbColor3->SelectEntry(Color(COL_TRANSPARENT));
-    m_pLbColor4->SelectEntry(Color(COL_TRANSPARENT));
+    m_pLbColorTrans->SelectEntry(COL_BLACK);
+    m_pLbColor1->SelectEntry(COL_TRANSPARENT);
+    m_pLbColor2->SelectEntry(COL_TRANSPARENT);
+    m_pLbColor3->SelectEntry(COL_TRANSPARENT);
+    m_pLbColor4->SelectEntry(COL_TRANSPARENT);
 
     m_pTbxPipette->SetSelectHdl( LINK( pData, MaskData, PipetteHdl ) );
     m_pBtnExec->SetClickHdl( LINK( pData, MaskData, ExecHdl ) );
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 322d06dfb970..7e4180b8f986 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -119,8 +119,8 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
 
             if ( pVDev->SetOutputSizePixel( rSizePix ) )
             {
-                pVDev->SetLineColor( Color( COL_BLACK ) );
-                pVDev->SetFillColor( Color( COL_BLACK ) );
+                pVDev->SetLineColor( COL_BLACK );
+                pVDev->SetFillColor( COL_BLACK );
 
                 for( sal_uInt16 i = 0; i < nCount; i++ )
                 {
@@ -149,7 +149,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
     }
     else if( rGraphic.GetType() != GraphicType::NONE )
     {
-        const Graphic   aTmpGrf( rGraphic.GetGDIMetaFile().GetMonochromeMtf( Color( COL_BLACK ) ) );
+        const Graphic   aTmpGrf( rGraphic.GetGDIMetaFile().GetMonochromeMtf( COL_BLACK ) );
         ScopedVclPtrInstance< VirtualDevice > pVDev;
         Size            aSizePix( pVDev->LogicToPixel( aTmpGrf.GetPrefSize(), aTmpGrf.GetPrefMapMode() ) );
 
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index b25c123f27b6..e404154ed46d 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -31,7 +31,7 @@
 
 using namespace css;
 
-#define TRANSCOL Color(COL_WHITE)
+#define TRANSCOL COL_WHITE
 
 ContourWindow::ContourWindow(vcl::Window* pParent, WinBits nBits)
     : GraphCtrl (pParent, nBits)
@@ -224,8 +224,8 @@ void ContourWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
 
     const Graphic& rGraphic = GetGraphic();
     rTarget.Push(PushFlags::LINECOLOR |PushFlags::FILLCOLOR);
-    rTarget.SetLineColor(Color(COL_BLACK));
-    rTarget.SetFillColor(Color(COL_WHITE));
+    rTarget.SetLineColor(COL_BLACK);
+    rTarget.SetFillColor(COL_WHITE);
     rTarget.DrawRect( tools::Rectangle( Point(), GetGraphicSize() ) );
     rTarget.Pop();
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 96b1cd5b347d..8e2e68baafc4 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -297,7 +297,7 @@ bool SvxRedlinTable::IsValidComment(const OUString &rCommentStr)
 SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,
         RedlinData *pUserData, SvTreeListEntry* pParent, sal_uLong nPos)
 {
-    const Color aColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor();
+    const Color aColor = (pUserData && pUserData->bDisabled) ? COL_GRAY : GetTextColor();
 
     return InsertEntry(rStr, pUserData, aColor, pParent, nPos);
 }
@@ -318,7 +318,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,
 SvTreeListEntry* SvxRedlinTable::InsertEntry(const Image &rRedlineType, const OUString& rStr,
         RedlinData *pUserData, SvTreeListEntry* pParent, sal_uLong nPos)
 {
-    maEntryColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor();
+    maEntryColor = (pUserData && pUserData->bDisabled) ? COL_GRAY : GetTextColor();
     maEntryImage = rRedlineType;
     maEntryString = rStr;
 
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 33a2d601e7b3..0eee4586f225 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -135,7 +135,7 @@ void Svx3DPreviewControl::Construct()
         XATTR_FILL_FIRST, XATTR_FILLBITMAP>{} );
     aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
     aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
-    aSet.Put( XFillColorItem( "", Color( COL_WHITE ) ) );
+    aSet.Put( XFillColorItem( "", COL_WHITE ) );
 
     mpScene->SetMergedItemSet(aSet);
 
@@ -907,7 +907,7 @@ Color Svx3DLightControl::GetLightColor(sal_uInt32 nNum) const
         }
     }
 
-    return Color(COL_BLACK);
+    return COL_BLACK;
 }
 
 basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 92f2d147379c..d89b71b3e2a1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -727,9 +727,9 @@ SvxPixelCtl::SvxPixelCtl(vcl::Window* pParent)
     , bPaintable(true)
     , aFocusPosition(0,0)
 {
-    SetPixelColor( Color( COL_BLACK ) );
-    SetBackgroundColor( Color( COL_WHITE ) );
-    SetLineColor( Color( COL_LIGHTGRAY ) );
+    SetPixelColor( COL_BLACK );
+    SetBackgroundColor( COL_WHITE );
+    SetLineColor( COL_LIGHTGRAY );
     maPixelData.fill(0);
 }
 
@@ -837,8 +837,8 @@ void SvxPixelCtl::Paint( vcl::RenderContext& rRenderContext, const tools::Rectan
     }
     else
     {
-        rRenderContext.SetBackground(Wallpaper(Color(COL_LIGHTGRAY)));
-        rRenderContext.SetLineColor(Color(COL_LIGHTRED));
+        rRenderContext.SetBackground(Wallpaper(COL_LIGHTGRAY));
+        rRenderContext.SetLineColor(COL_LIGHTRED);
         rRenderContext.DrawLine(Point(0, 0), Point(aRectSize.Width(), aRectSize.Height()));
         rRenderContext.DrawLine(Point(0, aRectSize.Height()), Point(aRectSize.Width(), 0));
     }
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 269ac3e52e49..fd5681a634d9 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -642,7 +642,7 @@ StyleVectorCombination::StyleVectorCombination(
                         rStyle.Dist() * 0.5,
                         rStyle.UseGapColor()
                             ? (nullptr != pForceColor ? *pForceColor : rStyle.GetColorGap())
-                            : Color(COL_TRANSPARENT)));
+                            : COL_TRANSPARENT));
 
                 maOffsets.push_back(
                     OffsetAndHalfWidthAndColor(
diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx
index 115dbe7997cd..884340980708 100644
--- a/svx/source/dialog/hexcolorcontrol.cxx
+++ b/svx/source/dialog/hexcolorcontrol.cxx
@@ -51,7 +51,7 @@ sal_Int32 HexColorControl::GetColor()
     sax::Converter::convertColor(nColor, aStr);
 
     if (nColor == -1)
-        SetControlBackground(Color(COL_RED));
+        SetControlBackground(COL_RED);
     else
         SetControlBackground();
 
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index c577bd8fb1e9..8c2ae5c64807 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -52,7 +52,7 @@ using namespace com::sun::star;
 using ::com::sun::star::frame::XFrame;
 using ::com::sun::star::uno::Reference;
 
-#define TRANSCOL Color( COL_WHITE )
+#define TRANSCOL COL_WHITE
 
 IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) :
             GraphCtrl( pParent, nBits ),
@@ -261,12 +261,12 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
         if ( !pIMapObj->IsActive() )
         {
             aSet.Put( XFillTransparenceItem( 100 ) );
-            aSet.Put( XLineColorItem( "", Color( COL_RED ) ) );
+            aSet.Put( XLineColorItem( "", COL_RED ) );
         }
         else
         {
             aSet.Put( XFillTransparenceItem( 50 ) );
-            aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) );
+            aSet.Put( XLineColorItem( "", COL_BLACK ) );
         }
 
         pSdrObj->SetMergedItemSetAndBroadcast(aSet);
@@ -583,12 +583,12 @@ void IMapWindow::SetCurrentObjState( bool bActive )
         if ( !bActive )
         {
             aSet.Put( XFillTransparenceItem( 100 ) );
-            aSet.Put( XLineColorItem( "", Color( COL_RED ) ) );
+            aSet.Put( XLineColorItem( "", COL_RED ) );
         }
         else
         {
             aSet.Put( XFillTransparenceItem( 50 ) );
-            aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) );
+            aSet.Put( XLineColorItem( "", COL_BLACK ) );
         }
 
         pView->SetAttributes( aSet );
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 18e93e62e45d..dd80e3848e3d 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -785,7 +785,7 @@ IMPL_LINK_NOARG( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
 #if 0
             //! Gives white on white!?! instead of white on reddish.
             SetControlBackground( ::Color( Color( 0xff, 0x65, 0x63)));
-            SetControlForeground( ::Color( COL_WHITE));
+            SetControlForeground( ::COL_WHITE);
 #else
             SetControlForeground( ::Color( 0xf0, 0, 0) );
 #endif
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index a4ae5bb1f47c..eb2fc6ef92fd 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -152,7 +152,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
     // background
     if (!bSecond || bResetBackground)
     {
-        rRenderContext.SetLineColor(Color(COL_TRANSPARENT));
+        rRenderContext.SetLineColor(COL_TRANSPARENT);
         rRenderContext.SetFillColor(rDlgColor);
         Size winSize(rRenderContext.GetOutputSize());
         rRenderContext.DrawRect(tools::Rectangle(Point(0,0), winSize));
@@ -307,7 +307,7 @@ void SvxPageWindow::DrawPage(vcl::RenderContext& rRenderContext, const Point& rO
     if (bTable)
     {
         // Paint Table, if necessary center it
-        rRenderContext.SetLineColor(Color(COL_LIGHTGRAY));
+        rRenderContext.SetLineColor(COL_LIGHTGRAY);
 
         long nW = aRect.GetWidth();
         long nH = aRect.GetHeight();
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 3eee8771b4e5..9f203542cae5 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -84,7 +84,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext)
     {
         if (i == 3)
         {
-            rRenderContext.SetFillColor(Color(COL_GRAY));
+            rRenderContext.SetFillColor(COL_GRAY);
             long nTop = nUpper * aLineSiz.Height() / aSize.Height();
             aPnt.AdjustY(nTop * 2 );
         }
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 616f6eec9b34..ebfbefd4139a 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3364,7 +3364,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
             ScopedVclPtrInstance< VirtualDevice > pDev;
             const Size aSz(ruler_tab_svx.width + 2, ruler_tab_svx.height + 2);
             pDev->SetOutputSize(aSz);
-            pDev->SetBackground(Wallpaper(Color(COL_WHITE)));
+            pDev->SetBackground(Wallpaper(COL_WHITE));
             Color aFillColor(pDev->GetSettings().GetStyleSettings().GetShadowColor());
             const Point aPt(aSz.Width() / 2, aSz.Height() / 2);
 
@@ -3375,7 +3375,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
                 DrawTab(*pDev, aFillColor, aPt, nStyle);
                 aMenu->InsertItem(i + 1,
                                  SvxResId(RID_SVXSTR_RULER_TAB[i]),
-                                 Image(BitmapEx(pDev->GetBitmap(Point(), aSz), Color(COL_WHITE))));
+                                 Image(BitmapEx(pDev->GetBitmap(Point(), aSz), COL_WHITE)));
                 aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle);
                 pDev->SetOutputSize(aSz); // delete device
             }
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 245864645af8..ceacc555d0e6 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -75,17 +75,17 @@ void SvxSwFrameExample::InitColors_Impl()
 
     bool bHC = rSettings.GetHighContrastMode();
 
-    m_aFrameColor = Color( COL_LIGHTGREEN );
-    m_aAlignColor = Color( COL_LIGHTRED );
-    m_aTransColor = Color( COL_TRANSPARENT );
+    m_aFrameColor = COL_LIGHTGREEN;
+    m_aAlignColor = COL_LIGHTRED;
+    m_aTransColor = COL_TRANSPARENT;
 
     m_aTxtCol = bHC?
         svtools::ColorConfig().GetColorValue(svtools::FONTCOLOR).nColor :
-        Color( COL_GRAY );
-    m_aPrintAreaCol = bHC? m_aTxtCol : Color( COL_GRAY );
+        COL_GRAY;
+    m_aPrintAreaCol = bHC? m_aTxtCol : COL_GRAY;
     m_aBorderCol = m_aTxtCol;
-    m_aBlankCol = bHC? m_aTxtCol : Color( COL_LIGHTGRAY );
-    m_aBlankFrameCol = bHC? m_aTxtCol : Color( COL_GRAY );
+    m_aBlankCol = bHC? m_aTxtCol : COL_LIGHTGRAY;
+    m_aBlankFrameCol = bHC? m_aTxtCol : COL_GRAY;
 }
 
 void SvxSwFrameExample::DataChanged(const DataChangedEvent& rDCEvt)
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 1fe81614807b..98f9fb485df3 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -1613,7 +1613,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
     // set FillColor hard to WHITE when it's SfxItemState::DONTCARE so that
     // the default (Blue7) is not used for 3d preview
     if(SfxItemState::DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false))
-        aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
+        aSet.Put(XFillColorItem(OUString(), COL_WHITE));
 
     m_pCtlPreview->Set3DAttributes(aSet);
     m_pCtlLightPreview->GetSvx3DLightControl().Set3DAttributes(aSet);
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index f1b1cac55dd8..908576260c0b 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -157,7 +157,7 @@ VclPtr<vcl::Window> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent )
     pFixedText->SetText( aText );
     aSize.AdjustWidth(6 );
     pFixedText->SetSizePixel( aSize );
-    pFixedText->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+    pFixedText->SetBackground(Wallpaper(COL_TRANSPARENT));
 
     return pFixedText;
 }
@@ -183,7 +183,7 @@ VclPtr<vcl::Window> SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pPare
     aSize.AdjustWidth(12 );
     pFixedText->SetText( aText );
     pFixedText->SetSizePixel( aSize );
-    pFixedText->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+    pFixedText->SetBackground(Wallpaper(COL_TRANSPARENT));
     return pFixedText.get();
 }
 
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 488b69beb941..b7c3086fe735 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -256,7 +256,7 @@ namespace sdr
                 SdrRectObj aRectObj(OBJ_TEXT);
                 aRectObj.SetModel(GetGrafObject().GetModel());
                 aRectObj.NbcSetText(aDraftText);
-                aRectObj.SetMergedItem(SvxColorItem(Color(COL_LIGHTRED), EE_CHAR_COLOR));
+                aRectObj.SetMergedItem(SvxColorItem(COL_LIGHTRED, EE_CHAR_COLOR));
 
                 // get SdrText and OPO
                 SdrText* pSdrText = aRectObj.getText(0);
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index 46ff77d897ce..ca3cf053c4fb 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -69,7 +69,7 @@ namespace sdr
             sal_uInt16 nCenY2,
             double fShearX,
             double fRotation)
-        :   OverlayObjectWithBasePosition(rBasePos, Color(COL_WHITE)),
+        :   OverlayObjectWithBasePosition(rBasePos, COL_WHITE),
             maBitmapEx1(rBitmapEx1),
             maBitmapEx2(rBitmapEx2),
             mnCenterX1(nCenX1), mnCenterY1(nCenY1),
diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx
index 4a563a95b5f1..0d7995b1c3a6 100644
--- a/svx/source/sdr/overlay/overlaybitmapex.cxx
+++ b/svx/source/sdr/overlay/overlaybitmapex.cxx
@@ -57,7 +57,7 @@ namespace sdr
             double fAlpha,
             double fShearX,
             double fRotation)
-        :   OverlayObjectWithBasePosition(rBasePos, Color(COL_WHITE)),
+        :   OverlayObjectWithBasePosition(rBasePos, COL_WHITE),
             maBitmapEx(rBitmapEx),
             mnCenterX(nCenX),
             mnCenterY(nCenY),
diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx
index a581a7f92930..edeb97c67ec2 100644
--- a/svx/source/sdr/overlay/overlaycrosshair.cxx
+++ b/svx/source/sdr/overlay/overlaycrosshair.cxx
@@ -57,7 +57,7 @@ namespace sdr
         }
 
         OverlayCrosshairStriped::OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos)
-        :   OverlayObjectWithBasePosition(rBasePos, Color(COL_BLACK))
+        :   OverlayObjectWithBasePosition(rBasePos, COL_BLACK)
         {
         }
 
diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx
index b1adaf9ea7c9..a6f644ba6220 100644
--- a/svx/source/sdr/overlay/overlayhelpline.cxx
+++ b/svx/source/sdr/overlay/overlayhelpline.cxx
@@ -65,7 +65,7 @@ namespace sdr
         OverlayHelplineStriped::OverlayHelplineStriped(
             const basegfx::B2DPoint& rBasePos,
             SdrHelpLineKind eNewKind)
-        :   OverlayObjectWithBasePosition(rBasePos, Color(COL_BLACK)),
+        :   OverlayObjectWithBasePosition(rBasePos, COL_BLACK),
             meKind(eNewKind)
         {
         }
diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx
index af1a866c892d..de5cf042ba1e 100644
--- a/svx/source/sdr/overlay/overlayline.cxx
+++ b/svx/source/sdr/overlay/overlayline.cxx
@@ -67,7 +67,7 @@ namespace sdr
         OverlayLineStriped::OverlayLineStriped(
             const basegfx::B2DPoint& rBasePos,
             const basegfx::B2DPoint& rSecondPos)
-        :   OverlayObjectWithBasePosition(rBasePos, Color(COL_BLACK)),
+        :   OverlayObjectWithBasePosition(rBasePos, COL_BLACK),
             maSecondPosition(rSecondPos)
         {
         }
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index bde49aff6ed2..621521ebf9cb 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -119,8 +119,8 @@ namespace sdr
         :   Scheduler(),
             mrOutputDevice(rOutputDevice),
             maOverlayObjects(),
-            maStripeColorA(Color(COL_BLACK)),
-            maStripeColorB(Color(COL_WHITE)),
+            maStripeColorA(COL_BLACK),
+            maStripeColorB(COL_WHITE),
             mnStripeLengthPixel(5),
             maDrawinglayerOpt(),
             maViewTransformation(),
diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx
index 1c281cafe732..dda687298a31 100644
--- a/svx/source/sdr/overlay/overlaypolypolygon.cxx
+++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx
@@ -73,7 +73,7 @@ namespace sdr
 
         OverlayPolyPolygonStripedAndFilled::OverlayPolyPolygonStripedAndFilled(
             const basegfx::B2DPolyPolygon& rLinePolyPolygon)
-        :   OverlayObject(Color(COL_BLACK)),
+        :   OverlayObject(COL_BLACK),
             maLinePolyPolygon(rLinePolyPolygon)
         {
         }
diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
index 5ca6da5b8628..16a3429fb003 100644
--- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
+++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx
@@ -33,7 +33,7 @@ namespace sdr
         }
 
         OverlayPrimitive2DSequenceObject::OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence)
-        :   OverlayObjectWithBasePosition(basegfx::B2DPoint(), Color(COL_BLACK)),
+        :   OverlayObjectWithBasePosition(basegfx::B2DPoint(), COL_BLACK),
             maSequence(rSequence)
         {
         }
diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
index 9b903fa4658e..a0022b08fed0 100644
--- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx
@@ -94,7 +94,7 @@ namespace sdr
             const basegfx::B2DPoint& rSecondPos,
             bool bExtendedLines,
             bool bShowBounds)
-        :   OverlayObjectWithBasePosition(rBasePos, Color(COL_BLACK)),
+        :   OverlayObjectWithBasePosition(rBasePos, COL_BLACK),
             maSecondPosition(rSecondPos),
             mbExtendedLines(bExtendedLines),
             mbShowBounds(bShowBounds)
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 9356f1a0cf15..0d57e931cd23 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -373,7 +373,7 @@ namespace sdr
             if(bTextFrame)
             {
                 mpItemSet->Put(XLineStyleItem(drawing::LineStyle_NONE));
-                mpItemSet->Put(XFillColorItem(OUString(), Color(COL_WHITE)));
+                mpItemSet->Put(XFillColorItem(OUString(), COL_WHITE));
                 mpItemSet->Put(XFillStyleItem(drawing::FillStyle_NONE));
             }
             else
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index b27b92964517..aa7a82473bdd 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -439,7 +439,7 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, cons
                 if (mpModel && dynamic_cast<const SdrCaptionObj *>(pAktCreate) != nullptr)
                 {
                     SfxItemSet aSet(mpModel->GetItemPool());
-                    aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
+                    aSet.Put(XFillColorItem(OUString(),COL_WHITE)); // in case someone turns on Solid
                     aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
 
                     pAktCreate->SetMergedItemSet(aSet);
@@ -449,9 +449,9 @@ bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, cons
                 {
                     // default for all text frames: no background, no border
                     SfxItemSet aSet(mpModel->GetItemPool());
-                    aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
+                    aSet.Put(XFillColorItem(OUString(),COL_WHITE)); // in case someone turns on Solid
                     aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
-                    aSet.Put(XLineColorItem(OUString(),Color(COL_BLACK))); // in case someone turns on Solid
+                    aSet.Put(XLineColorItem(OUString(),COL_BLACK)); // in case someone turns on Solid
                     aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
 
                     pAktCreate->SetMergedItemSet(aSet);
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index f01dd86a3d2c..51ef80fb46b6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -985,7 +985,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void)
                 pFI->SetFieldColor(*pFldCol);
                 delete pFldCol;
             } else {
-                pFI->SetFieldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
+                pFI->SetFieldColor(COL_LIGHTGRAY); // TODO: remove this later on (357)
             }
         }
     }
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 823dc300f3e9..4b29e2c53efe 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -682,7 +682,7 @@ namespace
 
                 }
 
-                aSpotColor[i] = Color( COL_WHITE );
+                aSpotColor[i] = COL_WHITE;
                 impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false);
             }
 
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 63b42083fe4b..711a96e1dfff 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -589,19 +589,19 @@ void SdrHdl::CreateB2dIAObject()
                             switch (eColIndex)
                             {
                                 case BitmapColorIndex::Cyan:
-                                    aHandleFillColor = Color(COL_CYAN);
+                                    aHandleFillColor = COL_CYAN;
                                     break;
                                 case BitmapColorIndex::LightCyan:
-                                    aHandleFillColor = Color(COL_LIGHTCYAN);
+                                    aHandleFillColor = COL_LIGHTCYAN;
                                     break;
                                 case BitmapColorIndex::Red:
-                                    aHandleFillColor = Color(COL_RED);
+                                    aHandleFillColor = COL_RED;
                                     break;
                                 case BitmapColorIndex::LightRed:
-                                    aHandleFillColor = Color(COL_LIGHTRED);
+                                    aHandleFillColor = COL_LIGHTRED;
                                     break;
                                 case BitmapColorIndex::Yellow:
-                                    aHandleFillColor = Color(COL_YELLOW);
+                                    aHandleFillColor = COL_YELLOW;
                                     break;
                                 default:
                                     break;
@@ -1146,10 +1146,10 @@ BitmapEx SdrHdlColor::CreateColorDropper(Color aCol)
     sal_Int32 nWidth = aMarkerSize.Width();
     sal_Int32 nHeight = aMarkerSize.Height();
 
-    pWrite->SetLineColor(Color(COL_LIGHTGRAY));
+    pWrite->SetLineColor(COL_LIGHTGRAY);
     pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1));
     pWrite->DrawLine(Point(1, 0), Point(nWidth - 1, 0));
-    pWrite->SetLineColor(Color(COL_GRAY));
+    pWrite->SetLineColor(COL_GRAY);
     pWrite->DrawLine(Point(1, nHeight - 1), Point(nWidth - 1, nHeight - 1));
     pWrite->DrawLine(Point(nWidth - 1, 1), Point(nWidth - 1, nHeight - 2));
 
@@ -1283,7 +1283,7 @@ void SdrHdlGradient::CreateB2dIAObject()
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
 
-                            pNewOverlayObject->setBaseColor(IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE));
+                            pNewOverlayObject->setBaseColor(IsGradient() ? COL_BLACK : COL_BLUE);
                             xManager->add(*pNewOverlayObject);
                             maOverlayGroup.append(pNewOverlayObject);
 
@@ -1302,7 +1302,7 @@ void SdrHdlGradient::CreateB2dIAObject()
                                     aPositionLeft,
                                     aPosition2,
                                     aPositionRight,
-                                    IsGradient() ? Color(COL_BLACK) : Color(COL_BLUE)
+                                    IsGradient() ? COL_BLACK : COL_BLUE
                                 );
                             DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
 
@@ -1432,7 +1432,7 @@ void SdrHdlLine::CreateB2dIAObject()
 
                             // OVERLAYMANAGER
                             // color(?)
-                            pNewOverlayObject->setBaseColor(Color(COL_LIGHTRED));
+                            pNewOverlayObject->setBaseColor(COL_LIGHTRED);
 
                             xManager->add(*pNewOverlayObject);
                             maOverlayGroup.append(pNewOverlayObject);
@@ -1492,7 +1492,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
                                 pNewOverlayObject->setHittable(false);
 
                                 // color(?)
-                                pNewOverlayObject->setBaseColor(Color(COL_LIGHTBLUE));
+                                pNewOverlayObject->setBaseColor(COL_LIGHTBLUE);
 
                                 xManager->add(*pNewOverlayObject);
                                 maOverlayGroup.append(pNewOverlayObject);
@@ -1538,7 +1538,7 @@ void E3dVolumeMarker::CreateB2dIAObject()
                                 aWireframePoly);
 
                             // OVERLAYMANAGER
-                            pNewOverlayObject->setBaseColor(Color(COL_BLACK));
+                            pNewOverlayObject->setBaseColor(COL_BLACK);
 
                             xManager->add(*pNewOverlayObject);
                             maOverlayGroup.append(pNewOverlayObject);
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index c36516c65a2b..e96176ed7071 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -340,7 +340,7 @@ void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const tools::Rectangl
         if (nColumnId==ITEMBROWSER_NAMECOL_ID)
         {
             rDev.SetLineColor();
-            rDev.SetFillColor( Color( COL_LIGHTGRAY ) );
+            rDev.SetFillColor( COL_LIGHTGRAY );
             aR.SetLeft(0 );
             aR.SetRight(rDev.GetOutputSize().Width() );
             rDev.DrawRect(aR);
@@ -481,9 +481,9 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
         aRect.AdjustRight( -1 );
         pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize());
         pEditControl->SetText(pEntry->aValue);
-        pEditControl->SetBackground( Wallpaper(Color(COL_LIGHTGRAY)));
+        pEditControl->SetBackground( Wallpaper(COL_LIGHTGRAY));
         vcl::Font aFont(pEditControl->GetFont());
-        aFont.SetFillColor(Color(COL_LIGHTGRAY));
+        aFont.SetFillColor(COL_LIGHTGRAY);
         pEditControl->SetFont(aFont);
         pEditControl->Show();
         pEditControl->GrabFocus();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 64d3b886987f..7980458914df 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1093,7 +1093,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
 
         // solid black lines and no fill
         aNewSet.Put(XLineStyleItem(drawing::LineStyle_SOLID));
-        aNewSet.Put(XLineColorItem(OUString(), Color(COL_BLACK)));
+        aNewSet.Put(XLineColorItem(OUString(), COL_BLACK));
         aNewSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         pClone->SetMergedItemSet(aNewSet);
 
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index d5f9ab4aa988..d10a49689d2a 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -178,7 +178,7 @@ void SdrPaintView::ImpClearVars()
     if (mpModel)
         SetDefaultStyleSheet(mpModel->GetDefaultStyleSheet(), true);
 
-    maGridColor = Color( COL_BLACK );
+    maGridColor = COL_BLACK;
 }
 
 SdrPaintView::SdrPaintView(SdrModel* pModel, OutputDevice* pOut)
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index aeaa85232925..5acff4be8417 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -198,7 +198,7 @@ void TableEdgeHdl::CreateB2dIAObject()
 
 
 OverlayTableEdge::OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible )
-:   OverlayObject(Color(COL_GRAY))
+:   OverlayObject(COL_GRAY)
 ,   maPolyPolygon( rPolyPolygon )
 ,   mbVisible(bVisible)
 {
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index dab0b66302e7..20af198b7c8d 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -272,8 +272,8 @@ void SvxColorDockingWindow::FillValueSet()
     ScopedVclPtrInstance< VirtualDevice > pVD;
 
     pVD->SetOutputSizePixel( aColorSize );
-    pVD->SetLineColor( Color( COL_BLACK ) );
-    pVD->SetBackground( Wallpaper( Color( COL_WHITE ) ) );
+    pVD->SetLineColor( COL_BLACK );
+    pVD->SetBackground( Wallpaper( COL_WHITE ) );
     pVD->DrawLine( Point(), Point( nPtX, nPtY ) );
     pVD->DrawLine( Point( 0, nPtY ), Point( nPtX, 0 ) );
 
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 00efa3cdab35..ef002fee8652 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -79,7 +79,7 @@ namespace svx
 
         // !!! #109290# Workaround for SetFillColor with COL_AUTO
         if (aColor.GetColor() == COL_AUTO)
-            aColor = Color(COL_TRANSPARENT);
+            aColor = COL_TRANSPARENT;
 
         if ((maCurColor == aColor) && !bSizeChanged && !bDisplayModeChanged && !bForceUpdate)
             return;
@@ -96,9 +96,9 @@ namespace svx
         if ((COL_TRANSPARENT != aColor.GetColor()) && (maBmpSize.Width() == maBmpSize.Height()))
             pVirDev->SetLineColor(aColor);
         else if( mpTbx->GetBackground().GetColor().IsDark() )
-            pVirDev->SetLineColor(Color(COL_WHITE));
+            pVirDev->SetLineColor(COL_WHITE);
         else
-            pVirDev->SetLineColor(Color(COL_BLACK));
+            pVirDev->SetLineColor(COL_BLACK);
 
         // use not only COL_TRANSPARENT for detection of transparence,
         // but the method/way which is designed to do that
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 3700b3618f7d..9f83fcb319c1 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -287,7 +287,7 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
                                 const Wallpaper aWallpaper( pVDev->GetBackground() );
                                 const Point     aPt;
 
-                                pVDev->SetBackground( Wallpaper( Color( COL_BLACK ) ) );
+                                pVDev->SetBackground( Wallpaper( COL_BLACK ) );
                                 pVDev->Erase();
                                 rGraphic.Draw( pVDev.get(), aPt, aSize );
 
@@ -469,7 +469,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
                 long                lGray;
 
                 // initialize border with white pixels
-                pVirDev->SetLineColor( Color( COL_WHITE) );
+                pVirDev->SetLineColor( COL_WHITE );
                 pVirDev->DrawLine( Point(), Point( nWidth - 1, 0L ) );
                 pVirDev->DrawLine( Point( nWidth - 1, 0L ), Point( nWidth - 1, nHeight - 1 ) );
                 pVirDev->DrawLine( Point( nWidth - 1, nHeight - 1 ), Point( 0L, nHeight - 1 ) );
@@ -499,9 +499,9 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
                         nSum2 -= lGray;
 
                         if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 )
-                            pVirDev->DrawPixel( Point(nXDst, nY), Color(COL_WHITE) );
+                            pVirDev->DrawPixel( Point(nXDst, nY), COL_WHITE );
                         else
-                            pVirDev->DrawPixel( Point(nXDst, nY), Color(COL_BLACK) );
+                            pVirDev->DrawPixel( Point(nXDst, nY), COL_BLACK );
                     }
                 }
 
@@ -567,7 +567,7 @@ tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlag
             std::unique_ptr<Point[]> pPoints2;
             long                nX, nY;
             sal_uInt16              nPolyPos = 0;
-            const BitmapColor   aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) );
+            const BitmapColor   aBlack = pAcc->GetBestMatchingColor( Color(COL_BLACK) );
 
             if( nFlags & XOutFlags::ContourVert )
             {
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 8ec5a260e289..45cffa92bfae 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1920,8 +1920,8 @@ bool XSecondaryFillColorItem::GetPresentation
 
 XGradient::XGradient() :
     eStyle( css::awt::GradientStyle_LINEAR ),
-    aStartColor( Color( COL_BLACK ) ),
-    aEndColor( Color( COL_WHITE ) ),
+    aStartColor( COL_BLACK ),
+    aEndColor( COL_WHITE ),
     nAngle( 0 ),
     nBorder( 0 ),
     nOfsX( 50 ),