diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-18 03:34:54 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-18 03:58:14 +0200 |
| commit | 8807796e45084e560babb5f4da6f72262024398d (patch) | |
| tree | 619768815c001d1f17e8fab58e4d128b1eb10f7b | |
| parent | d6baf2ce1a1f188cbd85dea8e691751b2b1edcb0 (diff) | |
InfoBox REG_WRONG_PASSWORD and REG_WRONG_PASSWD_REPEAT to String
Change-Id: I64d2b73744401baafd7dd037187ba3d7c604a535
| -rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/dialog/regionsw.hrc | 4 | ||||
| -rw-r--r-- | sw/source/uibase/dialog/regionsw.src | 12 |
3 files changed, 10 insertions, 13 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 79e9e5a8fe30..6e0a027459b7 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -22,6 +22,7 @@ #include <svl/urihelper.hxx> #include <svl/PasswordHelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> @@ -417,7 +418,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) } else { - InfoBox(this, SW_RES(REG_WRONG_PASSWORD)).Execute(); + MessageDialog(this, SW_RES(STR_WRONG_PASSWORD), VCL_MESSAGE_INFO).Execute(); } } } @@ -1242,7 +1243,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) } else { - InfoBox(pBox, SW_RES(REG_WRONG_PASSWD_REPEAT)).Execute(); + MessageDialog(pBox, SW_RES(STR_WRONG_PASSWD_REPEAT), VCL_MESSAGE_INFO).Execute(); ChangePasswdHdl(pBox); break; } @@ -1681,7 +1682,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) } else { - InfoBox(pButton, SW_RES(REG_WRONG_PASSWD_REPEAT)).Execute(); + MessageDialog(pButton, SW_RES(STR_WRONG_PASSWD_REPEAT), VCL_MESSAGE_INFO).Execute(); } } else if(!bChange) diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc index b7d45f309c8d..bc7f18895ffe 100644 --- a/sw/source/uibase/dialog/regionsw.hrc +++ b/sw/source/uibase/dialog/regionsw.hrc @@ -28,8 +28,8 @@ #define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) #define QB_CONNECT (RC_REGIONSW_BEGIN+10) -#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) -#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) +#define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) +#define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) //ImageList elements #define BMP_HIDE 1 diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src index f23fe2b4d250..65b45b189375 100644 --- a/sw/source/uibase/dialog/regionsw.src +++ b/sw/source/uibase/dialog/regionsw.src @@ -53,17 +53,13 @@ QueryBox QB_CONNECT DefButton = WB_DEF_NO ; Message [ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ; }; -InfoBox REG_WRONG_PASSWORD +String STR_WRONG_PASSWORD { - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The password entered is invalid." ; + Text [ en-US ] = "The password entered is invalid." ; }; -InfoBox REG_WRONG_PASSWD_REPEAT +String STR_WRONG_PASSWD_REPEAT { - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The password has not been set." ; + Text [ en-US ] = "The password has not been set." ; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |