Kaydet (Commit) 2a53bf85 authored tarafından Caolán McNamara's avatar Caolán McNamara

only one use of GetStandardText

Change-Id: I384e3ccb6bfaf491a4616ee89c714a510f1f670b
üst b9b5e8e1
......@@ -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
......
......@@ -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
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment