summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-16 23:25:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-10-17 16:06:34 +0100
commit47391fb13988f66b1ded3573d44920f2355d1308 (patch)
treec0b45aa120ccc3f57b9ed0cd7c1a0dc83a05dea7 /vcl/source/app
parent46f1b3a5949e063953af635147acf748684c8e2f (diff)
XubString->OUString
Change-Id: I45ddca425871eb19aabd9876b64c2e2dac5bc774
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/stdtext.cxx21
1 files changed, 12 insertions, 9 deletions
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index d7d5e85ed120..bd13f0df6c35 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -36,22 +36,25 @@
// =======================================================================
-rtl::OUString GetStandardText( sal_uInt16 nStdText )
+OUString GetStandardText( sal_uInt16 nStdText )
{
ResMgr* pResMgr = ImplGetResMgr();
- if( pResMgr )
- return ResId(nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr);
- return rtl::OUString();
+ if (pResMgr)
+ {
+ return ResId(nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr).
+ toString();
+ }
+ return OUString();
}
// =======================================================================
-void ShowServiceNotAvailableError( Window* pParent,
- const XubString& rServiceName, sal_Bool bError )
+void ShowServiceNotAvailableError(Window* pParent,
+ const OUString& rServiceName, bool bError)
{
- XubString aText( GetStandardText( STANDARD_TEXT_SERVICE_NOT_AVAILABLE ) );
- aText.SearchAndReplaceAscii( "%s", rServiceName );
- if ( bError )
+ OUString aText = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE).
+ replaceAll("%s", rServiceName);
+ if (bError)
{
ErrorBox aBox( pParent, WB_OK | WB_DEF_OK, aText );
aBox.Execute();