diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 13:36:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 07:52:09 +0200 |
commit | d386abfb09e4add6817cfb3fc8fcb259a2b69705 (patch) | |
tree | 03af661b1dd57d944a9a552105900fe712518d28 | |
parent | 691e19ec65ef6cbe042f101e05eafaa741c4fca4 (diff) |
remove unused enumerators from SQLNodeType
Change-Id: I0e8a3c5b63a00befa36c7edfbec0acd60bd3dc03
-rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 18 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 11 | ||||
-rw-r--r-- | include/connectivity/sqlnode.hxx | 4 |
4 files changed, 2 insertions, 34 deletions
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 6ab4a2f0eddb..d2e88a92d6a4 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -2290,12 +2290,6 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL _inout_rBuffer.append( '\n' ); break; - case SQLNodeType::Comparison: - _inout_rBuffer.appendAscii( "SQL_COMPARISON: " ); - _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( '\n' ); - break; - case SQLNodeType::Name: _inout_rBuffer.appendAscii( "SQL_NAME: " ); _inout_rBuffer.append( '"' ); @@ -2330,12 +2324,6 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL _inout_rBuffer.append( '\n' ); break; - case SQLNodeType::AMMSC: - _inout_rBuffer.appendAscii( "SQL_AMMSC: " ); - _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( '\n' ); - break; - case SQLNodeType::Equal: case SQLNodeType::Less: case SQLNodeType::Great: @@ -2352,12 +2340,6 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL _inout_rBuffer.append( '\n' ); break; - case SQLNodeType::Date: - _inout_rBuffer.appendAscii( "SQL_DATE: " ); - _inout_rBuffer.append( m_aNodeValue ); - _inout_rBuffer.append( '\n' ); - break; - case SQLNodeType::Concat: _inout_rBuffer.appendAscii( "||" ); _inout_rBuffer.append( '\n' ); diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 5c8da41ac98e..ab12b20f4e34 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -3221,11 +3221,9 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p case SQLNodeType::ApproxNum: nDataType = DataType::DOUBLE; break; - case SQLNodeType::Date: case SQLNodeType::AccessDate: nDataType = DataType::TIMESTAMP; break; - case SQLNodeType::Comparison: case SQLNodeType::Equal: case SQLNodeType::Less: case SQLNodeType::Great: @@ -3238,7 +3236,6 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p case SQLNodeType::ListRule: case SQLNodeType::CommaListRule: case SQLNodeType::Keyword: - case SQLNodeType::AMMSC: //?? case SQLNodeType::Punctuation: OSL_FAIL("Unexpected SQL Node Type"); break; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 432778abcd5d..9351116c60c3 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -173,12 +173,6 @@ namespace dbaui rString += OStringToOUString(sT, RTL_TEXTENCODING_UTF8); break;} - case SQLNodeType::Comparison: - { - rString += "SQL_COMPARISON:" + _pNode->getTokenValue(); // append Nodevalue - // and start new line - break;} - case SQLNodeType::Name: { rString += "SQL_NAME:\"" + _pNode->getTokenValue() + "\""; @@ -204,11 +198,6 @@ namespace dbaui rString += "SQL_PUNCTUATION:" + _pNode->getTokenValue(); // append Nodevalue break;} - case SQLNodeType::AMMSC: - { - rString += "SQL_AMMSC:" + _pNode->getTokenValue(); // append Nodevalue - break;} - default: OSL_FAIL("OSQLParser::ShowParseTree: unzulaessiger NodeType"); rString += _pNode->getTokenValue(); diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index f943942d2570..b7550e530109 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -66,10 +66,10 @@ namespace connectivity typedef ::std::vector< OSQLParseNode* > OSQLParseNodes; enum class SQLNodeType { Rule, ListRule, CommaListRule, - Keyword, Comparison, Name, + Keyword, Name, String, IntNum, ApproxNum, Equal, Less, Great, LessEq, GreatEq, NotEqual, - Punctuation, AMMSC, AccessDate, Date, Concat}; + Punctuation, AccessDate, Concat}; typedef ::std::set< OUString > QueryNameSet; |