[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/filter/excel/xehelper.cxx |   10 +++++-----
 sc/source/filter/inc/xehelper.hxx   |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c1c115ccf70a631292b4f96409bb068af1392a52
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Wed Oct 5 10:20:43 2011 -0400

    String -> rtl::OUString.

diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index f6f4821..49b8524 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -980,18 +980,18 @@ rtl::OUString lclEncodeDosUrl(
 
 // ----------------------------------------------------------------------------
 
-String XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const String& rAbsUrl, const rtl::OUString* pTableName )
+rtl::OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName )
 {
     rtl::OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS);
     rtl::OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(INetURLObject::FSYS_DOS);
     return lclEncodeDosUrl(rRoot.GetBiff(), aDosUrl, aDosBase, pTableName);
 }
 
-String XclExpUrlHelper::EncodeDde( const String& rApplic, const String rTopic )
+rtl::OUString XclExpUrlHelper::EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic )
 {
-    String aDde( rApplic );
-    aDde.Append( EXC_DDE_DELIM ).Append( rTopic );
-    return aDde;
+    rtl::OUStringBuffer aBuf;
+    aBuf.append(rApplic).append(EXC_DDE_DELIM).append(rTopic);
+    return aBuf.makeStringAndClear();
 }
 
 // Cached Value Lists =========================================================
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index c978e77..670b348 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -412,9 +412,9 @@ class XclExpUrlHelper : boost::noncopyable
 public:
     /** Encodes and returns the URL passed in rAbsUrl to an Excel like URL.
         @param pTableName  Optional pointer to a table name to be encoded in this URL. */
-    static String       EncodeUrl( const XclExpRoot& rRoot, const String& rAbsUrl, const rtl::OUString* pTableName = 0 );
+    static rtl::OUString EncodeUrl( const XclExpRoot& rRoot, const rtl::OUString& rAbsUrl, const rtl::OUString* pTableName = 0 );
     /** Encodes and returns the passed DDE link to an Excel like DDE link. */
-    static String       EncodeDde( const String& rApplic, const String rTopic );
+    static rtl::OUString EncodeDde( const rtl::OUString& rApplic, const rtl::OUString& rTopic );
 
 private:
     /** We don't want anybody to instantiate this class, since it is just a