convert Suffix/Prefix to rtl::OUString

sw/inc/fmtftntx.hxx

@@ -46,8 +46,8 @@ enum SwFtnEndPosEnum
 
 class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
 {
-    String      sPrefix;
-    String      sSuffix;
+    rtl::OUString sPrefix;
+    rtl::OUString sSuffix;
     SvxNumberType aFmt;
     sal_uInt16      nOffset;
 
@@ -87,11 +87,11 @@ public:
     sal_uInt16 GetOffset() const                { return nOffset; }
     void SetOffset( sal_uInt16 nOff )           { nOffset = nOff; }
 
-    const String& GetPrefix() const         { return sPrefix; }
-    void SetPrefix(const String& rSet)      { sPrefix = rSet; }
+    const rtl::OUString& GetPrefix() const      { return sPrefix; }
+    void SetPrefix(const rtl::OUString& rSet)   { sPrefix = rSet; }
 
-    const String& GetSuffix() const         { return sSuffix; }
-    void SetSuffix(const String& rSet)      { sSuffix = rSet; }
+    const rtl::OUString& GetSuffix() const      { return sSuffix; }
+    void SetSuffix(const rtl::OUString& rSet)   { sSuffix = rSet; }
 };
 
 class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd

sw/inc/ftninfo.hxx

@@ -42,8 +42,8 @@ class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
 {
     SwDepend    aPageDescDep;
     SwDepend    aCharFmtDep, aAnchorCharFmtDep;
-    String      sPrefix;
-    String      sSuffix;
+    rtl::OUString sPrefix;
+    rtl::OUString sSuffix;
 protected:
     bool        m_bEndNote;
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
@@ -74,11 +74,11 @@ public:
     SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
     SwEndNoteInfo(const SwEndNoteInfo&);
 
-    const String& GetPrefix() const         { return sPrefix; }
-    const String& GetSuffix() const         { return sSuffix; }
+    const rtl::OUString& GetPrefix() const  { return sPrefix; }
+    const rtl::OUString& GetSuffix() const  { return sSuffix; }
 
-    void SetPrefix(const String& rSet)      { sPrefix = rSet; }
-    void SetSuffix(const String& rSet)      { sSuffix = rSet; }
+    void SetPrefix(const rtl::OUString& rSet) { sPrefix = rSet; }
+    void SetSuffix(const rtl::OUString& rSet) { sSuffix = rSet; }
     void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); }
 };
 

sw/source/filter/html/htmlftn.cxx

@@ -515,15 +515,15 @@ sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
     }
     if( rInfo.nFtnOffset > 0 )
     {
-        pParts[1] = String::CreateFromInt32( (sal_Int32)rInfo.nFtnOffset );
+        pParts[1] = rtl::OUString::valueOf(static_cast<sal_Int32>(rInfo.nFtnOffset));
         nParts = 2;
     }
-    if( rInfo.GetPrefix().Len() > 0 )
+    if( !rInfo.GetPrefix().isEmpty() )
     {
         pParts[2] = rInfo.GetPrefix();
         nParts = 3;
     }
-    if( rInfo.GetSuffix().Len() > 0 )
+    if( !rInfo.GetSuffix().isEmpty() )
     {
         pParts[3] = rInfo.GetSuffix();
         nParts = 4;