summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-26 13:30:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-27 11:28:29 +0100
commitc98d3303027bd8bf8e0881b61918710ac479864c (patch)
treee6843dfd93352f134207cbc482451e8f17266bc2 /starmath
parent44a485c2baaf5bab81748f992915459bdaa58615 (diff)
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>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/ElementsDockingWindow.cxx4
-rw-r--r--starmath/source/node.cxx36
-rw-r--r--starmath/source/view.cxx6
-rw-r--r--starmath/source/visitors.cxx6
4 files changed, 26 insertions, 26 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 5353c344eec9..bccb590094c6 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -727,8 +727,8 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
mpElementListBox->SetSelectHdl(LINK(this, SmElementsDockingWindow, ElementSelectedHandle));
mpElementListBox->SelectEntry(SmResId(RID_CATEGORY_UNARY_BINARY_OPERATORS));
- mpElementsControl->SetBackground( Color( COL_WHITE ) );
- mpElementsControl->SetTextColor( Color( COL_BLACK ) );
+ mpElementsControl->SetBackground( Color(COL_WHITE) );
+ mpElementsControl->SetTextColor( COL_BLACK );
mpElementsControl->setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
mpElementsControl->SetSelectHdl(LINK(this, SmElementsDockingWindow, SelectClickHandler));
}
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index d7dd6e4cd276..abfacfff8c22 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1877,24 +1877,24 @@ void SmFontNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
case TNBOLD : ClearAttribut(FontAttribute::Bold); break;
case TNITALIC : ClearAttribut(FontAttribute::Italic); break;
- case TBLACK : SetColor(Color(COL_BLACK)); break;
- case TWHITE : SetColor(Color(COL_WHITE)); break;
- case TRED : SetColor(Color(COL_LIGHTRED)); break;
- case TGREEN : SetColor(Color(COL_GREEN)); break;
- case TBLUE : SetColor(Color(COL_LIGHTBLUE)); break;
- case TCYAN : SetColor(Color(COL_LIGHTCYAN)); break; // as in Calc
- case TMAGENTA : SetColor(Color(COL_LIGHTMAGENTA)); break; // as in Calc
- case TYELLOW : SetColor(Color(COL_YELLOW)); break;
- case TTEAL : SetColor(Color(COL_CYAN)); break;
- case TSILVER : SetColor(Color(COL_LIGHTGRAY)); break;
- case TGRAY : SetColor(Color(COL_GRAY)); break;
- case TMAROON : SetColor(Color(COL_RED)); break;
- case TPURPLE : SetColor(Color(COL_MAGENTA)); break;
- case TLIME : SetColor(Color(COL_LIGHTGREEN)); break;
- case TOLIVE : SetColor(Color(COL_BROWN)); break;
- case TNAVY : SetColor(Color(COL_BLUE)); break;
- case TAQUA : SetColor(Color(COL_LIGHTCYAN)); break;
- case TFUCHSIA : SetColor(Color(COL_LIGHTMAGENTA)); break;
+ case TBLACK : SetColor(COL_BLACK); break;
+ case TWHITE : SetColor(COL_WHITE); break;
+ case TRED : SetColor(COL_LIGHTRED); break;
+ case TGREEN : SetColor(COL_GREEN); break;
+ case TBLUE : SetColor(COL_LIGHTBLUE); break;
+ case TCYAN : SetColor(COL_LIGHTCYAN); break; // as in Calc
+ case TMAGENTA : SetColor(COL_LIGHTMAGENTA); break; // as in Calc
+ case TYELLOW : SetColor(COL_YELLOW); break;
+ case TTEAL : SetColor(COL_CYAN); break;
+ case TSILVER : SetColor(COL_LIGHTGRAY); break;
+ case TGRAY : SetColor(COL_GRAY); break;
+ case TMAROON : SetColor(COL_RED); break;
+ case TPURPLE : SetColor(COL_MAGENTA); break;
+ case TLIME : SetColor(COL_LIGHTGREEN); break;
+ case TOLIVE : SetColor(COL_BROWN); break;
+ case TNAVY : SetColor(COL_BLUE); break;
+ case TAQUA : SetColor(COL_LIGHTCYAN); break;
+ case TFUCHSIA : SetColor(COL_LIGHTMAGENTA); break;
default:
SAL_WARN("starmath", "unknown case");
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 353d3658d90d..4dc0db132ec5 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1096,7 +1096,7 @@ void SmViewShell::Impl_Print(OutputDevice &rOutDev, const SmPrintUIOptions &rPri
const sal_uInt16 nZoomFactor = static_cast< sal_uInt16 >(rPrintUIOptions.getIntValue( PRTUIOPT_PRINT_SCALE, 100 ));
rOutDev.Push();
- rOutDev.SetLineColor( Color(COL_BLACK) );
+ rOutDev.SetLineColor( COL_BLACK );
// output text on top
if (bIsPrintTitle)
@@ -1108,7 +1108,7 @@ void SmViewShell::Impl_Print(OutputDevice &rOutDev, const SmPrintUIOptions &rPri
aFont.SetAlignment(ALIGN_TOP);
aFont.SetWeight(WEIGHT_BOLD);
aFont.SetFontSize(aSize650);
- aFont.SetColor( Color(COL_BLACK) );
+ aFont.SetColor( COL_BLACK );
rOutDev.SetFont(aFont);
Size aTitleSize (GetTextSize(rOutDev, GetDoc()->GetTitle(), aOutRect.GetWidth() - 200));
@@ -1150,7 +1150,7 @@ void SmViewShell::Impl_Print(OutputDevice &rOutDev, const SmPrintUIOptions &rPri
{
vcl::Font aFont(FAMILY_DONTKNOW, Size(0, 600));
aFont.SetAlignment(ALIGN_TOP);
- aFont.SetColor( Color(COL_BLACK) );
+ aFont.SetColor( COL_BLACK );
// get size
rOutDev.SetFont(aFont);
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 84cde6331f24..fdb1e2103de8 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -191,7 +191,7 @@ void SmCaretDrawingVisitor::Visit( SmTextNode* pNode )
long right_line = pLine->GetRight( ) + maOffset.X( );
//Set color
- mrDev.SetLineColor( Color( COL_BLACK ) );
+ mrDev.SetLineColor( COL_BLACK );
if ( mbCaretVisible ) {
//Draw vertical line
@@ -219,7 +219,7 @@ void SmCaretDrawingVisitor::DefaultVisit( SmNode* pNode )
long right_line = pLine->GetRight( ) + maOffset.X( );
//Set color
- mrDev.SetLineColor( Color( COL_BLACK ) );
+ mrDev.SetLineColor( COL_BLACK );
if ( mbCaretVisible ) {
//Draw vertical line
@@ -1859,7 +1859,7 @@ SmSelectionDrawingVisitor::SmSelectionDrawingVisitor( OutputDevice& rDevice, SmN
mrDev.Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR );
//Change colors
mrDev.SetLineColor( );
- mrDev.SetFillColor( Color( COL_LIGHTGRAY ) );
+ mrDev.SetFillColor( COL_LIGHTGRAY );
//Draw rectangle
mrDev.DrawRect( maSelectionArea );