sw: convert rest of SwStyleNameMapper to OUString

Change-Id: I54d1a31b86e60ceb9070f502df305d75bcfa23d9

6 files changed, 115 insertions, 103 deletions

diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 60efad6536cf..b3cb9c93cc07 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -76,7 +76,8 @@
 class String;
 struct SwTableEntry;
 
-typedef ::boost::unordered_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash;
+typedef ::boost::unordered_map<const OUString, sal_uInt16, OUStringHash>
+    NameToIdHash;
 
 class SwStyleNameMapper
 {
@@ -85,7 +86,7 @@ class SwStyleNameMapper
 
 protected:
     // UI Name tables
-    static boost::ptr_vector<String> *pTextUINameArray,
+    static boost::ptr_vector<OUString> *pTextUINameArray,
                             *pListsUINameArray,
                             *pExtraUINameArray,
                             *pRegisterUINameArray,
@@ -149,42 +150,45 @@ public:
                                                     const OUString& rName);
 
     // This gets the PoolId from the UI Name
-    SW_DLLPUBLIC static sal_uInt16 GetPoolIdFromUIName( const String& rName, SwGetPoolIdFromName );
+    SW_DLLPUBLIC static sal_uInt16 GetPoolIdFromUIName(const OUString& rName,
+                                                       SwGetPoolIdFromName);
 
     // Get the Pool ID from the programmatic name
-    static sal_uInt16 GetPoolIdFromProgName( const String& rName, SwGetPoolIdFromName );
+    static sal_uInt16 GetPoolIdFromProgName(const OUString& rName,
+                                            SwGetPoolIdFromName);
 
     // used to convert the 4 special ExtraProg/UINames for
     // RES_POOLCOLL_LABEL_DRAWING,  RES_POOLCOLL_LABEL_ABB,
     // RES_POOLCOLL_LABEL_TABLE, RES_POOLCOLL_LABEL_FRAME
     // forth and back.
     // Non-matching names remain unchanged.
-    SW_DLLPUBLIC static const String GetSpecialExtraProgName( const String& rExtraUIName );
-    static const String GetSpecialExtraUIName( const String& rExtraProgName );
-
-    static const boost::ptr_vector<String>& GetTextUINameArray();
-    static const boost::ptr_vector<String>& GetListsUINameArray();
-    static const boost::ptr_vector<String>& GetExtraUINameArray();
-    static const boost::ptr_vector<String>& GetRegisterUINameArray();
-    static const boost::ptr_vector<String>& GetDocUINameArray();
-    static const boost::ptr_vector<String>& GetHTMLUINameArray();
-    static const boost::ptr_vector<String>& GetFrmFmtUINameArray();
-    static const boost::ptr_vector<String>& GetChrFmtUINameArray();
-    static const boost::ptr_vector<String>& GetHTMLChrFmtUINameArray();
-    static const boost::ptr_vector<String>& GetPageDescUINameArray();
-    static const boost::ptr_vector<String>& GetNumRuleUINameArray();
-
-    static const boost::ptr_vector<String>& GetTextProgNameArray();
-    static const boost::ptr_vector<String>& GetListsProgNameArray();
-    static const boost::ptr_vector<String>& GetExtraProgNameArray();
-    static const boost::ptr_vector<String>& GetRegisterProgNameArray();
-    static const boost::ptr_vector<String>& GetDocProgNameArray();
-    static const boost::ptr_vector<String>& GetHTMLProgNameArray();
-    static const boost::ptr_vector<String>& GetFrmFmtProgNameArray();
-    static const boost::ptr_vector<String>& GetChrFmtProgNameArray();
-    static const boost::ptr_vector<String>& GetHTMLChrFmtProgNameArray();
-    static const boost::ptr_vector<String>& GetPageDescProgNameArray();
-    static const boost::ptr_vector<String>& GetNumRuleProgNameArray();
+    SW_DLLPUBLIC static const OUString GetSpecialExtraProgName(
+                    const OUString& rExtraUIName);
+    static const OUString GetSpecialExtraUIName(const OUString& rExtraProgName);
+
+    static const boost::ptr_vector<OUString>& GetTextUINameArray();
+    static const boost::ptr_vector<OUString>& GetListsUINameArray();
+    static const boost::ptr_vector<OUString>& GetExtraUINameArray();
+    static const boost::ptr_vector<OUString>& GetRegisterUINameArray();
+    static const boost::ptr_vector<OUString>& GetDocUINameArray();
+    static const boost::ptr_vector<OUString>& GetHTMLUINameArray();
+    static const boost::ptr_vector<OUString>& GetFrmFmtUINameArray();
+    static const boost::ptr_vector<OUString>& GetChrFmtUINameArray();
+    static const boost::ptr_vector<OUString>& GetHTMLChrFmtUINameArray();
+    static const boost::ptr_vector<OUString>& GetPageDescUINameArray();
+    static const boost::ptr_vector<OUString>& GetNumRuleUINameArray();
+
+    static const boost::ptr_vector<OUString>& GetTextProgNameArray();
+    static const boost::ptr_vector<OUString>& GetListsProgNameArray();
+    static const boost::ptr_vector<OUString>& GetExtraProgNameArray();
+    static const boost::ptr_vector<OUString>& GetRegisterProgNameArray();
+    static const boost::ptr_vector<OUString>& GetDocProgNameArray();
+    static const boost::ptr_vector<OUString>& GetHTMLProgNameArray();
+    static const boost::ptr_vector<OUString>& GetFrmFmtProgNameArray();
+    static const boost::ptr_vector<OUString>& GetChrFmtProgNameArray();
+    static const boost::ptr_vector<OUString>& GetHTMLChrFmtProgNameArray();
+    static const boost::ptr_vector<OUString>& GetPageDescProgNameArray();
+    static const boost::ptr_vector<OUString>& GetNumRuleProgNameArray();
 };
 #endif // _NAME_MAPPER_HXX
 
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 900bbbc596ec..da2d0d17cc67 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -156,7 +156,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
     sal_uInt16              nLastPos;
     sal_Bool                bFirstCalled;
 
-    void                AppendStyleList(const boost::ptr_vector<String>& rLst,
+    void                AppendStyleList(const boost::ptr_vector<OUString>& rLst,
                                         sal_Bool    bUsed,
                                         sal_Bool    bTestHidden,
                                         bool        bOnlyHidden,
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index adaf2daf5eb0..7c1855ad1948 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -27,7 +27,7 @@
 
 extern ResMgr* pSwResMgr;
 // Initialise UI names to 0
-boost::ptr_vector<String> *SwStyleNameMapper::pTextUINameArray = 0,
+boost::ptr_vector<OUString> *SwStyleNameMapper::pTextUINameArray = 0,
                 *SwStyleNameMapper::pListsUINameArray = 0,
                 *SwStyleNameMapper::pExtraUINameArray = 0,
                 *SwStyleNameMapper::pRegisterUINameArray = 0,
@@ -308,34 +308,37 @@ const struct SwTableEntry NumRuleProgNameTable [] =
 };
 #undef ENTRY
 
-boost::ptr_vector<String>* lcl_NewUINameArray( sal_uInt16 nStt, sal_uInt16 nEnd )
+static boost::ptr_vector<OUString>*
+lcl_NewUINameArray(sal_uInt16 nStt, sal_uInt16 const nEnd)
 {
-    boost::ptr_vector<String>* pNameArray = new boost::ptr_vector<String>;
+    boost::ptr_vector<OUString> *const pNameArray = new boost::ptr_vector<OUString>;
     pNameArray->reserve(nEnd - nStt);
     while( nStt < nEnd )
     {
         const ResId rRId( nStt, *pSwResMgr );
-        pNameArray->push_back(new String(rRId));
+        pNameArray->push_back(new OUString(rRId));
         ++nStt;
     }
     return pNameArray;
 }
 
-boost::ptr_vector<String>* lcl_NewProgNameArray( const SwTableEntry *pTable, sal_uInt8 nCount )
+static boost::ptr_vector<OUString>*
+lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount)
 {
-    boost::ptr_vector<String>* pProgNameArray = new boost::ptr_vector<String>;
+    boost::ptr_vector<OUString> *const pProgNameArray = new boost::ptr_vector<OUString>;
     pProgNameArray->reserve(nCount);
     while (pTable->nLength)
     {
-        pProgNameArray->push_back(new String( pTable->pChar, pTable->nLength, RTL_TEXTENCODING_ASCII_US ));
+        pProgNameArray->push_back(new OUString(pTable->pChar, pTable->nLength, RTL_TEXTENCODING_ASCII_US));
         pTable++;
     }
     return pProgNameArray;
 }
 
-String lcl_GetSpecialExtraName( const String& rExtraName, const bool bIsUIName )
+static OUString
+lcl_GetSpecialExtraName(const OUString& rExtraName, const bool bIsUIName )
 {
-    const boost::ptr_vector<String>& rExtraArr = bIsUIName
+    const boost::ptr_vector<OUString>& rExtraArr = bIsUIName
         ? SwStyleNameMapper::GetExtraUINameArray()
         : SwStyleNameMapper::GetExtraProgNameArray();
     static const sal_uInt16 nIds[] =
@@ -359,10 +362,10 @@ String lcl_GetSpecialExtraName( const String& rExtraName, const bool bIsUIName )
     return rExtraName;
 }
 
-bool lcl_SuffixIsUser ( const String & rString )
+static bool lcl_SuffixIsUser(const OUString & rString)
 {
-    const sal_Unicode *pChar = rString.GetBuffer();
-    sal_Int32 nLen = rString.Len();
+    const sal_Unicode *pChar = rString.getStr();
+    sal_Int32 nLen = rString.getLength();
     bool bRet = false;
     if( nLen > 8 &&
         pChar[nLen-7] == ' ' &&
@@ -389,7 +392,7 @@ static void lcl_CheckSuffixAndDelete(OUString & rString)
 const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, bool bProgName )
 {
     NameToIdHash *pHash = 0;
-    const boost::ptr_vector<String> *pStrings;
+    const boost::ptr_vector<OUString> *pStrings;
 
     switch ( eFlags )
     {
@@ -409,22 +412,22 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
                                            RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN );
                 pStrings = bProgName ? &GetTextProgNameArray() : &GetTextUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCOLL_TEXT_BEGIN ; nId < RES_POOLCOLL_TEXT_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 pStrings = bProgName ? &GetListsProgNameArray() : &GetListsUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCOLL_LISTS_BEGIN ; nId < RES_POOLCOLL_LISTS_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 pStrings = bProgName ? &GetExtraProgNameArray() : &GetExtraUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCOLL_EXTRA_BEGIN ; nId < RES_POOLCOLL_EXTRA_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 pStrings = bProgName ? &GetRegisterProgNameArray() : &GetRegisterUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCOLL_REGISTER_BEGIN ; nId < RES_POOLCOLL_REGISTER_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 pStrings = bProgName ? &GetDocProgNameArray() : &GetDocUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCOLL_DOC_BEGIN ; nId < RES_POOLCOLL_DOC_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 pStrings = bProgName ? &GetHTMLProgNameArray() : &GetHTMLUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCOLL_HTML_BEGIN ; nId < RES_POOLCOLL_HTML_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
 
                 if ( bProgName )
                     pParaProgMap = pHash;
@@ -445,10 +448,10 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
                                            RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN );
                 pStrings = bProgName ? &GetChrFmtProgNameArray() : &GetChrFmtUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCHR_NORMAL_BEGIN ; nId < RES_POOLCHR_NORMAL_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 pStrings = bProgName ? &GetHTMLChrFmtProgNameArray() : &GetHTMLChrFmtUINameArray();
                 for ( nIndex = 0, nId = RES_POOLCHR_HTML_BEGIN ; nId < RES_POOLCHR_HTML_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 if (bProgName )
                     pCharProgMap = pHash;
                 else
@@ -464,7 +467,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
                 pHash = new NameToIdHash ( RES_POOLFRM_END - RES_POOLFRM_BEGIN );
                 pStrings = bProgName ? &GetFrmFmtProgNameArray() : &GetFrmFmtUINameArray();
                 for ( sal_uInt16 nIndex=0,nId = RES_POOLFRM_BEGIN ; nId < RES_POOLFRM_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 if ( bProgName )
                     pFrameProgMap = pHash;
                 else
@@ -480,7 +483,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
                 pHash = new NameToIdHash ( RES_POOLPAGE_END - RES_POOLPAGE_BEGIN );
                 pStrings = bProgName ? &GetPageDescProgNameArray() : &GetPageDescUINameArray();
                 for ( sal_uInt16 nIndex=0,nId = RES_POOLPAGE_BEGIN ; nId < RES_POOLPAGE_END ; nId++,nIndex++ )
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 if ( bProgName )
                     pPageProgMap = pHash;
                 else
@@ -497,7 +500,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
                 pStrings = bProgName ? &GetNumRuleProgNameArray() : &GetNumRuleUINameArray();
                 for ( sal_uInt16 nIndex=0,nId = RES_POOLNUMRULE_BEGIN ; nId < RES_POOLNUMRULE_END ; nId++,nIndex++ )
                 {
-                    (*pHash)[&((*pStrings)[nIndex])] = nId;
+                    (*pHash)[((*pStrings)[nIndex])] = nId;
                 }
                 if ( bProgName )
                     pNumRuleProgMap = pHash;
@@ -515,7 +518,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         {
             for ( sal_uInt16 nIndex = 0, nId = RES_POOLCOLL_TEXT_BEGIN ; nId < RES_POOLCOLL_TEXT_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -527,7 +530,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             }
             for ( nIndex = 0, nId = RES_POOLCOLL_LISTS_BEGIN ; nId < RES_POOLCOLL_LISTS_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -539,7 +542,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             }
             for ( nIndex = 0, nId = RES_POOLCOLL_EXTRA_BEGIN ; nId < RES_POOLCOLL_EXTRA_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -551,7 +554,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             }
             for ( nIndex = 0, nId = RES_POOLCOLL_REGISTER_BEGIN ; nId < RES_POOLCOLL_REGISTER_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -563,7 +566,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             }
             for ( nIndex = 0, nId = RES_POOLCOLL_DOC_BEGIN ; nId < RES_POOLCOLL_DOC_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -575,7 +578,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             }
             for ( nIndex = 0, nId = RES_POOLCOLL_HTML_BEGIN ; nId < RES_POOLCOLL_HTML_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -589,7 +592,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         {
             for ( sal_uInt16 nIndex = 0, nId = RES_POOLCHR_NORMAL_BEGIN ; nId < RES_POOLCHR_NORMAL_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -601,7 +604,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             }
             for ( nIndex = 0, nId = RES_POOLCHR_HTML_BEGIN ; nId < RES_POOLCHR_HTML_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -615,7 +618,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         {
             for ( sal_uInt16 nIndex=0,nId = RES_POOLFRM_BEGIN ; nId < RES_POOLFRM_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -629,7 +632,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         {
             for ( sal_uInt16 nIndex=0,nId = RES_POOLPAGE_BEGIN ; nId < RES_POOLPAGE_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -643,7 +646,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
         {
             for ( sal_uInt16 nIndex=0,nId = RES_POOLNUMRULE_BEGIN ; nId < RES_POOLNUMRULE_END ; nId++,nIndex++ )
             {
-                String aString, bString;
+                OUString aString, bString;
                 FillUIName ( nId, aString );
                 bString = GetProgName ( nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, aString );
                 sal_uInt16 nNewId = GetPoolIdFromProgName ( bString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
@@ -729,7 +732,7 @@ const OUString& SwStyleNameMapper::getNameFromId(
         sal_uInt16 const nId, const OUString& rFillName, bool const bProgName)
 {
     sal_uInt16 nStt = 0;
-    const boost::ptr_vector<String>* pStrArr = 0;
+    const boost::ptr_vector<OUString>* pStrArr = 0;
 
     switch( (USER_FMT | COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID) & nId )
     {
@@ -809,8 +812,7 @@ const OUString& SwStyleNameMapper::getNameFromId(
         }
         break;
     }
-    //FIXME
-    return pStrArr ? reinterpret_cast<OUString const&>(pStrArr->operator[](nId - nStt)) : rFillName;
+    return pStrArr ? pStrArr->operator[](nId - nStt) : rFillName;
 }
 
 void SwStyleNameMapper::fillNameFromId(
@@ -843,21 +845,23 @@ SwStyleNameMapper::GetProgName(sal_uInt16 const nId, const OUString& rName)
     return getNameFromId(nId, rName, true);
 }
 // This gets the PoolId from the UI Name
-sal_uInt16 SwStyleNameMapper::GetPoolIdFromUIName( const String& rName, SwGetPoolIdFromName eFlags )
+sal_uInt16 SwStyleNameMapper::GetPoolIdFromUIName(
+        const OUString& rName, SwGetPoolIdFromName const eFlags)
 {
     const NameToIdHash & rHashMap = getHashTable ( eFlags, false );
-    NameToIdHash::const_iterator aIter = rHashMap.find ( &rName );
+    NameToIdHash::const_iterator aIter = rHashMap.find(rName);
     return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX;
 }
 // Get the Pool ID from the programmatic name
-sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName( const String& rName, SwGetPoolIdFromName eFlags )
+sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName(
+            const OUString& rName, SwGetPoolIdFromName const eFlags)
 {
     const NameToIdHash & rHashMap = getHashTable ( eFlags, true );
-    NameToIdHash::const_iterator aIter = rHashMap.find ( &rName );
+    NameToIdHash::const_iterator aIter = rHashMap.find(rName);
     return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetTextUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetTextUINameArray()
 {
     if (!pTextUINameArray)
         pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN,
@@ -865,7 +869,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetTextUINameArray()
     return *pTextUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetListsUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetListsUINameArray()
 {
     if (!pListsUINameArray)
         pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN,
@@ -873,7 +877,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetListsUINameArray()
     return *pListsUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetExtraUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetExtraUINameArray()
 {
     if (!pExtraUINameArray)
         pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN,
@@ -881,7 +885,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetExtraUINameArray()
     return *pExtraUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetRegisterUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray()
 {
     if (!pRegisterUINameArray)
         pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN,
@@ -889,7 +893,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetRegisterUINameArray()
     return *pRegisterUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetDocUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetDocUINameArray()
 {
     if (!pDocUINameArray)
         pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN,
@@ -897,7 +901,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetDocUINameArray()
     return *pDocUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
 {
     if (!pHTMLUINameArray)
         pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN,
@@ -905,7 +909,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLUINameArray()
     return *pHTMLUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetFrmFmtUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetFrmFmtUINameArray()
 {
     if (!pFrmFmtUINameArray)
         pFrmFmtUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
@@ -913,7 +917,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetFrmFmtUINameArray()
     return *pFrmFmtUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetChrFmtUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetChrFmtUINameArray()
 {
     if (!pChrFmtUINameArray)
         pChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
@@ -921,7 +925,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetChrFmtUINameArray()
     return *pChrFmtUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLChrFmtUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtUINameArray()
 {
     if (!pHTMLChrFmtUINameArray)
         pHTMLChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
@@ -929,7 +933,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLChrFmtUINameArray()
     return *pHTMLChrFmtUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetPageDescUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
 {
     if (!pPageDescUINameArray)
         pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN,
@@ -937,7 +941,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetPageDescUINameArray()
     return *pPageDescUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleUINameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray()
 {
     if (!pNumRuleUINameArray)
         pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN,
@@ -945,7 +949,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleUINameArray()
     return *pNumRuleUINameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetTextProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetTextProgNameArray()
 {
     if (!pTextProgNameArray)
         pTextProgNameArray = lcl_NewProgNameArray(TextProgNameTable,
@@ -953,7 +957,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetTextProgNameArray()
     return *pTextProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetListsProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetListsProgNameArray()
 {
     if (!pListsProgNameArray)
         pListsProgNameArray = lcl_NewProgNameArray( ListsProgNameTable,
@@ -961,7 +965,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetListsProgNameArray()
     return *pListsProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetExtraProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetExtraProgNameArray()
 {
     if (!pExtraProgNameArray)
         pExtraProgNameArray = lcl_NewProgNameArray( ExtraProgNameTable,
@@ -969,7 +973,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetExtraProgNameArray()
     return *pExtraProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetRegisterProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetRegisterProgNameArray()
 {
     if (!pRegisterProgNameArray)
         pRegisterProgNameArray = lcl_NewProgNameArray( RegisterProgNameTable,
@@ -977,7 +981,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetRegisterProgNameArray()
     return *pRegisterProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetDocProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetDocProgNameArray()
 {
     if (!pDocProgNameArray)
         pDocProgNameArray = lcl_NewProgNameArray( DocProgNameTable,
@@ -985,7 +989,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetDocProgNameArray()
     return *pDocProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray()
 {
     if (!pHTMLProgNameArray)
         pHTMLProgNameArray = lcl_NewProgNameArray( HTMLProgNameTable,
@@ -993,7 +997,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLProgNameArray()
     return *pHTMLProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetFrmFmtProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetFrmFmtProgNameArray()
 {
     if (!pFrmFmtProgNameArray)
         pFrmFmtProgNameArray = lcl_NewProgNameArray( FrmFmtProgNameTable,
@@ -1001,7 +1005,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetFrmFmtProgNameArray()
     return *pFrmFmtProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetChrFmtProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetChrFmtProgNameArray()
 {
     if (!pChrFmtProgNameArray)
         pChrFmtProgNameArray = lcl_NewProgNameArray( ChrFmtProgNameTable,
@@ -1009,7 +1013,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetChrFmtProgNameArray()
     return *pChrFmtProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
 {
     if (!pHTMLChrFmtProgNameArray)
         pHTMLChrFmtProgNameArray = lcl_NewProgNameArray( HTMLChrFmtProgNameTable,
@@ -1017,7 +1021,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
     return *pHTMLChrFmtProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetPageDescProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray()
 {
     if (!pPageDescProgNameArray)
         pPageDescProgNameArray = lcl_NewProgNameArray( PageDescProgNameTable,
@@ -1025,7 +1029,7 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetPageDescProgNameArray()
     return *pPageDescProgNameArray;
 }
 
-const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleProgNameArray()
+const boost::ptr_vector<OUString>& SwStyleNameMapper::GetNumRuleProgNameArray()
 {
     if (!pNumRuleProgNameArray)
         pNumRuleProgNameArray = lcl_NewProgNameArray( NumRuleProgNameTable,
@@ -1034,12 +1038,14 @@ const boost::ptr_vector<String>& SwStyleNameMapper::GetNumRuleProgNameArray()
 }
 
 
-const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIName )
+const OUString
+SwStyleNameMapper::GetSpecialExtraProgName(const OUString& rExtraUIName)
 {
     return lcl_GetSpecialExtraName( rExtraUIName, true );
 }
 
-const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgName )
+const OUString
+SwStyleNameMapper::GetSpecialExtraUIName(const OUString& rExtraProgName)
 {
     return lcl_GetSpecialExtraName( rExtraProgName, false );
 }
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index a6e0554bdf2f..44d99c72d2d2 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -565,8 +565,9 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
         bool bSetValue = true;
         if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_SUB_TYPE)))
         {
-            const boost::ptr_vector<String>& rExtraArr(SwStyleNameMapper::GetExtraUINameArray());
-            String sTypeName = pType->GetName();
+            const boost::ptr_vector<OUString>& rExtraArr(
+                    SwStyleNameMapper::GetExtraUINameArray());
+            OUString sTypeName = pType->GetName();
             static sal_uInt16 nIds[] =
             {
                 RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN,
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index d7cea9fe30a0..7d3b56fc7d99 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2477,8 +2477,8 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
             }
 
             aLst.Append( cCHAR, pFmt == rDoc.GetDfltCharFmt()
-                        ? SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD -
-                                                RES_POOLCOLL_TEXT_BEGIN ]
+                        ? String(SwStyleNameMapper::GetTextUINameArray()[ RES_POOLCOLL_STANDARD -
+                                                RES_POOLCOLL_TEXT_BEGIN ])
                         : pFmt->GetName() );
         }
 
@@ -2810,7 +2810,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::Find(const OUString& rName)
     return 0;
 }
 
-void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rList,
+void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<OUString>& rList,
                                             sal_Bool bTestUsed, sal_Bool bTestHidden, bool bOnlyHidden,
                                             sal_uInt16 nSection, char cType )
 {
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 514f76dc821a..7f438b8760d2 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -297,7 +297,8 @@ sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
 
     // pool formats
     //
-    const boost::ptr_vector<String>& rFrmPoolArr(SwStyleNameMapper::GetFrmFmtUINameArray());
+    const boost::ptr_vector<OUString>& rFrmPoolArr(
+            SwStyleNameMapper::GetFrmFmtUINameArray());
     for( i = 0; i < rFrmPoolArr.size(); ++i )
     {
         aFormats.push_back(rFrmPoolArr[i]);