summaryrefslogtreecommitdiff
path: root/vcl/source/control/throbber.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-07-20 11:13:20 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-20 13:02:31 +0200
commitf24b46c27243b88e4d367d7b105d1365e97dbd76 (patch)
treeff7d573afc446c189f852382312d477c67d26108 /vcl/source/control/throbber.cxx
parentc93eb59b65d5cecb185b4dae11593149009a60bf (diff)
loplugin:unusedfields in vcl
Change-Id: I207866df495ec81bb9288e6d0f664b96d90251d6 Reviewed-on: https://gerrit.libreoffice.org/40217 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control/throbber.cxx')
-rw-r--r--vcl/source/control/throbber.cxx18
1 files changed, 4 insertions, 14 deletions
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 86297ad3b445..9201a75430a7 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -45,7 +45,6 @@ Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style )
,mbRepeat( true )
,mnStepTime( 100 )
,mnCurStep( 0 )
- ,meImageSet( ImageSet::Auto )
{
maWaitTimer.SetTimeout( mnStepTime );
maWaitTimer.SetInvokeHandler( LINK( this, Throbber, TimeOutHdl ) );
@@ -96,9 +95,7 @@ namespace
void Throbber::Resize()
{
ImageControl::Resize();
-
- if ( meImageSet == ImageSet::Auto )
- initImages();
+ initImages();
}
void Throbber::initImages()
@@ -106,16 +103,9 @@ void Throbber::initImages()
try
{
::std::vector< ::std::vector< Image > > aImageSets;
- if ( meImageSet == ImageSet::Auto )
- {
- aImageSets.push_back( lcl_loadImageSet( ImageSet::N16px ) );
- aImageSets.push_back( lcl_loadImageSet( ImageSet::N32px ) );
- aImageSets.push_back( lcl_loadImageSet( ImageSet::N64px ) );
- }
- else
- {
- aImageSets.push_back( lcl_loadImageSet( meImageSet ) );
- }
+ aImageSets.push_back( lcl_loadImageSet( ImageSet::N16px ) );
+ aImageSets.push_back( lcl_loadImageSet( ImageSet::N32px ) );
+ aImageSets.push_back( lcl_loadImageSet( ImageSet::N64px ) );
// find the best matching image set (size-wise)
const ::Size aWindowSizePixel = GetSizePixel();