diff options
| author | Noel Grandin <noel@peralex.com> | 2015-12-03 12:49:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-12-03 13:57:23 +0200 |
| commit | 93122eb06abf77252f01a8a255fc28348efca911 (patch) | |
| tree | afc40cb1b802c974d259f8f98e1d6513d284fe56 | |
| parent | 2b17ec2175e288b92044092166d5b885978cecff (diff) | |
uno::Sequence->std::vector in vcl::Throbber
Change-Id: I9240cd2240940e03e895a7544c9f51a29b048355
| -rw-r--r-- | include/vcl/throbber.hxx | 1 | ||||
| -rw-r--r-- | toolkit/source/awt/animatedimagespeer.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/control/throbber.cxx | 10 |
3 files changed, 3 insertions, 14 deletions
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index 1701383529fc..be9ee33654c3 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -62,7 +62,6 @@ public: void stop(); bool isRunning() const; - void setImageList( const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& ImageList ); void setImageList( ::std::vector< Image > const& i_images ); // default images diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 14876ea27730..fa9707628d54 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -244,12 +244,12 @@ namespace toolkit } // found a set? - Sequence< Reference< XGraphic > > aImages; + std::vector< Image > aImages; if ( ( nPreferredSet >= 0 ) && ( size_t( nPreferredSet ) < nImageSetCount ) ) { // => set the images ::std::vector< CachedImage > const& rImageSet( i_data.aCachedImageSets[ nPreferredSet ] ); - aImages.realloc( rImageSet.size() ); + aImages.resize( rImageSet.size() ); sal_Int32 imageIndex = 0; for ( ::std::vector< CachedImage >::const_iterator cachedImage = rImageSet.begin(); cachedImage != rImageSet.end(); @@ -257,7 +257,7 @@ namespace toolkit ) { lcl_ensureImage_throw( xGraphicProvider, isHighContrast, *cachedImage ); - aImages[ imageIndex ] = cachedImage->xGraphic; + aImages[ imageIndex ] = Image(cachedImage->xGraphic); } } pThrobber->setImageList( aImages ); diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index dc711c9521c9..dff1a7cd9c02 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -192,16 +192,6 @@ void Throbber::setImageList( ::std::vector< Image > const& i_images ) SetImage( aInitialImage ); } -void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList ) -{ - ::std::vector< Image > aImages( rImageList.getLength() ); - for (sal_Int32 i = 0; i < rImageList.getLength(); ++i) - { - aImages[i] = Image(rImageList[i]); - } - setImageList( aImages ); -} - ::std::vector< OUString > Throbber::getDefaultImageURLs( const ImageSet i_imageSet ) { ::std::vector< OUString > aImageURLs; |