diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 14:48:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 15:01:28 +0100 |
| commit | 2a53bf858dd1719d5aa15e22d0f91bf9924ffe86 (patch) | |
| tree | 8b975bb6db0b7a943ffb08b1e637110327f38aa3 | |
| parent | b9b5e8e1ae5e0e6d7037a7ffc44996c91822c98a (diff) | |
only one use of GetStandardText
Change-Id: I384e3ccb6bfaf491a4616ee89c714a510f1f670b
| -rw-r--r-- | include/vcl/stdtext.hxx | 5 | ||||
| -rw-r--r-- | vcl/inc/svids.hrc | 1 | ||||
| -rw-r--r-- | vcl/source/app/stdtext.cxx | 13 |
3 files changed, 1 insertions, 18 deletions
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index 39a2175408ca..260e85d973fb 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -25,11 +25,6 @@ namespace vcl { class Window; } -#define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE -#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) - -OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); - void VCL_DLLPUBLIC ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError); #endif // INCLUDED_VCL_STDTEXT_HXX diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 1fba0b44f9b7..8d1f06dbb8f9 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -132,7 +132,6 @@ #define SV_BUTTONTEXT_CONNECT 10131 #define SV_BUTTONTEXT_SCREENSHOT 10132 -#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE #define SV_STDTEXT_SERVICENOTAVAILABLE 10210 #define SV_STDTEXT_DONTASKAGAIN 10212 diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index d30784625d32..db9d16326933 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -23,21 +23,10 @@ #include <svids.hrc> #include <svdata.hxx> -OUString GetStandardText( sal_uInt16 nStdText ) -{ - ResMgr* pResMgr = ImplGetResMgr(); - if (pResMgr) - { - return ResId(nStdText-STANDARD_TEXT_FIRST+SV_STDTEXT_FIRST, *pResMgr). - toString(); - } - return OUString(); -} - void ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError) { - OUString aText = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE). + OUString aText = VclResId(SV_STDTEXT_SERVICENOTAVAILABLE).toString(). replaceAll("%s", rServiceName); ScopedVclPtrInstance< MessageDialog > aBox( pParent, aText, bError ? VclMessageType::Error : VclMessageType::Warning ); aBox->Execute(); |