diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:50:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:50:45 +0000 |
| commit | 70e6dbd43ac5db65396c64aa1127e9044da69e67 (patch) | |
| tree | 471a1f9995f3e47167dbcb84f7ab95e7221758f1 /dbaccess/source/ui/dlg/queryfilter.cxx | |
| parent | INTEGRATION: CWS insight01 (1.31.2); FILE MERGED (diff) | |
| download | core-70e6dbd43ac5db65396c64aa1127e9044da69e67.tar.gz core-70e6dbd43ac5db65396c64aa1127e9044da69e67.zip | |
INTEGRATION: CWS insight01 (1.20.10); FILE MERGED
2004/06/01 08:54:54 oj 1.20.10.3: RESYNC: (1.20-1.22); FILE MERGED
2004/05/12 12:53:38 oj 1.20.10.2: change SQLFilterOperator
2004/05/12 10:45:00 oj 1.20.10.1: ongoing work
Diffstat (limited to 'dbaccess/source/ui/dlg/queryfilter.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/queryfilter.cxx | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index a3fab937416b..8714c3d6a219 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: queryfilter.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: hr $ $Date: 2004-05-10 13:06:47 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:50:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,6 +122,9 @@ #ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #endif +#ifndef _COM_SUN_STAR_SDB_SQLFILTEROPERATOR_HPP_ +#include <com/sun/star/sdb/SQLFilterOperator.hpp> +#endif using namespace dbaui; using namespace connectivity; @@ -452,35 +455,35 @@ void DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co sal_Bool bNeedText = sal_True; switch(GetOSQLPredicateType(_rComp.GetSelectEntryPos(),_rComp.GetEntryCount())) { - case SQL_PRED_EQUAL: + case SQLFilterOperator::EQUAL: aFilter += ::rtl::OUString::createFromAscii("="); break; - case SQL_PRED_NOTEQUAL: + case SQLFilterOperator::NOT_EQUAL: aFilter += ::rtl::OUString::createFromAscii("<>"); break; - case SQL_PRED_LESS: + case SQLFilterOperator::LESS: aFilter += ::rtl::OUString::createFromAscii("<"); break; - case SQL_PRED_LESSOREQUAL: + case SQLFilterOperator::LESS_EQUAL: aFilter += ::rtl::OUString::createFromAscii("<="); break; - case SQL_PRED_GREATER: + case SQLFilterOperator::GREATER: aFilter += ::rtl::OUString::createFromAscii(">"); break; - case SQL_PRED_GREATEROREQUAL: + case SQLFilterOperator::GREATER_EQUAL: aFilter += ::rtl::OUString::createFromAscii(">="); break; - case SQL_PRED_NOTLIKE: + case SQLFilterOperator::NOT_LIKE: aFilter += ::rtl::OUString::createFromAscii("NOT LIKE"); break; - case SQL_PRED_LIKE: + case SQLFilterOperator::LIKE: aFilter += ::rtl::OUString::createFromAscii("LIKE"); break; - case SQL_PRED_ISNULL: + case SQLFilterOperator::SQLNULL: aFilter += ::rtl::OUString::createFromAscii("IS NULL"); bNeedText = sal_False; break; - case SQL_PRED_ISNOTNULL: + case SQLFilterOperator::NOT_SQLNULL: aFilter += ::rtl::OUString::createFromAscii("IS NOT NULL"); bNeedText = sal_False; break; @@ -763,7 +766,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo ListSelectHdl( pColumnListControl ); // select the appropriate condition - pPredicateListControl->SelectEntryPos( GetSelectionPos( _rItem.Handle, *pPredicateListControl ) ); + pPredicateListControl->SelectEntryPos( GetSelectionPos( (sal_Int32)_rItem.Handle, *pPredicateListControl ) ); // initially normalize this value ::rtl::OUString aString( aStr ); |