diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-08-21 13:27:11 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-21 14:07:55 +0100 |
commit | 2b65832b5853dfea1f970141acfeee46177e3799 (patch) | |
tree | 3393b61ec34e4669c0eab6661b6cf359c4ac9a71 /dbaccess/source | |
parent | 54758555e11e01eb2fcfe7c7df6feae215821029 (diff) |
QueryBox QUERY_BRW_DELETE_ROWS -> MessageDialog + string
Change-Id: Ifb6fb8a09cda0c868a3b4f510f6b04665cfe7597
Diffstat (limited to 'dbaccess/source')
-rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/sbabrw.src | 5 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 637821192444..328d0eef5d38 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -82,6 +82,7 @@ #include <svx/svxdlg.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> @@ -1386,7 +1387,7 @@ void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObje sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException, std::exception ) { - if (QueryBox(getBrowserView(), ModuleRes(QUERY_BRW_DELETE_ROWS)).Execute() != RET_YES) + if (MessageDialog(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() != RET_YES) return sal_False; return sal_True; diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index ba2620e0825c..ba326e0aef64 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -29,10 +29,9 @@ QueryBox QUERY_BRW_SAVEMODIFIED Message [ en-US ] = "The current record has been changed.\nDo you want to save the changes?" ; }; -QueryBox QUERY_BRW_DELETE_ROWS +String STR_QUERY_BRW_DELETE_ROWS { - Buttons = WB_YES_NO ; - Message [ en-US ] = "Do you want to delete the selected data?" ; + Text[ en-US ] = "Do you want to delete the selected data?" ; }; String RID_STR_DATABROWSER_FILTERED diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index d0d56b6e7249..3c099f0c1838 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 + 61 // 434 - 493 +#define RID_STR_GEN_END RID_STR_GEN_START + 62 // 434 - 493 #define RID_STR_APP_START RID_STR_GEN_END #define RID_STR_APP_END RID_STR_APP_START + 40 // 494 - 533 @@ -100,7 +100,6 @@ // query boxes -#define QUERY_BRW_DELETE_ROWS RID_QUERYBOX_START + 0 #define QUERY_BRW_SAVEMODIFIED RID_QUERYBOX_START + 1 #define QUERY_CONNECTION_LOST RID_QUERYBOX_START + 2 #define TABLE_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 5 @@ -223,7 +222,7 @@ #define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58 #define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59 #define STR_QUERY_CLOSEDOCUMENTS RID_STR_GEN_START + 60 - +#define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61 // untyped resources |