[Libreoffice-commits] core.git: vcl/qt5

Stephan Bergmann sbergman at redhat.com
Wed Dec 13 13:33:37 UTC 2017


 vcl/qt5/Qt5Bitmap.cxx |    2 +-
 vcl/qt5/Qt5Bitmap.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1d6b85f85925c3b4d2d2bb8eaf237b10bb8f7d60
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 13 14:30:30 2017 +0100

    Fix --enable-qt5
    
    ...after e75abe6e0a4ea250366bb29c0ece697e9b1b80a1 "convert tolerance params to
    sal_uInt8"
    
    Change-Id: I6677fa21d4786ebadcded53e1542514465d5d0a2

diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index 0f312e0057e2..49b7a22e6fb2 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -239,7 +239,7 @@ bool Qt5Bitmap::Scale(const double& rScaleX, const double& rScaleY, BmpScaleFlag
     return false;
 }
 
-bool Qt5Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol)
+bool Qt5Bitmap::Replace(const Color& rSearchColor, const Color& rReplaceColor, sal_uInt8 nTol)
 {
     return false;
 }
diff --git a/vcl/qt5/Qt5Bitmap.hxx b/vcl/qt5/Qt5Bitmap.hxx
index c8d35e2050cc..6ecdebed5ca1 100644
--- a/vcl/qt5/Qt5Bitmap.hxx
+++ b/vcl/qt5/Qt5Bitmap.hxx
@@ -61,7 +61,7 @@ public:
     virtual bool Scale(const double& rScaleX, const double& rScaleY,
                        BmpScaleFlag nScaleFlag) override;
     virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor,
-                         sal_uLong nTol) override;
+                         sal_uInt8 nTol) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list