[Libreoffice-commits] core.git: vcl/inc vcl/quartz

[Noel Grandin]

 vcl/inc/quartz/salbmp.h |    2 +-
 vcl/quartz/salbmp.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 918a03c53839ad5696d0e154fbf657af49f67d8f
Author: Noel Grandin <n...@peralex.com>
Date:   Wed May 6 09:14:12 2015 +0200

    fix OSX build
    
    Change-Id: I6df0009cad65134e626f89563be168ff739ca092

diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 9c2209d..49679f0 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -77,7 +77,7 @@ public:
 
     bool            Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
     bool            Erase( const Color& rFillColor ) SAL_OVERRIDE;
-    bool            Scale( const double& rScaleX, const double& rScaleY, 
sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
+    bool            Scale( const double& rScaleX, const double& rScaleY, 
BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
     bool            Replace( const Color& rSearchColor, const Color& 
rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
 
 private:
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 2bb7b29..06b55ac 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -978,7 +978,7 @@ bool QuartzSalBitmap::Erase( const ::Color& /*rFillColor*/ )
     return false;
 }
 
-bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& 
/*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
+bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& 
/*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ )
 {
     return false;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits