summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/queryorder.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 12:06:59 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 12:06:59 +0000
commitcfae597a9bdb6aa57cbb9dfdb0abd52a458e9fec (patch)
tree32a598ed0df5e3c94d64b49f70e92ba4aaa5c877 /dbaccess/source/ui/dlg/queryorder.cxx
parent5da704108326f14f5bbef9104436a5919831aa11 (diff)
INTEGRATION: CWS dba09 (1.10.218); FILE MERGED
2004/03/24 09:51:44 fs 1.10.218.2: RESYNC: (1.10-1.11); FILE MERGED 2004/03/16 14:50:21 fs 1.10.218.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/queryorder.cxx')
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index c5c7c6949f25..043cefdfd71a 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: queryorder.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: obo $ $Date: 2004-03-19 12:11:29 $
+ * last change: $Author: hr $ $Date: 2004-05-10 13:06:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -111,8 +111,7 @@ DBG_NAME(DlgOrderCrit);
DlgOrderCrit::DlgOrderCrit( Window * pParent,
const Reference< XConnection>& _rxConnection,
const Reference< XSQLQueryComposer>& _rxQueryComposer,
- const Reference< XNameAccess>& _rxCols,
- const Reference< XPropertySet >& _xColumn)
+ const Reference< XNameAccess>& _rxCols)
:ModalDialog( pParent, ModuleRes(DLG_ORDERCRIT) )
,aLB_ORDERFIELD1( this, ResId( LB_ORDERFIELD1 ) )
,aLB_ORDERVALUE1( this, ResId( LB_ORDERVALUE1 ) )
@@ -184,9 +183,6 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent,
m_sOrgOrder = m_xQueryComposer->getOrder();
- if ( _xColumn.is() )
- m_xQueryComposer->appendOrderByColumn(_xColumn,sal_True);
-
SetOrderList( m_xQueryComposer->getOrder() );
EnableLines();