reduce UniStrings

8 files changed, 88 insertions, 99 deletions

diff --git a/svl/inc/svl/adrparse.hxx b/svl/inc/svl/adrparse.hxx
index e9f479af9e09..bfedd48aa836 100644
--- a/svl/inc/svl/adrparse.hxx
+++ b/svl/inc/svl/adrparse.hxx
@@ -36,13 +36,19 @@
 //============================================================================
 struct SvAddressEntry_Impl
 {
-    UniString m_aAddrSpec;
-    UniString m_aRealName;
-
-    SvAddressEntry_Impl() {};
-    SvAddressEntry_Impl(UniString const & rTheAddrSpec,
-                        UniString const & rTheRealName):
-        m_aAddrSpec(rTheAddrSpec), m_aRealName(rTheRealName) {}
+    rtl::OUString m_aAddrSpec;
+    rtl::OUString m_aRealName;
+
+    SvAddressEntry_Impl()
+    {
+    }
+
+    SvAddressEntry_Impl(const rtl::OUString& rTheAddrSpec,
+                        const rtl::OUString& rTheRealName)
+        : m_aAddrSpec(rTheAddrSpec)
+        , m_aRealName(rTheRealName)
+    {
+    }
 };
 
 //============================================================================
@@ -58,30 +64,25 @@ class SVL_DLLPUBLIC SvAddressParser
     bool m_bHasFirst;
 
 public:
-    SvAddressParser(UniString const & rInput);
+    SvAddressParser(const rtl::OUString& rInput);
 
     ~SvAddressParser();
 
     sal_Int32 Count() const { return m_bHasFirst ? m_aRest.size() + 1 : 0; }
 
-    inline UniString const & GetEmailAddress(sal_Int32 nIndex) const;
-
-    inline UniString const &GetRealName(sal_Int32 nIndex) const;
+    const rtl::OUString& GetEmailAddress(sal_Int32 nIndex) const
+    {
+        return nIndex == 0 ? m_aFirst.m_aAddrSpec :
+                             m_aRest[ nIndex - 1 ]->m_aAddrSpec;
+    }
+
+    const rtl::OUString& GetRealName(sal_Int32 nIndex) const
+    {
+        return nIndex == 0 ? m_aFirst.m_aRealName :
+                             m_aRest[ nIndex - 1 ]->m_aRealName;
+    }
 };
 
-inline UniString const & SvAddressParser::GetEmailAddress(sal_Int32 nIndex)
-    const
-{
-    return nIndex == 0 ? m_aFirst.m_aAddrSpec :
-                         m_aRest[ nIndex - 1 ]->m_aAddrSpec;
-}
-
-inline UniString const & SvAddressParser::GetRealName(sal_Int32 nIndex) const
-{
-    return nIndex == 0 ? m_aFirst.m_aRealName :
-                         m_aRest[ nIndex - 1 ]->m_aRealName;
-}
-
 #endif // _ADRPARSE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index b74de9373f6a..0b710b90854d 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -167,7 +167,7 @@ public:
 
     virtual sal_uInt16 GetValueCount() const;
 
-    virtual UniString GetValueTextByVal(sal_Bool bTheValue) const;
+    virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const;
 
     sal_Bool GetValue() const { return m_bValue; }
 
diff --git a/svl/inc/svl/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx
index fcc71502e639..4369ce6b1b0d 100644
--- a/svl/inc/svl/fstathelper.hxx
+++ b/svl/inc/svl/fstathelper.hxx
@@ -30,9 +30,9 @@
 #define _SVTOOLS_FSTATHELPER_HXX
 
 #include "svl/svldllapi.h"
+#include <rtl/ustring.hxx>
 #include <tools/solar.h>
 
-class UniString;
 class Date;
 class Time;
 
@@ -48,18 +48,18 @@ namespace FStatHelper {
 
     @return     it was be able to get the date/time stamp
 */
-SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const UniString& rURL,
+SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const rtl::OUString& rURL,
                                     Date* pDate, Time* pTime );
 
 /** Return if under the URL a document exist. This is only a wrapper for the
     UCB.IsContent.
 */
-SVL_DLLPUBLIC sal_Bool IsDocument( const UniString& rURL );
+SVL_DLLPUBLIC sal_Bool IsDocument( const rtl::OUString& rURL );
 
 /** Return if under the URL a folder exist. This is only a wrapper for the
     UCB.isFolder.
 */
-SVL_DLLPUBLIC sal_Bool IsFolder( const UniString& rURL );
+SVL_DLLPUBLIC sal_Bool IsFolder( const rtl::OUString& rURL );
 
 }
 
diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index 70f3ce994754..960bfc938985 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -84,7 +84,7 @@ public:
 
     virtual sal_uInt16 GetValueCount() const;
 
-    virtual UniString GetValueTextByVal(sal_Bool bTheValue) const;
+    virtual rtl::OUString GetValueTextByVal(sal_Bool bTheValue) const;
 
     sal_Bool GetValue() const { return m_nValue.bVisible; }
 
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index c471782d1fbc..9d91e03a8c4c 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -281,12 +281,9 @@ sal_uInt16 CntBoolItem::GetValueCount() const
 
 //============================================================================
 // virtual
-UniString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const
+rtl::OUString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const
 {
-    return
-        bTheValue ?
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TRUE")) :
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("FALSE"));
+    return bTheValue ?  rtl::OUString("TRUE") : rtl::OUString("FALSE");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index c9e75356f456..6453efc0c52d 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -135,12 +135,9 @@ sal_uInt16 SfxVisibilityItem::GetValueCount() const
 
 //============================================================================
 // virtual
-UniString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
+rtl::OUString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
 {
-    return
-        bTheValue ?
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TRUE")) :
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("FALSE"));
+    return bTheValue ?  rtl::OUString("TRUE") : rtl::OUString("FALSE");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index 99ce5ef837cf..b5a8ddcc8ebc 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
@@ -27,6 +27,7 @@
  ************************************************************************/
 
 #include <tools/inetmime.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <svl/adrparse.hxx>
 
 namespace
@@ -114,14 +115,14 @@ class SvAddressParser_Impl
 
     bool readToken();
 
-    static UniString reparse(sal_Unicode const * pBegin,
+    static rtl::OUString reparse(sal_Unicode const * pBegin,
                              sal_Unicode const * pEnd, bool bAddrSpec);
 
-    static UniString reparseComment(sal_Unicode const * pBegin,
+    static rtl::OUString reparseComment(sal_Unicode const * pBegin,
                                     sal_Unicode const * pEnd);
 
 public:
-    SvAddressParser_Impl(SvAddressParser * pParser, UniString const & rInput);
+    SvAddressParser_Impl(SvAddressParser * pParser, const rtl::OUString& rIn);
 };
 
 inline void SvAddressParser_Impl::resetRealNameAndFirstComment()
@@ -326,11 +327,10 @@ bool SvAddressParser_Impl::readToken()
 
 //============================================================================
 // static
-UniString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin,
-                                        sal_Unicode const * pEnd,
-                                        bool bAddrSpec)
+rtl::OUString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin,
+    sal_Unicode const * pEnd, bool bAddrSpec)
 {
-    UniString aResult;
+    rtl::OUStringBuffer aResult;
     TokenType eMode = TOKEN_ATOM;
     bool bEscaped = false;
     bool bEndsWithSpace = false;
@@ -343,44 +343,44 @@ UniString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin,
             case TOKEN_QUOTED:
                 if (bEscaped)
                 {
-                    aResult += cChar;
+                    aResult.append(cChar);
                     bEscaped = false;
                 }
                 else if (cChar == '"')
                 {
                     if (bAddrSpec)
-                        aResult += cChar;
+                        aResult.append(cChar);
                     eMode = TOKEN_ATOM;
                 }
                 else if (cChar == '\\')
                 {
                     if (bAddrSpec)
-                        aResult += cChar;
+                        aResult.append(cChar);
                     bEscaped = true;
                 }
                 else
-                    aResult += cChar;
+                    aResult.append(cChar);
                 break;
 
             case TOKEN_DOMAIN:
                 if (bEscaped)
                 {
-                    aResult += cChar;
+                    aResult.append(cChar);
                     bEscaped = false;
                 }
                 else if (cChar == ']')
                 {
-                    aResult += cChar;
+                    aResult.append(cChar);
                     eMode = TOKEN_ATOM;
                 }
                 else if (cChar == '\\')
                 {
                     if (bAddrSpec)
-                        aResult += cChar;
+                        aResult.append(cChar);
                     bEscaped = true;
                 }
                 else
-                    aResult += cChar;
+                    aResult.append(cChar);
                 break;
 
             case TOKEN_COMMENT:
@@ -402,7 +402,7 @@ UniString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin,
                 {
                     if (!bAddrSpec && !bEndsWithSpace)
                     {
-                        aResult += ' ';
+                        aResult.append(' ');
                         bEndsWithSpace = true;
                     }
                 }
@@ -410,7 +410,7 @@ UniString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin,
                 {
                     if (!bAddrSpec && !bEndsWithSpace)
                     {
-                        aResult += ' ';
+                        aResult.append(' ');
                         bEndsWithSpace = true;
                     }
                     eMode = TOKEN_COMMENT;
@@ -421,45 +421,45 @@ UniString SvAddressParser_Impl::reparse(sal_Unicode const * pBegin,
                     if (cChar == '"')
                     {
                         if (bAddrSpec)
-                            aResult += cChar;
+                            aResult.append(cChar);
                         eMode = TOKEN_QUOTED;
                     }
                     else if (cChar == '[')
                     {
-                        aResult += cChar;
+                        aResult.append(cChar);
                         eMode = TOKEN_QUOTED;
                     }
                     else
-                        aResult += cChar;
+                        aResult.append(cChar);
                 }
                 break;
         }
     }
-    return aResult;
+    return aResult.makeStringAndClear();
 }
 
 //============================================================================
 // static
-UniString SvAddressParser_Impl::reparseComment(sal_Unicode const * pBegin,
-                                               sal_Unicode const * pEnd)
+rtl::OUString SvAddressParser_Impl::reparseComment(sal_Unicode const * pBegin,
+    sal_Unicode const * pEnd)
 {
-    UniString aResult;
+    rtl::OUStringBuffer aResult;
     while (pBegin < pEnd)
     {
         sal_Unicode cChar = *pBegin++;
         if (cChar == '\\')
             cChar = *pBegin++;
-        aResult += cChar;
+        aResult.append(cChar);
     }
-    return aResult;
+    return aResult.makeStringAndClear();
 }
 
 //============================================================================
 SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
-                                           UniString const & rInput)
+                                           const rtl::OUString& rInput)
 {
-    m_pInputPos = rInput.GetBuffer();
-    m_pInputEnd = m_pInputPos + rInput.Len();
+    m_pInputPos = rInput.getStr();
+    m_pInputEnd = m_pInputPos + rInput.getLength();
 
     reset();
     bool bDone = false;
@@ -633,27 +633,25 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
                                       &m_aOuterAddrSpec : 0;
                     if (m_pAddrSpec)
                     {
-                        UniString aTheAddrSpec;
+                        rtl::OUString aTheAddrSpec;
                         if (m_pAddrSpec->m_bReparse)
                             aTheAddrSpec = reparse(m_pAddrSpec->m_pBegin,
                                                    m_pAddrSpec->m_pEnd, true);
                         else
                         {
-                            xub_StrLen nLen =
-                                sal::static_int_cast< xub_StrLen >(
+                            sal_Int32 nLen = (
                                     m_pAddrSpec->m_pEnd
                                     - m_pAddrSpec->m_pBegin);
-                            if (nLen == rInput.Len())
+                            if (nLen == rInput.getLength())
                                 aTheAddrSpec = rInput;
                             else
                                 aTheAddrSpec
-                                    = rInput.Copy(
-                                        sal::static_int_cast< xub_StrLen >(
-                                            m_pAddrSpec->m_pBegin
-                                            - rInput.GetBuffer()),
+                                    = rInput.copy(
+                                        (m_pAddrSpec->m_pBegin
+                                            - rInput.getStr()),
                                         nLen);
                         }
-                        UniString aTheRealName;
+                        rtl::OUString aTheRealName;
                         if (!m_pRealNameBegin
                             || (m_pAddrSpec == &m_aOuterAddrSpec
                                && m_pRealNameBegin
@@ -668,31 +666,26 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
                                                      m_pFirstCommentEnd);
                             else
                                 aTheRealName
-                                    = rInput.Copy(
-                                        sal::static_int_cast< xub_StrLen >(
-                                            m_pFirstCommentBegin
-                                            - rInput.GetBuffer()),
-                                        sal::static_int_cast< xub_StrLen >(
-                                            m_pFirstCommentEnd
-                                            - m_pFirstCommentBegin));
+                                    = rInput.copy(
+                                        (m_pFirstCommentBegin
+                                         - rInput.getStr()),
+                                        (m_pFirstCommentEnd
+                                         - m_pFirstCommentBegin));
                         else if (m_bRealNameReparse)
                             aTheRealName = reparse(m_pRealNameBegin,
                                                    m_pRealNameEnd, false);
                         else
                         {
-                            xub_StrLen nLen =
-                                sal::static_int_cast< xub_StrLen >(
-                                    m_pRealNameContentEnd
-                                    - m_pRealNameContentBegin);
-                            if (nLen == rInput.Len())
+                            sal_Int32 nLen =
+                                (m_pRealNameContentEnd
+                                 - m_pRealNameContentBegin);
+                            if (nLen == rInput.getLength())
                                 aTheRealName = rInput;
                             else
                                 aTheRealName
-                                    = rInput.Copy(
-                                        sal::static_int_cast< xub_StrLen >(
-                                            m_pRealNameContentBegin
-                                            - rInput.GetBuffer()),
-                                        nLen);
+                                    = rInput.copy(
+                                        (m_pRealNameContentBegin
+                                         - rInput.getStr()), nLen);
                         }
                         if (pParser->m_bHasFirst)
                             pParser->m_aRest.push_back(new SvAddressEntry_Impl(
@@ -761,7 +754,8 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
 //
 //============================================================================
 
-SvAddressParser::SvAddressParser(UniString const & rInput): m_bHasFirst(false)
+SvAddressParser::SvAddressParser(const rtl::OUString& rInput)
+    : m_bHasFirst(false)
 {
     SvAddressParser_Impl aDoParse(this, rInput);
 }
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index b6c0a11dd5f5..bd504651e5db 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::rtl;
 
-sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const UniString& rURL,
+sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const rtl::OUString& rURL,
                                         Date* pDate, Time* pTime )
 {
     sal_Bool bRet = sal_False;
@@ -66,7 +66,7 @@ sal_Bool FStatHelper::GetModifiedDateTimeOfFile( const UniString& rURL,
     return bRet;
 }
 
-sal_Bool FStatHelper::IsDocument( const UniString& rURL )
+sal_Bool FStatHelper::IsDocument( const rtl::OUString& rURL )
 {
     sal_Bool bExist = sal_False;
     try
@@ -81,7 +81,7 @@ sal_Bool FStatHelper::IsDocument( const UniString& rURL )
     return bExist;
 }
 
-sal_Bool FStatHelper::IsFolder( const UniString& rURL )
+sal_Bool FStatHelper::IsFolder( const rtl::OUString& rURL )
 {
     sal_Bool bExist = sal_False;
     try