diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:15:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:15:48 +0100 |
commit | 16fd3dd3e0976c16b31eeb88ca61f83301626cdf (patch) | |
tree | 683db6472aedcce8ce8eb37ad5d03baee3bb2353 /slideshow | |
parent | 5632c830e944c18c3b3c88e1bd19906d537c820b (diff) |
More loplugin:cstylecast: slideshow
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: Ic7cd4389d4965fb53f44e34082c92a7a2ce247fc
Diffstat (limited to 'slideshow')
4 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index e52705dec2c8..ea85bbac535b 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -167,7 +167,7 @@ namespace slideshow // for auto-reverse, map ranges [1,2), [3,4), ... // to ranges [0,1), [1,2), etc. - if( ((int)nRepeats) % 2 ) + if( static_cast<int>(nRepeats) % 2 ) { // we're in an odd range, reverse sweep nRelativeSimpleTime = 1.0 - nFractionalActiveDuration; diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index 706816f55bd4..bb6557f4638f 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -1274,7 +1274,7 @@ std::shared_ptr<OGLTransitionImpl> makeVenetianBlinds( bool vertical, int parts Primitives_t aEnteringSlide; for( int i=0; i<parts; i++ ) { Primitive Slide; - double n = (i + 1)/(double)parts; + double n = (i + 1)/static_cast<double>(parts); if( vertical ) { Slide.pushTriangle (glm::vec2 (ln,0), glm::vec2 (n,0), glm::vec2 (ln,1)); Slide.pushTriangle (glm::vec2 (n,0), glm::vec2 (ln,1), glm::vec2 (n,1)); diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index 8e21e6768616..299dff9862ab 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -1132,10 +1132,10 @@ void OGLTransitionerImpl::disposing() "whole transition (frames: " << mnFrameCount << ") took: " << std::chrono::duration_cast<std::chrono::microseconds>(duration).count() << " fps: " - << (((double)mnFrameCount*1000000000.0)/std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count()) + << ((static_cast<double>(mnFrameCount)*1000000000.0)/std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count()) << " time spent in updates: " << std::chrono::duration_cast<std::chrono::microseconds>(m_TotalUpdateDuration).count() << " percentage of transition time: " - << (100*(((double)std::chrono::duration_cast<std::chrono::nanoseconds>(m_TotalUpdateDuration).count())/((double)std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count()))) + << (100*((static_cast<double>(std::chrono::duration_cast<std::chrono::nanoseconds>(m_TotalUpdateDuration).count()))/(static_cast<double>(std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count())))) << '%' ); } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 0bc180ca589b..b90ccc19c485 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1491,7 +1491,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult //LineWidth double fLineWidth; fLineWidth = pPolyPoly->getStrokeWidth(); - aXPropSet->setPropertyValue("LineWidth", uno::Any((sal_Int32)fLineWidth) ); + aXPropSet->setPropertyValue("LineWidth", uno::Any(static_cast<sal_Int32>(fLineWidth)) ); // make polygons special xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow); |