diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 20:47:00 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 23:30:21 +0200 |
| commit | 90aecb31139a6743fd00c87585a82406e7d9f075 (patch) | |
| tree | e4b5804de63246bf314e7c87f5150bcf3c7c2175 /desktop | |
| parent | 3236e205f4b0ab43fb11f8ce3ebe8cfa749da6d5 (diff) | |
ErrorBox EBX_ERR_PRINTDISABLED to String
Change-Id: I7f59091a595a8e8a832b779da56bb53de810f22b
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, 6 insertions, 8 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 8eed98224636..cd5d860ee2da 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/msgbox.hxx> +#include <vcl/layout.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 ) { - ErrorBox aBox( NULL, ResId( EBX_ERR_PRINTDISABLED, *pDtResMgr ) ); + MessageDialog aBox( NULL, ResId( STR_ERR_PRINTDISABLED, *pDtResMgr ) ); aBox.Execute(); } } diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index e9caf4abb8ff..8a7affced76e 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -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) diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index 1036b212d35a..b109a0e55519 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -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 |