From bc5cb0ccfa5d4826f43409b52adfc73a277aef36 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 1 Feb 2017 15:04:45 +0200
Subject: convert BmpCombine to scoped enum and drop unused

Change-Id: Ic67474683a25a25e5753777f4bbbeded6ceba414
Reviewed-on: https://gerrit.libreoffice.org/33793
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 52360bf8dd567598593cb212ac85f0c919315618)
(cherry picked from commit af8e50a21ad47aa15fe3773c053735f8321fcf46)
---
 svtools/source/graphic/transformer.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'svtools')

diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 4375caeb4efa..1ee2a2428282 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -99,7 +99,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
             {
                 Bitmap aMask( aBitmapEx.GetMask() );
                 Bitmap aMask2( aBitmap.CreateMask( aColorFrom, nTolerance ) );
-                aMask.CombineSimple( aMask2, BMP_COMBINE_OR );
+                aMask.CombineSimple( aMask2, BmpCombine::Or );
                 aBitmap.Replace( aColorFrom, aColorTo, nTolerance );
                 aGraphic = ::Graphic( BitmapEx( aBitmap, aMask ) );
             }
-- 
cgit