mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba31a (1.55.8); FILE MERGED

Browse Source 
2008/07/30 12:03:27 fs 1.55.8.2: RESYNC: (1.55-1.56); FILE MERGED
2008/07/02 13:20:08 fs 1.55.8.1: #i91192#
This commit is contained in:
Vladimir Glazounov
2008-08-19 08:17:59 +00:00
parent a9cbd0f41c
commit da6b97000b
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
connectivity/source/parse/sqlnode.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: sqlnode.cxx,v $ * $RCSfile: sqlnode.cxx,v $
* $Revision: 1.56 $ * $Revision: 1.57 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -1953,19 +1953,20 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
} }
else if(bNegate && (SQL_ISRULE(pSearchCondition,test_for_null) || SQL_ISRULE(pSearchCondition,in_predicate) || else if(bNegate && (SQL_ISRULE(pSearchCondition,test_for_null) || SQL_ISRULE(pSearchCondition,in_predicate) ||
SQL_ISRULE(pSearchCondition,like_predicate) || SQL_ISRULE(pSearchCondition,between_predicate) || SQL_ISRULE(pSearchCondition,between_predicate) || SQL_ISRULE(pSearchCondition,boolean_test) ))
SQL_ISRULE(pSearchCondition,boolean_test) ))
{ {
sal_uInt32 nNotPos = 0; sal_uInt32 nNotPos = 0;
// row_value_constructor not SQL_TOKEN_IN in_predicate_value // row_value_constructor not SQL_TOKEN_IN in_predicate_value
// row_value_constructor not SQL_TOKEN_LIKE num_value_exp opt_escape
// row_value_constructor not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor // row_value_constructor not SQL_TOKEN_BETWEEN row_value_constructor SQL_TOKEN_AND row_value_constructor
if(SQL_ISRULE(pSearchCondition,in_predicate) || SQL_ISRULE(pSearchCondition,like_predicate) || if ( SQL_ISRULE( pSearchCondition, in_predicate )
SQL_ISRULE(pSearchCondition,between_predicate)) || SQL_ISRULE( pSearchCondition, between_predicate )
)
nNotPos = 1; nNotPos = 1;
// row_value_constructor SQL_TOKEN_IS not SQL_TOKEN_NULL // row_value_constructor SQL_TOKEN_IS not SQL_TOKEN_NULL
// boolean_primary SQL_TOKEN_IS not truth_value // boolean_primary SQL_TOKEN_IS not truth_value
else if(SQL_ISRULE(pSearchCondition,test_for_null) || SQL_ISRULE(pSearchCondition,boolean_test)) else if ( SQL_ISRULE( pSearchCondition, test_for_null )
|| SQL_ISRULE( pSearchCondition, boolean_test )
)
nNotPos = 2; nNotPos = 2;
OSQLParseNode* pNot = pSearchCondition->getChild(nNotPos); OSQLParseNode* pNot = pSearchCondition->getChild(nNotPos);
@@ -1977,6 +1978,17 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition,sal_B
pSearchCondition->replace(pNot, pNotNot); pSearchCondition->replace(pNot, pNotNot);
delete pNot; delete pNot;
} }
else if(bNegate && (SQL_ISRULE(pSearchCondition,like_predicate)))
{
OSQLParseNode* pCheckForNOT = pSearchCondition->getChild( 1 );
if ( pCheckForNOT->getNodeType() == SQL_TOKEN_NOT )
delete pSearchCondition->removeAt( 1 );
else
{
OSQLParseNode* pNot = new OSQLParseNode( ::rtl::OUString::createFromAscii( "NOT" ), SQL_NODE_KEYWORD, SQL_TOKEN_NOT );
pSearchCondition->insert( 1, pNot );
}
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition) void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition)