Skip to content

C
core
Kaydet (Commit) 124175c4 authored tarafından npcdoom's avatar npcdoom Kaydeden (comit) Luboš Luňák
Dosyalara gözat
Seçenekler

Change deprecated List for std::vector<String> in FillThemeList. 

Signed-off-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
üst 2d43419e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
svx/inc/gallery.hxx
Dosyayı görüntüle @ 124175c4
...@@ -228,7 +228,7 @@ public: ...@@ -228,7 +228,7 @@ public:
BOOL GetVCDrawModel( FmFormModel& rModel ) const; BOOL GetVCDrawModel( FmFormModel& rModel ) const;
BOOL IsLinkage() 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 // FillObjList is filling rObjList with Strings of the internal Gallery Object URL
static BOOL FillObjList( const String& rThemeName, List& rObjList ); static BOOL FillObjList( const String& rThemeName, List& rObjList );
......
svx/source/gallery2/galexpl.cxx
Dosyayı görüntüle @ 124175c4
...@@ -109,7 +109,7 @@ BOOL GalleryExplorer::IsLinkage() const ...@@ -109,7 +109,7 @@ BOOL GalleryExplorer::IsLinkage() const
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
BOOL GalleryExplorer::FillThemeList( List& rThemeList ) bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
{ {
Gallery* pGal = ImplGetGallery(); Gallery* pGal = ImplGetGallery();
...@@ -120,11 +120,11 @@ BOOL GalleryExplorer::FillThemeList( List& rThemeList ) ...@@ -120,11 +120,11 @@ BOOL GalleryExplorer::FillThemeList( List& rThemeList )
const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i ); const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i );
if( pEntry && !pEntry->IsReadOnly() && !pEntry->IsHidden() ) 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();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment