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 | b1653e6ae641d037d27aad645b6f338bbd447c64 (patch) | |
| tree | ef8d12914bfe4a4705cf64371a15b81f6f5c607f /svx | |
| parent | 8e5a6764d3469a0600835db601c6bf2c9b3ccf3b (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 27fd7eeca6..726db2396b 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 e2050d36b8..0770c711a7 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(); } // ------------------------------------------------------------------------ |