Kaydet (Commit) 36efd0f9 authored tarafından Caolán McNamara's avatar Caolán McNamara

try that ErrorBox removal again

Change-Id: I1d2f24def771651d36f06432c20e80429379c9fe
üst 7c1e12af
......@@ -92,7 +92,7 @@
#include <svtools/menuoptions.hxx>
#include <rtl/bootstrap.hxx>
#include <vcl/help.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/app.hxx>
......@@ -768,7 +768,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat
OUString const aMessage(aDiagnosticMessage + "\n");
ErrorBox aBootstrapFailedBox( NULL, WB_OK, aMessage );
MessageDialog aBootstrapFailedBox(NULL, aMessage);
aBootstrapFailedBox.SetText( aProductKey );
aBootstrapFailedBox.Execute();
}
......@@ -1173,7 +1173,7 @@ void restartOnMac(bool passArguments) {
ResMgr *resMgr = Desktop::GetDesktopResManager();
OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr).toString();
ErrorBox aRestartBox( NULL, WB_OK, aMessage );
MessageDialog aRestartBox(NULL, aMessage);
aRestartBox.Execute();
#else
OUString execUrl;
......@@ -2434,7 +2434,7 @@ void Desktop::OpenClients()
ResMgr* pDtResMgr = GetDesktopResManager();
if( pDtResMgr )
{
ErrorBox aBox( NULL, ResId( EBX_ERR_PRINTDISABLED, *pDtResMgr ) );
MessageDialog aBox(NULL, ResId(STR_ERR_PRINTDISABLED, *pDtResMgr));
aBox.Execute();
}
}
......
......@@ -28,8 +28,6 @@
#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100)
#define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190)
#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
......@@ -52,6 +50,8 @@
#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
#define STR_ERR_PRINTDISABLED (RID_DESKTOP_STRING_START+153)
#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
#define STR_LO_MUST_BE_RESTARTED (RID_DESKTOP_STRING_START+162)
......
......@@ -151,11 +151,9 @@ String STR_TITLE_USERDATALOCKED
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
};
ErrorBox EBX_ERR_PRINTDISABLED
String STR_ERR_PRINTDISABLED
{
Buttons = WB_OK ;
DefButton = WB_DEF_OK ;
Message [ en-US ] = "Printing is disabled. No documents can be printed.";
Text [ en-US ] = "Printing is disabled. No documents can be printed.";
};
String STR_TITLE_EXPIRED
......
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