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

[Noel Grandin]

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

New commits:
commit 74778b12f4f662e45ca8915739ab52b4402fde49
Author: Noel Grandin <noel at peralex.com>
Date:   Wed May 6 10:33:13 2015 +0200

    fix windows build
    
    Change-Id: I32dc6c24c523519d6c2376c555b2d774fa40b3ba

diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index b7d6622..4b64d5d 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -99,7 +99,7 @@ public:
 
     virtual bool                Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE;
     virtual bool                Erase( const Color& rFillColor ) SAL_OVERRIDE;
-    virtual bool                Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) SAL_OVERRIDE;
+    virtual bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
     virtual bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
 };
 
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 0c890d0..86656dd 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -1066,7 +1066,7 @@ bool WinSalBitmap::Erase( const ::Color& /*rFillColor*/ )
     return false;
 }
 
-bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, sal_uInt32 /*nScaleFlag*/ )
+bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ )
 {
     return false;
 }