diff options
| author | Ocke Janssen <oj@openoffice.org> | 2002-03-18 13:30:17 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2002-03-18 13:30:17 +0000 |
| commit | 55093e2007be63951c7d04b40ac54bcc823ea018 (patch) | |
| tree | f3a0793af7dc003792c2b552fe49f9372c11faac /dbaccess/source/ui/dlg/queryfilter.cxx | |
| parent | #97987# append index columns only when not null (diff) | |
| download | core-55093e2007be63951c7d04b40ac54bcc823ea018.tar.gz core-55093e2007be63951c7d04b40ac54bcc823ea018.zip | |
#97926# check if typeinfo is null
Diffstat (limited to 'dbaccess/source/ui/dlg/queryfilter.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/queryfilter.cxx | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 589ef6aa83b5..fe5d58cff8ad 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.15 $ + * $Revision: 1.16 $ * - * last change: $Author: fs $ $Date: 2001-08-17 09:22:22 $ + * last change: $Author: oj $ $Date: 2002-03-18 14:29:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -756,20 +756,21 @@ void DlgFilterCrit::correctCondition(const ::rtl::OUString& _rColumnName,String& Reference< XRow> xRow(xRs,UNO_QUERY); // Information for a single SQL type // Loop on the result set - while (xRs->next()) - { - if(nType == xRow->getShort(2)) + if ( xRs.is() ) + while ( xRs->next() ) { - String sPreSuffix = xRow->getString(4); - if(!xRow->wasNull() && _rCondition.Search(sPreSuffix) == 0) // found prefix so remove it - _rCondition.Erase(0,sPreSuffix.Len()); - sPreSuffix = xRow->getString(5); - if(!xRow->wasNull() && _rCondition.SearchCharBackward(sPreSuffix.GetBuffer()) == (_rCondition.Len()-sPreSuffix.Len())) // found suffix so remove it - _rCondition.Erase(_rCondition.Len()-1,1); - - break; + if(nType == xRow->getShort(2)) + { + String sPreSuffix = xRow->getString(4); + if(!xRow->wasNull() && _rCondition.Search(sPreSuffix) == 0) // found prefix so remove it + _rCondition.Erase(0,sPreSuffix.Len()); + sPreSuffix = xRow->getString(5); + if(!xRow->wasNull() && _rCondition.SearchCharBackward(sPreSuffix.GetBuffer()) == (_rCondition.Len()-sPreSuffix.Len())) // found suffix so remove it + _rCondition.Erase(_rCondition.Len()-1,1); + + break; + } } - } } // ----------------------------------------------------------------------------- void DlgFilterCrit::addQuoting(const ::rtl::OUString& _rColumnName,String& _rCondition) const @@ -788,16 +789,17 @@ void DlgFilterCrit::addQuoting(const ::rtl::OUString& _rColumnName,String& _rCon // Information for a single SQL type String aCondition = _rCondition; // Loop on the result set - while (xRs->next()) - { - if(nType == xRow->getShort(2)) + if ( xRs.is() ) + while (xRs->next()) { - aCondition = String(xRow->getString(4)); - aCondition += _rCondition; - aCondition += String(xRow->getString(5)); - break; + if(nType == xRow->getShort(2)) + { + aCondition = String(xRow->getString(4)); + aCondition += _rCondition; + aCondition += String(xRow->getString(5)); + break; + } } - } _rCondition = aCondition; } // ----------------------------------------------------------------------------- |