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 /include | |
| 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 'include')
| -rw-r--r-- | include/svtools/valueset.hxx | 2 | ||||
| -rw-r--r-- | include/svx/sdr/overlay/overlaymanager.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svdpagv.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/pdfwriter.hxx | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 83f5e7d075f8..7ff5fc597876 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -366,7 +366,7 @@ public: void SetColor( const Color& rColor ); void SetColor() { - SetColor(Color(COL_TRANSPARENT)); + SetColor(COL_TRANSPARENT); } bool IsColor() const { diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 47ccf96ec19f..0396ec7cdd98 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -65,8 +65,8 @@ namespace sdr // Stripe support. All striped OverlayObjects use these stripe // values. Changes change all those objects. - Color maStripeColorA; // defaults to Color(COL_BLACK) - Color maStripeColorB; // defaults to Color(COL_WHITE) + Color maStripeColorA; // defaults to COL_BLACK + Color maStripeColorB; // defaults to COL_WHITE sal_uInt32 mnStripeLengthPixel; // defaults to 4L // hold an incarnation of Drawinglayer configuration options diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index b0f7b40e5e91..5b108ac2e2fb 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -165,7 +165,7 @@ public: void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr, const tools::Rectangle& rRect = tools::Rectangle(), basegfx::B2IRange const* pPageFrame = nullptr); - void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); + void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = COL_BLACK ); tools::Rectangle GetPageRect() const; SdrPage* GetPage() const { return mpPage; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 6f1d211174eb..ff90e3fb40da 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -722,8 +722,8 @@ public: const Point& rPos, const Size& rSize, sal_uInt32 nLen = 8, - Color aStart = Color(COL_WHITE), - Color aEnd = Color(COL_BLACK)); + Color aStart = COL_WHITE, + Color aEnd = COL_BLACK); void DrawGrid( const tools::Rectangle& rRect, const Size& rDist, DrawGridFlags nFlags ); @@ -1581,7 +1581,7 @@ public: bool bReduceTransparency, bool bTransparencyAutoMode, bool bDownsampleBitmaps, - const Color& rBackground = Color( COL_TRANSPARENT ) ); + const Color& rBackground = COL_TRANSPARENT ); SAL_DLLPRIVATE void ImplPrintTransparent ( const Bitmap& rBmp, const Bitmap& rMask, diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 302d98fc85b0..1db80a5b6da1 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -744,10 +744,10 @@ The following structure describes the permissions used in PDF security void SetDigitLanguage( LanguageType eLang ); void SetLineColor( const Color& rColor ); - void SetLineColor() { SetLineColor( Color( COL_TRANSPARENT ) ); } + void SetLineColor() { SetLineColor( COL_TRANSPARENT ); } void SetFillColor( const Color& rColor ); - void SetFillColor() { SetFillColor( Color( COL_TRANSPARENT ) ); } + void SetFillColor() { SetFillColor( COL_TRANSPARENT ); } void SetFont( const vcl::Font& rNewFont ); void SetTextColor( const Color& rColor ); @@ -782,7 +782,7 @@ The following structure describes the permissions used in PDF security void DrawPixel( const Point& rPt, const Color& rColor ); void DrawPixel( const Point& rPt ) - { DrawPixel( rPt, Color( COL_TRANSPARENT ) ); } + { DrawPixel( rPt, COL_TRANSPARENT ); } void DrawLine( const Point& rStartPt, const Point& rEndPt ); void DrawLine( const Point& rStartPt, const Point& rEndPt, |