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

Stephan Bergmann sbergman at redhat.com
Sun Jan 8 14:57:03 UTC 2017


 vcl/osx/salnativewidgets.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 126871b0715a0fd6c39102c9ed597acf53475420
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jan 8 15:55:11 2017 +0100

    Work around -fsanitize=float-cast-overflow
    
    ...when the value is outside the range of type 'unsigned char'; hopefully it'll
    always be in the range of type 'long long'
    
    Change-Id: I8ec38727648bea20875cb488fe143b4759812b5a

diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 36e8bf3..31824cd 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -659,7 +659,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
             if( nType == ControlType::IntroProgress )
                 aTrackInfo.enableState          = kThemeTrackActive;
             aTrackInfo.filler1              = 0;
-            aTrackInfo.trackInfo.progress.phase   = static_cast<UInt8>(CFAbsoluteTimeGetCurrent()*10.0);
+            aTrackInfo.trackInfo.progress.phase   = static_cast<long long>(CFAbsoluteTimeGetCurrent()*10.0);
 
             HIThemeDrawTrack( &aTrackInfo, nullptr, mrContext, kHIThemeOrientationNormal );
             bOK = true;


More information about the Libreoffice-commits mailing list