diff options
| author | npcdoom <venccsralph@gmail.com> | 2011-02-26 15:55:29 -0430 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-03-01 17:38:31 +0100 |
| commit | 124175c44f8b956cc4a2267b9cab6a74cc1b3349 (patch) | |
| tree | eb896f655940b7cef09c08f4ea9827f2ee560c28 /svx | |
| parent | 2d43419e1b35ba9eb3c5b9bd999241c2cdab7946 (diff) | |
Change deprecated List for std::vector<String> in FillThemeList.
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/gallery.hxx | 2 | ||||
| -rw-r--r-- | 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 78b2632e49c6..8fef1579e5e5 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<String>& 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 cf0918811730..174c8a557b3b 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<String>& 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(); } // ------------------------------------------------------------------------ |