summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-16 10:43:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-16 12:42:04 +0200
commit2f358c639238e1121685b85d9ee04b26a88ac762 (patch)
tree7b216f3279160f17314e3886c5cdb06d88124dec /dbaccess
parentb57b51bd013bc2b61ac1a8a27b7cee9058488284 (diff)
drop unused eTooManyConditions,eColumnInLikeNotFound from SqlParseError enum
Change-Id: I92fc8d768baa7ed62c85d13da01f984385bef4f9
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/dbu_qry.hrc2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/query.src5
4 files changed, 1 insertions, 14 deletions
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index ff864c0ec34c..d6360ca4442b 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -41,12 +41,10 @@ namespace dbaui
eNoConnection,
eNoSelectStatement,
eStatementTooComplex,
- eColumnInLikeNotFound,
eNoColumnInLike,
eColumnNotFound,
eNativeMode,
eTooManyTables,
- eTooManyConditions,
eTooManyColumns,
eIllegalJoinCondition,
eOk
diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc
index a628692160f1..b14c243a4031 100644
--- a/dbaccess/source/ui/inc/dbu_qry.hrc
+++ b/dbaccess/source/ui/inc/dbu_qry.hrc
@@ -60,7 +60,7 @@
#define STR_QRY_SYNTAX RID_STR_QRY_START + 38
#define STR_QRY_NATIVE RID_STR_QRY_START + 39
#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40
-#define STR_QRY_TOOMANYCOND RID_STR_QRY_START + 41
+// empty
#define STR_QUERYDESIGN RID_STR_QRY_START + 42
#define STR_VIEWDESIGN RID_STR_QRY_START + 43
#define STR_JOIN_TYPE_HINT RID_STR_QRY_START + 44
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index be8deecc436e..5c8da41ac98e 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2422,9 +2422,6 @@ namespace
case eNoSelectStatement:
nResId = STR_QRY_NOSELECT;
break;
- case eColumnInLikeNotFound:
- nResId = STR_QRY_SYNTAX;
- break;
case eNoColumnInLike:
nResId = STR_QRY_SYNTAX;
break;
@@ -2437,9 +2434,6 @@ namespace
case eTooManyTables:
nResId = STR_QRY_TOO_MANY_TABLES;
break;
- case eTooManyConditions:
- nResId = STR_QRY_TOOMANYCOND;
- break;
case eTooManyColumns:
nResId = STR_QRY_TOO_MANY_COLUMNS;
break;
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index eaaa29dbe17a..560afdf8735d 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -243,11 +243,6 @@ String STR_QRY_NOSELECT
Text [ en-US ] = "Nothing has been selected." ;
};
-String STR_QRY_TOOMANYCOND
-{
- Text [ en-US ] = "Too many search criteria" ;
-};
-
String STR_QRY_SYNTAX
{
Text [ en-US ] = "SQL syntax error" ;