diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-10-05 10:20:43 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-10-05 10:20:43 -0400 |
| commit | c1c115ccf70a631292b4f96409bb068af1392a52 (patch) | |
| tree | 1d1a364c8b050279a39541e0230a7524c21c13c3 /sc | |
| parent | 27372c66fd42619240148aa5bc4cd115b9c17cb7 (diff) | |
String -> rtl::OUString.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/inc/xehelper.hxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index f6f482137978..49b8524f71d7 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 c978e774bef4..670b348ac685 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 |