diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-15 23:25:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-16 15:21:36 +0100 |
| commit | 919a50e3bce9695c0e0a40af674372e05afdade1 (patch) | |
| tree | 8049bf4bcc40ad90e488cdc5ea0a5fc5afcbf981 /connectivity | |
| parent | b50405ef3435902451cfe09e5bf7c149d17a84ac (diff) | |
_bUseRowSetFilter and _bUseRowSetOrder are always true
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index ab8f9c8b38fa..ed998185a700 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1302,8 +1302,7 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) } //------------------------------------------------------------------------------ -Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, - sal_Bool _bUseRowSetFilter, sal_Bool _bUseRowSetOrder ) +Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory ) SAL_THROW( ( SQLException ) ) { Reference< XSingleSelectQueryComposer > xComposer; @@ -1325,17 +1324,13 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing ); // append sort - if ( _bUseRowSetOrder ) - aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) ); + aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) ); // append filter - if ( _bUseRowSetFilter ) - { - sal_Bool bApplyFilter = sal_True; - _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter; - if ( bApplyFilter ) - aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) ); - } + sal_Bool bApplyFilter = sal_True; + _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter; + if ( bApplyFilter ) + aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) ); xComposer = aComposer.getComposer(); aComposer.setDisposeComposer( false ); @@ -1361,7 +1356,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( Reference< XSingleSelectQueryComposer > xReturn; try { - xReturn = getComposedRowSetStatement( _rxRowSetProps, _rxFactory, sal_True, sal_True ); + xReturn = getComposedRowSetStatement( _rxRowSetProps, _rxFactory ); } catch( const SQLException& ) { |