diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:38:53 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:38:53 +0000 |
commit | 4d04d939dc010aad053412d414b23f9cb511d156 (patch) | |
tree | 0bc8b5ab25f97725c775c45fb68323999612a36e | |
parent | f92aa49c9c9bffb9bf9113a3605555a6aa2497b5 (diff) |
INTEGRATION: CWS dba23c (1.56.48); FILE MERGED
2007/07/23 08:45:39 fs 1.56.48.1: don't call getIntKeywordAscii with KEY_NONE
-rw-r--r-- | connectivity/source/parse/sqlbison.y | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index f247217297c9..c6b11c5f6feb 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1,7 +1,7 @@ %{ //-------------------------------------------------------------------------- // -// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.56 2007-01-25 11:57:58 obo Exp $ +// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlbison.y,v 1.57 2007-07-31 13:38:53 hr Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -9,7 +9,7 @@ // OJ // // Last change: -// $Author: obo $ $Date: 2007-01-25 11:57:58 $ $Revision: 1.56 $ +// $Author: hr $ $Date: 2007-07-31 13:38:53 $ $Revision: 1.57 $ // // Description: // @@ -3452,7 +3452,8 @@ OSQLParseNode* OSQLParser::parseTree(::rtl::OUString& rErrorMessage, case SQL_TOKEN_MIN: eKeyCode = IParseContext::KEY_MIN; break; case SQL_TOKEN_SUM: eKeyCode = IParseContext::KEY_SUM; break; } - aStr = pContext->getIntlKeywordAscii(eKeyCode); + if ( eKeyCode != IParseContext::KEY_NONE ) + aStr = pContext->getIntlKeywordAscii(eKeyCode); } if (!aStr.getLength()) |