From 140d082fb12c76818b33b360cc95af8094549b9f Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Fri, 15 Aug 2014 21:52:21 +0200 Subject: ErrorBoxes from querydesign to String Change-Id: I2aa9aa5b0d730c0546e8565d03b9b7d3d051235a --- dbaccess/source/ui/inc/dbu_resource.hrc | 4 ++-- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 ++-- dbaccess/source/ui/querydesign/query.src | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index dc4a6e6f5bf5..dde8e3165114 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -100,8 +100,8 @@ // error boxes -#define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 -#define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 +#define STR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 +#define STR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 #define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 // query boxes diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 213fc3e4710d..e33f646ed704 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -759,7 +759,7 @@ namespace { // only show the messagebox the first time if (!bCritsOnAsterikWarning) - ErrorBox(_pView, ModuleRes( ERR_QRY_CRITERIA_ON_ASTERISK)).Execute(); + MessageDialog(_pView, ModuleRes( STR_QRY_CRITERIA_ON_ASTERISK)).Execute(); bCritsOnAsterikWarning = true; continue; } @@ -918,7 +918,7 @@ namespace { // only show the MessageBox the first time if (!bCritsOnAsterikWarning) - ErrorBox(_pView, ModuleRes( ERR_QRY_ORDERBY_ON_ASTERISK)).Execute(); + MessageDialog(_pView, ModuleRes( STR_QRY_ORDERBY_ON_ASTERISK)).Execute(); bCritsOnAsterikWarning = true; continue; } diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index a62ba6ec8c34..2a679117463c 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -221,9 +221,9 @@ String STR_QRY_TOO_MANY_COLUMNS Text [ en-US ] = "There are too many columns."; }; -ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK +String STR_QRY_CRITERIA_ON_ASTERISK { - Message [ en-US ] = "A condition cannot be applied to field [*]" ; + Text [ en-US ] = "A condition cannot be applied to field [*]" ; }; String STR_QRY_TOO_LONG_STATEMENT @@ -251,9 +251,9 @@ String STR_QRY_SYNTAX Text [ en-US ] = "SQL syntax error" ; }; -ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK +String STR_QRY_ORDERBY_ON_ASTERISK { - Message [ en-US ] = "[*] cannot be used as a sort criterion."; + Text [ en-US ] = "[*] cannot be used as a sort criterion."; }; String STR_QRY_TOO_MANY_TABLES -- cgit