diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-20 09:49:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:36 +0200 |
| commit | 9dc41e228dd60c60a4364d26270c9769d2939ded (patch) | |
| tree | 960bad38180b7cc8d185e392fc67df8975eecf00 /svx/source/gallery2 | |
| parent | fd8f8bdaadc6bac6cf57c335422482a6793211a2 (diff) | |
convert remnants of String in SVX to String
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galexpl.cxx | 22 | ||||
| -rw-r--r-- | svx/source/gallery2/galmisc.cxx | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index f4462949adf7..a6c0b434d10b 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -34,7 +34,7 @@ namespace // - GalleryExplorer - -bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) +bool GalleryExplorer::FillThemeList( std::vector<OUString>& rThemeList ) { Gallery* pGal = ::Gallery::GetGalleryInstance(); @@ -52,7 +52,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) return !rThemeList.empty(); } -sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<String> &rObjList ) +sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList ) { Gallery* pGal = ::Gallery::GetGalleryInstance(); @@ -73,7 +73,7 @@ sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<S return !rObjList.empty(); } -sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ) +bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList ) { Gallery* pGal = ::Gallery::GetGalleryInstance(); @@ -83,22 +83,6 @@ sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<St return FillObjList( pGal->GetThemeName( nThemeId ), rObjList ); } -bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList ) -{ - std::vector<String> aObjList; - if (!FillObjList(nThemeId, aObjList)) - return false; - - std::vector<OUString> aList; - aList.reserve(aObjList.size()); - std::vector<String>::const_iterator it = aObjList.begin(), itEnd = aObjList.end(); - for (; it != itEnd; ++it) - aList.push_back(*it); - - rObjList.swap(aList); - return true; -} - sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ) { Gallery* pGal = ::Gallery::GetGalleryInstance(); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index a2f04bf6e783..1b3409be063d 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -211,7 +211,7 @@ OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ) return aReduced; } -String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ) +OUString GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ) { OUString aRet; |