diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-03-02 11:46:44 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-02 11:46:44 +0000 |
commit | a171c48a217fb81ed314117fd8b090423760c2d8 (patch) | |
tree | af5227cc48096c164f90a861193a2d284d10fb45 /dbaccess/source/ui/querydesign/QueryDesignView.cxx | |
parent | 8a0d712db4a6f7525a8d036394f0dd8052881e37 (diff) |
INTEGRATION: CWS oj07 (1.61.42); FILE MERGED
2004/01/28 09:29:20 oj 1.61.42.5: RESYNC: (1.63-1.64); FILE MERGED
2003/09/15 14:08:02 oj 1.61.42.4: RESYNC: (1.62-1.63); FILE MERGED
2003/08/29 13:33:06 oj 1.61.42.3: RESYNC: (1.61-1.62); FILE MERGED
2003/08/25 11:49:53 oj 1.61.42.2: #i3561# check index of nodes
2003/08/21 13:48:06 oj 1.61.42.1: #111118# derive the tableconnection from window to fit into accessiblity tree
Diffstat (limited to 'dbaccess/source/ui/querydesign/QueryDesignView.cxx')
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index b166eeeae0c1..970183e7664c 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: QueryDesignView.cxx,v $ * - * $Revision: 1.65 $ + * $Revision: 1.66 $ * - * last change: $Author: hr $ $Date: 2004-02-04 13:55:13 $ + * last change: $Author: rt $ $Date: 2004-03-02 12:46:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -910,6 +910,7 @@ namespace else { aWhereStr += aWork; + aWhereStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); aWhereStr += aCriteria; } } @@ -1531,7 +1532,7 @@ namespace { nPos = pCondition->count()-1; - sal_uInt32 i = pCondition->count() - 2; + sal_Int32 i = static_cast<sal_Int32>(pCondition->count() - 2); switch (pCondition->getChild(i)->getNodeType()) { case SQL_NODE_EQUAL: @@ -2031,7 +2032,7 @@ namespace sal_Int32 nFunctionType = FKT_NONE; ::connectivity::OSQLParseNode* pParamRef = NULL; sal_Int32 nColumnRefPos = pColumnRef->count() - 2; - if ( nColumnRefPos >= 0 && nColumnRefPos < pColumnRef->count() ) + if ( nColumnRefPos >= 0 && static_cast<sal_uInt32>(nColumnRefPos) < pColumnRef->count() ) pParamRef = pColumnRef->getChild(nColumnRefPos); if ( SQL_ISRULE(pColumnRef,general_set_fct) |