diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 12:06:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 12:06:47 +0000 |
| commit | 5da704108326f14f5bbef9104436a5919831aa11 (patch) | |
| tree | 9f7e710848c98a7e248f2f15d998912e38896832 /dbaccess/source/ui/dlg/queryfilter.cxx | |
| parent | INTEGRATION: CWS dba09 (1.16.22); FILE MERGED (diff) | |
| download | core-5da704108326f14f5bbef9104436a5919831aa11.tar.gz core-5da704108326f14f5bbef9104436a5919831aa11.zip | |
INTEGRATION: CWS dba09 (1.20.48); FILE MERGED
2004/03/24 09:52:02 fs 1.20.48.2: RESYNC: (1.20-1.21); FILE MERGED
2004/03/16 14:50:21 fs 1.20.48.1: #i14491# when executing the 'sort' and 'filter' dialog, don't add extra filter for the current field
Diffstat (limited to 'dbaccess/source/ui/dlg/queryfilter.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/queryfilter.cxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 1e67804c7f6a..a3fab937416b 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.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2004-03-15 12:43:16 $ + * last change: $Author: hr $ $Date: 2004-05-10 13:06:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,8 +155,7 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, const Reference< XMultiServiceFactory >& _rxORB, const Reference< XConnection>& _rxConnection, const Reference< XSQLQueryComposer>& _rxQueryComposer, - const Reference< XNameAccess>& _rxCols, - const String& rFieldName + const Reference< XNameAccess>& _rxCols ) :ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) ) ,aLB_WHEREFIELD1 ( this, ResId( LB_WHEREFIELD1 ) ) @@ -225,16 +224,6 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent, aLB_WHEREFIELD2.SelectEntryPos(0); aLB_WHEREFIELD3.SelectEntryPos(0); - // Jetzt die Felder mit den Kriterien des SQL-Strings fuellen - - if ( rFieldName.Len() ) - { - ::rtl::OUString sFieldName( rFieldName ); - xColumn = getColumn( sFieldName ); - if ( xColumn.is() ) - m_xQueryComposer->appendFilterByColumn(xColumn); - } - // insert the criteria into the dialog Sequence<Sequence<PropertyValue > > aValues = m_xQueryComposer->getStructuredFilter(); const Sequence<PropertyValue >* pOrBegin = aValues.getConstArray(); |