diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-04 17:13:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-09 21:15:07 +0000 |
| commit | 58528348fad0609c4d7af7943bc76df4261b8508 (patch) | |
| tree | dbb99737098ec6315b97ee82e28df198e6c5c23d /sd | |
| parent | 227d385fcdaf30ef4bd294d99b088ef533372d58 (diff) | |
String->OUString in tools::ErrorContext
Change-Id: Ibd0cd3e8d7281b5abde420df5cc1d51e9354069c
Reviewed-on: https://gerrit.libreoffice.org/769
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 8 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 043907769dd5..babb586e702d 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3316,16 +3316,16 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin) // ===================================================================== -sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr ) +sal_Bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr ) { DBG_ASSERT( mnResId != 0, "No error context set" ); if( mnResId == 0 ) return false; - rCtxStr = String( SdResId( mnResId ) ); + rCtxStr = SdResId( mnResId ); - rCtxStr.SearchAndReplace( rtl::OUString("$(URL1)"), maURL1 ); - rCtxStr.SearchAndReplace( rtl::OUString("$(URL2)"), maURL2 ); + rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL1)"), maURL1 ); + rCtxStr = rCtxStr.replaceAll( rtl::OUString("$(URL2)"), maURL2 ); return true; } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 0b4a4aa3b9a1..7a4ac0061c78 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -81,7 +81,7 @@ public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual sal_Bool GetString( sal_uLong nErrId, String& rCtxStr ); + virtual sal_Bool GetString( sal_uLong nErrId, OUString& rCtxStr ); void SetContext( sal_uInt16 nResId, const String& rURL ); void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 ); |