Kaydet (Commit) 8807796e authored tarafından Thomas Arnhold's avatar Thomas Arnhold

InfoBox REG_WRONG_PASSWORD and REG_WRONG_PASSWD_REPEAT to String

Change-Id: I64d2b73744401baafd7dd037187ba3d7c604a535
üst d6baf2ce
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#include <svl/PasswordHelper.hxx> #include <svl/PasswordHelper.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
...@@ -417,7 +418,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) ...@@ -417,7 +418,7 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
} }
else 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 ) ...@@ -1242,7 +1243,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
} }
else else
{ {
InfoBox(pBox, SW_RES(REG_WRONG_PASSWD_REPEAT)).Execute(); MessageDialog(pBox, SW_RES(STR_WRONG_PASSWD_REPEAT), VCL_MESSAGE_INFO).Execute();
ChangePasswdHdl(pBox); ChangePasswdHdl(pBox);
break; break;
} }
...@@ -1681,7 +1682,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) ...@@ -1681,7 +1682,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
} }
else 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) else if(!bChange)
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) #define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7)
#define QB_CONNECT (RC_REGIONSW_BEGIN+10) #define QB_CONNECT (RC_REGIONSW_BEGIN+10)
#define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) #define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
#define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) #define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
//ImageList elements //ImageList elements
#define BMP_HIDE 1 #define BMP_HIDE 1
......
...@@ -53,17 +53,13 @@ QueryBox QB_CONNECT ...@@ -53,17 +53,13 @@ QueryBox QB_CONNECT
DefButton = WB_DEF_NO ; DefButton = WB_DEF_NO ;
Message [ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ; 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 ; Text [ en-US ] = "The password entered is invalid." ;
DEFBUTTON = WB_DEF_OK ;
Message [ en-US ] = "The password entered is invalid." ;
}; };
InfoBox REG_WRONG_PASSWD_REPEAT String STR_WRONG_PASSWD_REPEAT
{ {
BUTTONS = WB_OK ; Text [ en-US ] = "The password has not been set." ;
DEFBUTTON = WB_DEF_OK ;
Message [ en-US ] = "The password has not been set." ;
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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