String to OUString

Change-Id: Ibbd6cfd969dd5ba3f839f48ff557d6c850ea3ab2
Reviewed-on: https://gerrit.libreoffice.org/5557Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

sw/inc/docstyle.hxx

@@ -20,6 +20,7 @@
 #define SW_DOCSTYLE_HXX
 
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 
 #include <svl/style.hxx>
 #include <svl/itemset.hxx>
@@ -38,11 +39,11 @@ class SwNumRule;
 /*--------------------------------------------------------------------
     Local helper class.
  --------------------------------------------------------------------*/
-class SwPoolFmtList : public std::vector<String>
+class SwPoolFmtList : public std::vector<OUString>
 {
 public:
     SwPoolFmtList() {}
-    void Append( char cChar, const String& rStr );
+    void Append( char cChar, const OUString& rStr );
     void Erase();
 };
 

sw/source/ui/app/docstyle.cxx

@@ -329,11 +329,10 @@ bool FindPhyStyle( SwDoc& rDoc, const String& rName, SfxStyleFamily eFam )
 }
 
 // Add Strings to the list of templates
-void SwPoolFmtList::Append( char cChar, const String& rStr )
+void SwPoolFmtList::Append( char cChar, const OUString& rStr )
 {
-    String aStr = OUString(cChar);
-    aStr += rStr;
-    for(std::vector<String>::const_iterator i = begin(); i != end(); ++i)
+    const OUString aStr = OUString(cChar) + rStr;
+    for(std::vector<OUString>::const_iterator i = begin(); i != end(); ++i)
         if(*i == aStr)
             return;
     push_back(aStr);