diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-21 14:20:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-21 15:02:27 +0100 |
| commit | 650bdfb2df1c0cb908b48d7f8419cafbc06447aa (patch) | |
| tree | 4ed231fd5324e3895851c75f68ff264fc76d720c /dbaccess/source | |
| parent | 718648db591b3d04b24e9437b6139b1490aad870 (diff) | |
QueryBox QUERY_USERADMIN_DELETE_USER -> MessageDialog + string
Change-Id: Iedccb1ace9f74d92f09cc6ca23f9aaf004fa05f2
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/dlg/UserAdmin.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/UserAdmin.src | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 83be777dc830..d6dc4f2bae98 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -37,7 +37,6 @@ #include "dbadmin.hxx" #include "moduledbu.hxx" #include <vcl/layout.hxx> -#include <vcl/msgbox.hxx> #include <sfx2/passwd.hxx> using namespace ::com::sun::star::container; @@ -239,7 +238,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) Reference<XDrop> xDrop(m_xUsers,UNO_QUERY); if(xDrop.is()) { - QueryBox aQry(this, ModuleRes(QUERY_USERADMIN_DELETE_USER)); + MessageDialog aQry(this, ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if(aQry.Execute() == RET_YES) xDrop->dropByName(GetUser()); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index d9216faf031c..a5a3695b053c 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -20,10 +20,9 @@ #include "dbu_dlg.hrc" #include "dbaccess_helpid.hrc" -QueryBox QUERY_USERADMIN_DELETE_USER +String STR_QUERY_USERADMIN_DELETE_USER { - Buttons = WB_YES_NO ; - Message [ en-US ] = "Do you really want to delete the user?"; + Text[ en-US ] = "Do you really want to delete the user?"; }; String STR_USERADMIN_NOT_AVAILABLE diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 26817dee8a48..62fc267772c3 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -62,7 +62,7 @@ #define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414 - 433 #define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 63 // 434 - 493 +#define RID_STR_GEN_END RID_STR_GEN_START + 64 // 434 - 493 #define RID_STR_APP_START RID_STR_GEN_END #define RID_STR_APP_END RID_STR_APP_START + 40 // 494 - 533 @@ -105,7 +105,6 @@ #define QUERY_SAVE_CURRENT_INDEX RID_QUERYBOX_START + 7 #define QUERY_SAVE_TABLE_EDIT_INDEXES RID_QUERYBOX_START + 8 #define RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 -#define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 #define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 // images @@ -223,6 +222,7 @@ #define STR_QUERY_CLOSEDOCUMENTS RID_STR_GEN_START + 60 #define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61 #define STR_QUERY_CONNECTION_LOST RID_STR_GEN_START + 62 +#define STR_QUERY_USERADMIN_DELETE_USER RID_STR_GEN_START + 63 // untyped resources |