ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

uno::Sequence->std::vector in vcl::Throbber

Browse Source 
Change-Id: I9240cd2240940e03e895a7544c9f51a29b048355
This commit is contained in:
Noel Grandin
2015-12-03 13:57:23 +02:00
parent 2b17ec2175
commit 93122eb06a
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/throbber.hxx
-1
View File
@@ -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
toolkit/source/awt/animatedimagespeer.cxx
+3 -3
View File
@@ -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 );
vcl/source/control/throbber.cxx
-10
View File
@@ -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;