diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 13:30:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 11:28:29 +0100 |
| commit | c98d3303027bd8bf8e0881b61918710ac479864c (patch) | |
| tree | e6843dfd93352f134207cbc482451e8f17266bc2 /desktop | |
| parent | 44a485c2baaf5bab81748f992915459bdaa58615 (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 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/splash/splash.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 256ed0234fca..5c57b4f9d3d0 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -571,7 +571,7 @@ void ExtensionBox_Impl::DrawRow(vcl::RenderContext& rRenderContext, const tools: rRenderContext.DrawImage(aPos, Size(SMALL_ICON_SIZE, SMALL_ICON_SIZE), m_aWarningImage); } - rRenderContext.SetLineColor(Color(COL_LIGHTGRAY)); + rRenderContext.SetLineColor(COL_LIGHTGRAY); rRenderContext.DrawLine(rRect.BottomLeft(), rRect.BottomRight()); } diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b6d4f6eb5951..fdc02e3128d3 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2031,7 +2031,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis, #if !defined(ANDROID) // Set background to transparent by default. - pDevice->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); + pDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); #endif pDevice->SetOutputSizePixelScaleOffsetAndBuffer( @@ -3446,7 +3446,7 @@ static void doc_paintWindow(LibreOfficeKitDocument* /*pThis*/, unsigned nLOKWind } ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT); - pDevice->SetBackground(Wallpaper(Color(COL_TRANSPARENT))); + pDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nWidth, nHeight), Fraction(1.0), Point(), pBuffer); diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index a58b8227d928..b7724ec1e636 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -296,7 +296,7 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) _textBaseline = _height; if ( NOT_LOADED_COLOR == _cProgressFrameColor ) - _cProgressFrameColor = Color( COL_LIGHTGRAY ); + _cProgressFrameColor = COL_LIGHTGRAY; if ( NOT_LOADED_COLOR == _cProgressBarColor ) { @@ -304,11 +304,11 @@ SplashScreen::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) if ( _width > 500 ) _cProgressBarColor = Color( 157, 202, 18 ); else - _cProgressBarColor = Color( COL_BLUE ); + _cProgressBarColor = COL_BLUE; } if ( NOT_LOADED_COLOR == _cProgressTextColor ) - _cProgressTextColor = Color( COL_BLACK ); + _cProgressTextColor = COL_BLACK; Application::AddEventListener( LINK( this, SplashScreen, AppEventListenerHdl ) ); |