[Libreoffice-commits] core.git: sw/inc sw/source

[Matteo Casalin]

 sw/inc/docstyle.hxx           |    5 +++--
 sw/source/ui/app/docstyle.cxx |    7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4e9d7341d421440453bfbc306d65a2bd7bad0384
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Mon Aug 19 02:13:48 2013 +0200

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

diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index bda6a87..6ca9cc5 100644
--- a/sw/inc/docstyle.hxx
+++ b/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();
 };
 
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 916550b..e8eb771 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/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);