diff options
Diffstat (limited to 'slideshow/source')
-rw-r--r-- | slideshow/source/engine/opengl/Operation.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 4 | ||||
-rw-r--r-- | slideshow/source/engine/slide/layermanager.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/opengl/Operation.cxx b/slideshow/source/engine/opengl/Operation.cxx index 674eb0da00d8..6789fcc5ae6c 100644 --- a/slideshow/source/engine/opengl/Operation.cxx +++ b/slideshow/source/engine/opengl/Operation.cxx @@ -115,7 +115,7 @@ makeRotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,do return std::make_shared<RotateAndScaleDepthByHeight>(Axis, Origin, Angle, bScale, bInter, T0, T1); } -static inline double intervalInter(double t, double T0, double T1) +static double intervalInter(double t, double T0, double T1) { return ( t - T0 ) / ( T1 - T0 ); } diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index 9d6b457ae7f1..f73237e16baf 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -923,13 +923,13 @@ std::shared_ptr<OGLTransitionImpl> makeRochade() return makeRochadeTransition(aLeavingSlide, aEnteringSlide, aSettings); } -static inline double randFromNeg1to1() +static double randFromNeg1to1() { return comphelper::rng::uniform_real_distribution(-1.0, std::nextafter(1.0, DBL_MAX)); } // TODO(Q3): extract to basegfx -static inline glm::vec3 randNormVectorInXYPlane() +static glm::vec3 randNormVectorInXYPlane() { glm::vec3 toReturn(randFromNeg1to1(),randFromNeg1to1(),0.0); return glm::normalize(toReturn); diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index b67e6fc08059..333412d90029 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; namespace std { // add operator!= for weak_ptr - static inline bool operator!=( slideshow::internal::LayerWeakPtr const& rLHS, + static bool operator!=( slideshow::internal::LayerWeakPtr const& rLHS, slideshow::internal::LayerWeakPtr const& rRHS ) { return rLHS.lock().get() != rRHS.lock().get(); |