summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-01 13:56:48 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-02 06:20:35 +0000
commitd68a0fc050ea4d57e15246f8e71781cd42ebdaa1 (patch)
treed8f8e8823de13253a1bb41a8a4804dfec042694b /slideshow
parentde020fc9c3c67541067bc7e0b72ed41eae650288 (diff)
loplugin:unusedmethods
Change-Id: Ie1603adf3908fd0668bcbe8f75c6bafa0d0bfd6c Reviewed-on: https://gerrit.libreoffice.org/19072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx7
-rw-r--r--slideshow/source/engine/color.cxx7
-rw-r--r--slideshow/source/engine/pointersymbol.hxx10
-rw-r--r--slideshow/source/engine/waitsymbol.hxx10
-rw-r--r--slideshow/source/inc/hslcolor.hxx1
-rw-r--r--slideshow/source/inc/tools.hxx2
6 files changed, 2 insertions, 35 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 11b495d279b8..713c2bfafb1f 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -586,13 +586,6 @@ public:
(*mpAnim)( getPresentationValue( maValues.back() ) );
}
- /// Disposable:
- virtual void dispose()
- {
- mpAnim.reset();
- BaseType::dispose();
- }
-
private:
ValueVectorType maValues;
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index 9bb40d6fd4ba..17b1e3c9eaa9 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -216,13 +216,6 @@ namespace slideshow
rLHS.getLuminance() + rRHS.getLuminance() );
}
- HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS )
- {
- return HSLColor( rLHS.getHue() * rRHS.getHue(),
- rLHS.getSaturation() * rRHS.getSaturation(),
- rLHS.getLuminance() * rRHS.getLuminance() );
- }
-
HSLColor operator*( double nFactor, const HSLColor& rRHS )
{
return HSLColor( nFactor * rRHS.getHue(),
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index 8a7517ffd896..3671109962fe 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -63,16 +63,6 @@ private:
::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const;
- template <typename func_type>
- void for_each_sprite( func_type const & func ) const
- {
- ViewsVecT::const_iterator iPos( maViews.begin() );
- const ViewsVecT::const_iterator iEnd( maViews.end() );
- for ( ; iPos != iEnd; ++iPos )
- if( iPos->second )
- func( iPos->second );
- }
-
typedef ::std::vector<
::std::pair<UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr> > ViewsVecT;
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index a98b488229f8..f725c5514e35 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -72,16 +72,6 @@ private:
void setVisible( const bool bVisible );
::basegfx::B2DPoint calcSpritePos( UnoViewSharedPtr const & rView ) const;
- template <typename func_type>
- void for_each_sprite( func_type const & func ) const
- {
- ViewsVecT::const_iterator iPos( maViews.begin() );
- const ViewsVecT::const_iterator iEnd( maViews.end() );
- for ( ; iPos != iEnd; ++iPos )
- if( iPos->second )
- func( iPos->second );
- }
-
typedef ::std::vector<
::std::pair<UnoViewSharedPtr,
cppcanvas::CustomSpriteSharedPtr> > ViewsVecT;
diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx
index 5529a1b83f24..c38a8f7023d3 100644
--- a/slideshow/source/inc/hslcolor.hxx
+++ b/slideshow/source/inc/hslcolor.hxx
@@ -82,7 +82,6 @@ namespace slideshow
bool operator==( const HSLColor& rLHS, const HSLColor& rRHS );
bool operator!=( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS );
- HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS );
HSLColor operator*( double nFactor, const HSLColor& rRHS );
/** HSL color linear interpolator.
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index bd6a4ea7ccbe..cc8a8d350b7a 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -298,6 +298,7 @@ namespace slideshow
/// To work around ternary operator in initializer lists
/// (Solaris compiler problems)
+#ifdef SOLARIS
template <typename T>
inline T const & ternary_op(
const bool cond, T const & arg1, T const & arg2 )
@@ -307,6 +308,7 @@ namespace slideshow
else
return arg2;
}
+#endif
template <typename ValueType>
inline bool getPropertyValue(