diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-16 00:30:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-16 00:42:53 +0200 |
| commit | b8cf71937ff604e50b709246383942b6d90b35e6 (patch) | |
| tree | b74f56806895195e4d36be5c12e90eb2e079a5e5 /desktop | |
| parent | 08d4ea4b48f9d6419e76fe31d5b53c1ea0b427df (diff) | |
Revert "ErrorBox EBX_ERR_PRINTDISABLED to String"
This reverts commit 90aecb31139a6743fd00c87585a82406e7d9f075.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/app/desktop.hrc | 4 | ||||
| -rw-r--r-- | desktop/source/app/desktop.src | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cd5d860ee2da..8eed98224636 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -92,7 +92,7 @@ #include <svtools/menuoptions.hxx> #include <rtl/bootstrap.hxx> #include <vcl/help.hxx> -#include <vcl/layout.hxx> +#include <vcl/msgbox.hxx> #include <vcl/settings.hxx> #include <sfx2/sfx.hrc> #include <sfx2/app.hxx> @@ -2434,7 +2434,7 @@ void Desktop::OpenClients() ResMgr* pDtResMgr = GetDesktopResManager(); if( pDtResMgr ) { - MessageDialog aBox( NULL, ResId( STR_ERR_PRINTDISABLED, *pDtResMgr ) ); + ErrorBox aBox( NULL, ResId( EBX_ERR_PRINTDISABLED, *pDtResMgr ) ); aBox.Execute(); } } diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 8a7affced76e..e9caf4abb8ff 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -28,6 +28,8 @@ #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) @@ -50,8 +52,6 @@ #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) diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index b109a0e55519..1036b212d35a 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -151,9 +151,11 @@ String STR_TITLE_USERDATALOCKED Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; }; -String STR_ERR_PRINTDISABLED +ErrorBox EBX_ERR_PRINTDISABLED { - Text [ en-US ] = "Printing is disabled. No documents can be printed."; + Buttons = WB_OK ; + DefButton = WB_DEF_OK ; + Message [ en-US ] = "Printing is disabled. No documents can be printed."; }; String STR_TITLE_EXPIRED |