diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-18 02:52:38 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-18 02:52:38 +0200 |
| commit | 5f8da7d0e61b4e0947d9259cde6668676e44e00a (patch) | |
| tree | ae4b24697a3edfaa7eae3c04e5e7f9ccd3309b2c /sw | |
| parent | 3d52e47c7348aec13453a5e08a7878cb6f45e3a8 (diff) | |
InfoBox MSG_ERROR_PASSWD to String
Change-Id: I88a34ad1d54066c30523c6493cbe5f0502adb3fb
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/globals.hrc | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/app.src | 6 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index f00f775e0183..4f391bf853ef 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -83,7 +83,7 @@ // INFOBOX ------------------------------------------------------------ #define ERR_CLPBRD_READ (RC_GLOBALS_BEGIN + 1) -#define MSG_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3) +#define STR_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3) // ACC --------------------------------------------------------------- diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 2b19c9f94804..c4a86bae82ce 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -264,11 +264,9 @@ String STR_READONLY_PATH Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?"; }; -InfoBox MSG_ERROR_PASSWD +String STR_ERROR_PASSWD { - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "Invalid password" ; + Text [ en-US ] = "Invalid password" ; }; String STR_FMT_STD diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index e93add0ed6e8..e3491cb26f76 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -18,6 +18,7 @@ */ #include <hintids.hxx> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -207,7 +208,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, if (!(*ppRdr)->CheckPasswd( aPasswd, *pRead )) { - InfoBox( 0, SW_RES(MSG_ERROR_PASSWD)).Execute(); + MessageDialog( 0, SW_RES(STR_ERROR_PASSWD), VCL_MESSAGE_INFO).Execute(); delete *ppRdr; return 0; } |