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>

7 files changed, 12 insertions, 12 deletions

diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 9033db06b84d..c8feafaedcf4 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -114,7 +114,7 @@ DefItems::DefItems()
     rDefItems[17] = new SvxVerJustifyItem( SvxCellVerJustify::Standard, EE_PARA_VER_JUST );
 
     // Character attributes:
-    rDefItems[18] = new SvxColorItem( Color( COL_AUTO ), EE_CHAR_COLOR );
+    rDefItems[18] = new SvxColorItem( COL_AUTO, EE_CHAR_COLOR );
     rDefItems[19] = new SvxFontItem( EE_CHAR_FONTINFO );
     rDefItems[20] = new SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT );
     rDefItems[21] = new SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH );
@@ -146,11 +146,11 @@ DefItems::DefItems()
     rDefItems[47] = new SvxOverlineItem( LINESTYLE_NONE, EE_CHAR_OVERLINE );
     rDefItems[48] = new SvxCaseMapItem( SvxCaseMap::NotMapped, EE_CHAR_CASEMAP );
     rDefItems[49] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
-    rDefItems[50] = new SvxBackgroundColorItem( Color( COL_AUTO ), EE_CHAR_BKGCOLOR );
+    rDefItems[50] = new SvxBackgroundColorItem( COL_AUTO, EE_CHAR_BKGCOLOR );
     // Features
     rDefItems[51] = new SfxVoidItem( EE_FEATURE_TAB );
     rDefItems[52] = new SfxVoidItem( EE_FEATURE_LINEBR );
-    rDefItems[53] = new SvxCharSetColorItem( Color( COL_RED ), EE_FEATURE_NOTCONV );
+    rDefItems[53] = new SvxCharSetColorItem( COL_RED, EE_FEATURE_NOTCONV );
     rDefItems[54] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
 
     assert(EDITITEMCOUNT == 55 && "ITEMCOUNT changed, adjust DefItems!");
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index a5879f7bdb6d..cbb8c2b3d3d9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2875,9 +2875,9 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
         else if ( nAttr & ExtTextInputAttr::DashDotUnderline )
             rFont.SetUnderline( LINESTYLE_DOTTED );
         else if ( nAttr & ExtTextInputAttr::RedText )
-            rFont.SetColor( Color( COL_RED ) );
+            rFont.SetColor( COL_RED );
         else if ( nAttr & ExtTextInputAttr::HalfToneText )
-            rFont.SetColor( Color( COL_LIGHTGRAY ) );
+            rFont.SetColor( COL_LIGHTGRAY );
         if ( nAttr & ExtTextInputAttr::Highlight )
         {
             const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -2889,7 +2889,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo
         {
             rFont.SetUnderline( LINESTYLE_WAVE );
             if( pOut )
-                pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) );
+                pOut->SetTextLineColor( COL_LIGHTGRAY );
         }
     }
 }
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index f39dc856fb3d..040f1a53fe09 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3055,7 +3055,7 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n
         break;
 
         case 0: // BRUSH_NULL:
-            aColor = Color( COL_TRANSPARENT );
+            aColor = COL_TRANSPARENT;
         break;
 
         default:
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 77a95bfac63a..fff084f04427 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -84,7 +84,7 @@ void SvxFont::DrawArrow( OutputDevice &rOut, const tools::Rectangle& rRect,
     Color aOldLineColor = rOut.GetLineColor();
     Color aOldFillColor = rOut.GetFillColor();
     rOut.SetFillColor( rCol );
-    rOut.SetLineColor( Color( COL_BLACK ) );
+    rOut.SetLineColor( COL_BLACK );
     rOut.DrawPolygon( aPoly );
     rOut.DrawLine( aTmp, aNxt );
     rOut.SetLineColor( aOldLineColor );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 515125461713..a5d8b7925558 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1726,7 +1726,7 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
     if( VERSION_USEAUTOCOLOR == nItemVersion &&
         COL_AUTO == mColor.GetColor() )
-        WriteColor( rStrm, Color( COL_BLACK ) );
+        WriteColor( rStrm, Color(COL_BLACK) );
     else
         WriteColor( rStrm, mColor );
     return rStrm;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index f89b715cc428..26fb338b5424 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1073,7 +1073,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos,
             }
 
             const Color& rOldLineColor = pOutDev->GetLineColor();
-            pOutDev->SetLineColor( Color( COL_BLACK ) );
+            pOutDev->SetLineColor( COL_BLACK );
             pOutDev->DrawLine( aStartPos, aEndPos );
             pOutDev->SetLineColor( rOldLineColor );
         }
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index be516bbcd4ef..0c81088e140e 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1662,12 +1662,12 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
         if( USHRT_MAX != nColor )
             aCol = GetColor( nColor );
         else
-            aCol = Color( COL_BLACK );
+            aCol = COL_BLACK;
 
         if( USHRT_MAX != nFillColor )
             aFCol = GetColor( nFillColor );
         else
-            aFCol = Color( COL_WHITE );
+            aFCol = COL_WHITE;
     }
 
     Color aColor;