UniString to rtl::OUString.

cui/source/inc/cuitabline.hxx

@@ -140,9 +140,8 @@ private:
     FixedText           aSymbolHeightFT;
     MetricField         aSymbolHeightMF;
     CheckBox            aSymbolRatioCB;
-    std::vector<String> aGrfNames;
+    std::vector<rtl::OUString> aGrfNames;
     SvxBmpItemInfoList  aGrfBrushItems;
-    String              sNumCharFmtName;
     sal_Bool            bLastWidthModified;
     Size                aSymbolLastSize;
     Graphic             aSymbolGraphic;

cui/source/tabpages/tpline.cxx

@@ -1462,19 +1462,17 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
         GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
 
         PopupMenu* pPopup = new PopupMenu;
-        String aEmptyStr;
-        const String *pUIName = NULL;
+        rtl::OUString aEmptyStr;
+        const rtl::OUString *pUIName = NULL;
         sal_uInt32 i = 0;
-        for(std::vector<String>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i)
+        for(std::vector<rtl::OUString>::iterator it = aGrfNames.begin(); it != aGrfNames.end(); ++it, ++i)
         {
             pUIName = &(*it);
 
             // convert URL encodings to UI characters (eg %20 for spaces)
-            String aPhysicalName;
-            rtl::OUString sTmp;
-            if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( *it, sTmp ))
+            rtl::OUString aPhysicalName;
+            if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, aPhysicalName))
             {
-                aPhysicalName = sTmp;
                 pUIName = &aPhysicalName;
             }
 
@@ -1536,7 +1534,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
         pView->ShowSdrPage(pPage);
 
         PopupMenu* pPopup = new PopupMenu;
-        String aEmptyStr;
+        rtl::OUString aEmptyStr;
 
         // Generate invisible square to give all symbols a
         // bitmap size, which is indepedent from specific glyph

svx/inc/svx/gallery.hxx

@@ -231,6 +231,7 @@ public:
                                 // FillObjList is filling rObjList with Strings of the internal Gallery Object URL
     static sal_Bool                 FillObjList( const String& rThemeName, std::vector<String> &rObjList );
     static sal_Bool                 FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList );
+    static bool                 FillObjList( const sal_uInt32 nThemeId, std::vector<rtl::OUString> &rObjList );
 
                                 // FillObjTitleList is filling the rList with the title for each gallery object
     static sal_Bool             FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList );

svx/source/gallery2/galexpl.cxx

@@ -153,6 +153,23 @@ 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<rtl::OUString> &rObjList )
+{
+    std::vector<String> aObjList;
+    if (!FillObjList(nThemeId, aObjList))
+        return false;
+
+    // Convert UniString to rtl::OUString.
+    std::vector<rtl::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< rtl::OUString >& rList )