UniString removal.

2 files changed, 77 insertions, 67 deletions

diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index b54e37c31b40..be874b0a70c3 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -144,8 +144,8 @@ public:
 
                             // If eLanguage==LANGUAGE_DONTKNOW the language/country
                             // used in number formatter initialization is taken.
-    String                  GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const;
-    static String           GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
+    rtl::OUString           GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const;
+    static rtl::OUString    GetFormatted( Date& rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
 
     virtual SvxFieldData*   Clone() const;
     virtual int             operator==( const SvxFieldData& ) const;
@@ -163,24 +163,24 @@ class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData
 {
 private:
     SvxURLFormat            eFormat;
-    XubString               aURL;               // URL-Address
-    XubString               aRepresentation;    // What is shown
-    XubString               aTargetFrame;       // In what Frame
+    rtl::OUString           aURL;               // URL-Address
+    rtl::OUString           aRepresentation;    // What is shown
+    rtl::OUString           aTargetFrame;       // In what Frame
 
 public:
                             SV_DECL_PERSIST1( SvxURLField, SvxFieldData, SVX_URLFIELD )
 
                             SvxURLField();
-                            SvxURLField( const XubString& rURL, const XubString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL );
+                            SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL );
 
-    const XubString&            GetURL() const { return aURL; }
-    void                    SetURL( const XubString& rURL ) { aURL = rURL; }
+    const rtl::OUString&    GetURL() const { return aURL; }
+    void                    SetURL( const rtl::OUString& rURL ) { aURL = rURL; }
 
-    const XubString&            GetRepresentation() const { return aRepresentation; }
-    void                    SetRepresentation( const XubString& rRep ) { aRepresentation= rRep; }
+    const rtl::OUString&    GetRepresentation() const { return aRepresentation; }
+    void                    SetRepresentation( const rtl::OUString& rRep ) { aRepresentation= rRep; }
 
-    const XubString&            GetTargetFrame() const { return aTargetFrame; }
-    void                    SetTargetFrame( const XubString& rFrm ) { aTargetFrame = rFrm; }
+    const rtl::OUString&    GetTargetFrame() const { return aTargetFrame; }
+    void                    SetTargetFrame( const rtl::OUString& rFrm ) { aTargetFrame = rFrm; }
 
     SvxURLFormat            GetFormat() const { return eFormat; }
     void                    SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; }
@@ -281,8 +281,8 @@ public:
 
                             // If eLanguage==LANGUAGE_DONTKNOW the language/country
                             // used in number formatter initialization is taken.
-    String                  GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const;
-    static String           GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
+    rtl::OUString           GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const;
+    static rtl::OUString    GetFormatted( Time& rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
 
     virtual SvxFieldData*   Clone() const;
     virtual int             operator==( const SvxFieldData& ) const;
@@ -303,19 +303,19 @@ enum SvxFileFormat {    SVXFILEFORMAT_NAME_EXT, // File name with Extension
 class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData
 {
 private:
-    XubString               aFile;
+    rtl::OUString           aFile;
     SvxFileType             eType;
     SvxFileFormat           eFormat;
 
 public:
                             SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData, SVX_EXT_FILEFIELD )
                             SvxExtFileField();
-                            SvxExtFileField( const XubString& rString,
+                            SvxExtFileField( const rtl::OUString& rString,
                                 SvxFileType eType = SVXFILETYPE_VAR,
                                 SvxFileFormat eFormat = SVXFILEFORMAT_FULLPATH );
 
-    String                  GetFile() const { return aFile; }
-    void                    SetFile( const XubString& rString ) { aFile = rString; }
+    rtl::OUString           GetFile() const { return aFile; }
+    void                    SetFile( const rtl::OUString& rString ) { aFile = rString; }
 
     SvxFileType             GetType() const { return eType; }
     void                    SetType( SvxFileType eTp ) { eType = eTp; }
@@ -323,7 +323,7 @@ public:
     SvxFileFormat           GetFormat() const { return eFormat; }
     void                    SetFormat( SvxFileFormat eFmt ) { eFormat = eFmt; }
 
-    XubString               GetFormatted() const;
+    rtl::OUString           GetFormatted() const;
 
     virtual SvxFieldData*   Clone() const;
     virtual int             operator==( const SvxFieldData& ) const;
@@ -340,9 +340,9 @@ enum SvxAuthorFormat {  SVXAUTHORFORMAT_FULLNAME,   // full name
 class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData
 {
 private:
-    XubString       aName;
-    XubString       aFirstName;
-    XubString       aShortName;
+    rtl::OUString   aName;
+    rtl::OUString   aFirstName;
+    rtl::OUString   aShortName;
     SvxAuthorType   eType;
     SvxAuthorFormat eFormat;
 
@@ -350,20 +350,20 @@ public:
                             SV_DECL_PERSIST1( SvxAuthorField, SvxFieldData, SVX_AUTHORFIELD )
                             SvxAuthorField();
                             SvxAuthorField(
-                                const XubString& rFirstName,
-                                const XubString& rLastName,
-                                const XubString& rShortName,
+                                const rtl::OUString& rFirstName,
+                                const rtl::OUString& rLastName,
+                                const rtl::OUString& rShortName,
                                 SvxAuthorType eType = SVXAUTHORTYPE_VAR,
                                 SvxAuthorFormat eFormat = SVXAUTHORFORMAT_FULLNAME );
 
-    XubString               GetName() const { return aName; }
-    void                    SetName( const XubString& rString ) { aName = rString; }
+    rtl::OUString           GetName() const { return aName; }
+    void                    SetName( const rtl::OUString& rString ) { aName = rString; }
 
-    XubString               GetFirstName() const { return aFirstName; }
-    void                    SetFirstName( const XubString& rString ) { aFirstName = rString; }
+    rtl::OUString           GetFirstName() const { return aFirstName; }
+    void                    SetFirstName( const rtl::OUString& rString ) { aFirstName = rString; }
 
-    XubString               GetShortName() const { return aShortName; }
-    void                    SetShortName( const XubString& rString ) { aShortName = rString; }
+    rtl::OUString           GetShortName() const { return aShortName; }
+    void                    SetShortName( const rtl::OUString& rString ) { aShortName = rString; }
 
     SvxAuthorType           GetType() const { return eType; }
     void                    SetType( SvxAuthorType eTp ) { eType = eTp; }
@@ -371,7 +371,7 @@ public:
     SvxAuthorFormat         GetFormat() const { return eFormat; }
     void                    SetFormat( SvxAuthorFormat eFmt ) { eFormat = eFmt; }
 
-    XubString               GetFormatted() const;
+    rtl::OUString           GetFormatted() const;
 
     virtual SvxFieldData*   Clone() const;
     virtual int             operator==( const SvxFieldData& ) const;
@@ -407,7 +407,7 @@ public:
                             SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
                             SvxDateTimeField() {}
 
-    static String           GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
+    static rtl::OUString    GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
 
     virtual SvxFieldData*   Clone() const;
     virtual int             operator==( const SvxFieldData& ) const;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 58f6ab1d5dc9..46153e65cd51 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -261,7 +261,7 @@ void SvxDateField::Save( SvPersistStream & rStm )
 
 // -----------------------------------------------------------------------
 
-String SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
+rtl::OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
     Date aDate( Date::EMPTY );
     if ( eType == SVXDATETYPE_FIX )
@@ -272,7 +272,7 @@ String SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType e
     return GetFormatted( aDate, eFormat, rFormatter, eLang );
 }
 
-String SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
+rtl::OUString SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
 {
     if ( eFormat == SVXDATEFORMAT_SYSTEM )
     {
@@ -326,7 +326,7 @@ String SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberF
     }
 
     double fDiffDate = aDate - *(rFormatter.GetNullDate());
-    String aStr;
+    rtl::OUString aStr;
        Color* pColor = NULL;
     rFormatter.GetOutputString( fDiffDate, nFormatKey, aStr, &pColor );
     return aStr;
@@ -348,7 +348,7 @@ SvxURLField::SvxURLField()
 
 // -----------------------------------------------------------------------
 
-SvxURLField::SvxURLField( const XubString& rURL, const XubString& rRepres, SvxURLFormat eFmt )
+SvxURLField::SvxURLField( const rtl::OUString& rURL, const rtl::OUString& rRepres, SvxURLFormat eFmt )
     : aURL( rURL ), aRepresentation( rRepres )
 {
     eFormat = eFmt;
@@ -384,16 +384,18 @@ static void write_unicode( SvPersistStream & rStm, const String& rString )
     rStm.Write( rString.GetBuffer(), nL*sizeof(sal_Unicode) );
 }
 
-static void read_unicode( SvPersistStream & rStm, String& rString )
+static void read_unicode( SvPersistStream & rStm, rtl::OUString& rString )
 {
     sal_uInt16 nL = 0;
     rStm >> nL;
+    String aStr;
     if ( nL )
     {
-        rString.AllocBuffer( nL );
-        rStm.Read( rString.GetBufferAccess(), nL*sizeof(sal_Unicode) );
-        rString.ReleaseBufferAccess( nL );
+        aStr.AllocBuffer( nL );
+        rStm.Read( aStr.GetBufferAccess(), nL*sizeof(sal_Unicode) );
+        aStr.ReleaseBufferAccess( nL );
     }
+    rString = aStr;
 }
 
 void SvxURLField::Load( SvPersistStream & rStm )
@@ -424,8 +426,8 @@ MetaAction* SvxURLField::createBeginComment() const
     // #i46618# Adding target URL to metafile comment
     return new MetaCommentAction( "FIELD_SEQ_BEGIN",
                                   0,
-                                  reinterpret_cast<const sal_uInt8*>(aURL.GetBuffer()),
-                                  2*aURL.Len() );
+                                  reinterpret_cast<const sal_uInt8*>(aURL.getStr()),
+                                  2*aURL.getLength() );
 }
 
 // =================================================================
@@ -612,7 +614,7 @@ void SvxExtTimeField::Save( SvPersistStream & rStm )
 
 //----------------------------------------------------------------------------
 
-String SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
+rtl::OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
     Time aTime( Time::EMPTY );
     if ( eType == SVXTIMETYPE_FIX )
@@ -622,7 +624,7 @@ String SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageTyp
     return GetFormatted( aTime, eFormat, rFormatter, eLang );
 }
 
-String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
+rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
 {
     switch( eFormat )
     {
@@ -646,10 +648,10 @@ String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumb
         break;
         case SVXTIMEFORMAT_12_HMSH:
         {   // no builtin format available, try to insert or reuse
-            String aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) );
+            rtl::OUString aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) );
             xub_StrLen nCheckPos;
             short nType;
-            /*sal_Bool bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
+            rFormatter.PutandConvertEntry( aFormatCode,
                 nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang );
             DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" );
             if ( nCheckPos )
@@ -674,7 +676,7 @@ String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumb
     }
 
     double fFracTime = aTime.GetTimeInDays();
-    String aStr;
+    rtl::OUString aStr;
        Color* pColor = NULL;
     rFormatter.GetOutputString( fFracTime, nFormatKey, aStr, &pColor );
     return aStr;
@@ -701,7 +703,7 @@ SvxExtFileField::SvxExtFileField()
 
 //----------------------------------------------------------------------------
 
-SvxExtFileField::SvxExtFileField( const XubString& rStr, SvxFileType eT, SvxFileFormat eF )
+SvxExtFileField::SvxExtFileField( const rtl::OUString& rStr, SvxFileType eT, SvxFileFormat eF )
 {
     aFile = rStr;
     eType = eT;
@@ -757,9 +759,9 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
 
 //----------------------------------------------------------------------------
 
-XubString SvxExtFileField::GetFormatted() const
+rtl::OUString SvxExtFileField::GetFormatted() const
 {
-    XubString aString;
+    rtl::OUString aString;
 
     INetURLObject aURLObj( aFile );
 
@@ -829,7 +831,7 @@ XubString SvxExtFileField::GetFormatted() const
         }
     }
 
-    return( aString );
+    return aString;
 }
 
 //----------------------------------------------------------------------------
@@ -848,9 +850,9 @@ SvxAuthorField::SvxAuthorField()
 
 //----------------------------------------------------------------------------
 
-SvxAuthorField::SvxAuthorField( const XubString& rFirstName,
-                                const XubString& rLastName,
-                                const XubString& rShortName,
+SvxAuthorField::SvxAuthorField( const rtl::OUString& rFirstName,
+                                const rtl::OUString& rLastName,
+                                const rtl::OUString& rShortName,
                                     SvxAuthorType eT, SvxAuthorFormat eF )
 {
     aName      = rLastName;
@@ -913,18 +915,20 @@ void SvxAuthorField::Save( SvPersistStream & rStm )
 
 //----------------------------------------------------------------------------
 
-XubString SvxAuthorField::GetFormatted() const
+rtl::OUString SvxAuthorField::GetFormatted() const
 {
-    XubString aString;
+    rtl::OUString aString;
 
     switch( eFormat )
     {
         case SVXAUTHORFORMAT_FULLNAME:
-            aString  = aFirstName;
-            aString += sal_Unicode(' ');
-            aString += aName;
+        {
+            rtl::OUStringBuffer aBuf(aFirstName);
+            aBuf.append(sal_Unicode(' '));
+            aBuf.append(aName);
+            aString = aBuf.makeStringAndClear();
+        }
         break;
-
         case SVXAUTHORFORMAT_NAME:
             aString = aName;
         break;
@@ -938,7 +942,7 @@ XubString SvxAuthorField::GetFormatted() const
         break;
     }
 
-    return( aString );
+    return aString;
 }
 
 static SvClassManager* pClassMgr=0;
@@ -1027,9 +1031,10 @@ void SvxDateTimeField::Save( SvPersistStream & /*rStm*/ )
 {
 }
 
-String SvxDateTimeField::GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage )
+rtl::OUString SvxDateTimeField::GetFormatted(
+    Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage )
 {
-    String aRet;
+    rtl::OUString aRet;
 
     SvxDateFormat eDateFormat = (SvxDateFormat)(eFormat & 0x0f);
 
@@ -1042,10 +1047,15 @@ String SvxDateTimeField::GetFormatted( Date& rDate, Time& rTime, int eFormat, Sv
 
     if(eTimeFormat)
     {
-        if(aRet.Len())
-            aRet += sal_Unicode(' ');
+        rtl::OUStringBuffer aBuf(aRet);
+
+        if (!aRet.isEmpty())
+            aBuf.append(sal_Unicode(' '));
+
+        aBuf.append(
+            SvxExtTimeField::GetFormatted(rTime, eTimeFormat, rFormatter, eLanguage));
 
-        aRet += SvxExtTimeField::GetFormatted( rTime, eTimeFormat, rFormatter, eLanguage );
+        aRet = aBuf.makeStringAndClear();
     }
 
     return aRet;