diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-16 23:25:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-17 16:06:34 +0100 |
| commit | 47391fb13988f66b1ded3573d44920f2355d1308 (patch) | |
| tree | c0b45aa120ccc3f57b9ed0cd7c1a0dc83a05dea7 /vcl | |
| parent | 46f1b3a5949e063953af635147acf748684c8e2f (diff) | |
XubString->OUString
Change-Id: I45ddca425871eb19aabd9876b64c2e2dac5bc774
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/stdtext.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/stdtext.cxx | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx index a9254c20048f..b6ae2d979077 100644 --- a/vcl/inc/vcl/stdtext.hxx +++ b/vcl/inc/vcl/stdtext.hxx @@ -43,13 +43,13 @@ class Window; #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) #define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE -rtl::OUString VCL_DLLPUBLIC GetStandardText( sal_uInt16 nStdText ); +OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); // ------------------------------------- // - Hilfsmethoden fuer Standard-Texte - // ------------------------------------- -void VCL_DLLPUBLIC ShowServiceNotAvailableError( Window* pParent, const XubString& rServiceName, sal_Bool bError ); +void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError); #endif // _VCL_STDTEXT_HXX 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(); |