From e58503b743d6dd5e100bfc1abb6a96f28d17d318 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 11 Jan 2018 10:30:16 +0100
Subject: Replace macro with function

...and move it into the only .cxx that uses it; making just enough of
BitmapColor constexpr as is useful here

Change-Id: I8a035f67f4b218dcef2f100814c62b25fb32d5be
Reviewed-on: https://gerrit.libreoffice.org/47750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 filter/source/graphicfilter/icgm/bitmap.cxx | 7 +++++++
 filter/source/graphicfilter/icgm/main.hxx   | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'filter')

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index 3dc9d98dc668..4a99c2de3706 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -20,6 +20,13 @@
 
 #include "main.hxx"
 
+namespace {
+
+constexpr BitmapColor BMCOL(sal_uInt32 _col) {
+    return BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col );
+}
+
+}
 
 CGMBitmap::CGMBitmap( CGM& rCGM ) :
     mpCGM                           ( &rCGM ),
diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx
index d213b002a191..508c8f3ebf6b 100644
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ b/filter/source/graphicfilter/icgm/main.hxx
@@ -22,8 +22,6 @@
 
 #include "cgm.hxx"
 
-#define BMCOL( _col ) BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col )
-
 #include <vcl/salbtype.hxx>
 #include <tools/stream.hxx>
 #include "bundles.hxx"
-- 
cgit