From 85921d49dbd463013ed2cc975b622beb366ffefc Mon Sep 17 00:00:00 2001 From: npcdoom Date: Sat, 26 Feb 2011 15:55:29 -0430 Subject: [PATCH 2/2] Change deprecated List for std::vector in FillThemeList. --- svx/inc/gallery.hxx | 2 +- svx/source/gallery2/galexpl.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/svx/inc/gallery.hxx b/svx/inc/gallery.hxx index 27fd7ee..726db23 100644 --- a/svx/inc/gallery.hxx +++ b/svx/inc/gallery.hxx @@ -228,7 +228,7 @@ public: BOOL GetVCDrawModel( FmFormModel& rModel ) const; BOOL IsLinkage() const; - static BOOL FillThemeList( List& rThemeList ); + static bool FillThemeList( std::vector& rThemeList ); // FillObjList is filling rObjList with Strings of the internal Gallery Object URL static BOOL FillObjList( const String& rThemeName, List& rObjList ); diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index e2050d3..0770c71 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -109,7 +109,7 @@ BOOL GalleryExplorer::IsLinkage() const // ------------------------------------------------------------------------ -BOOL GalleryExplorer::FillThemeList( List& rThemeList ) +bool GalleryExplorer::FillThemeList( std::vector& rThemeList ) { Gallery* pGal = ImplGetGallery(); @@ -120,11 +120,11 @@ BOOL GalleryExplorer::FillThemeList( List& rThemeList ) const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i ); if( pEntry && !pEntry->IsReadOnly() && !pEntry->IsHidden() ) - rThemeList.Insert( new String( pEntry->GetThemeName() ), LIST_APPEND ); + rThemeList.push_back(pEntry->GetThemeName()); } } - return( rThemeList.Count() > 0 ); + return !rThemeList.empty(); } // ------------------------------------------------------------------------ -- 1.7.3.4