Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:00:51 Modified: dba/dbaccess/source/ui/dlg/queryfilter.cxx
Log: RESYNC: (1.28-1.29); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: queryfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/queryfilter.cxx?r1=1.28.8.3&r2=1.28.8.4 Delta lines: +16 -12 --------------------- --- queryfilter.cxx 25 Apr 2006 13:03:01 -0000 1.28.8.3 +++ queryfilter.cxx 4 Jul 2006 08:00:48 -0000 1.28.8.4 @@ -75,6 +75,12 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif +#ifndef _DBAUI_MODULE_DBU_HXX_ +#include "moduledbu.hxx" +#endif #ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include <connectivity/sqliterator.hxx> #endif @@ -150,10 +156,10 @@ ,aBT_HELP ( this, ResId( BT_HELP ) ) ,aSTR_NOENTRY ( ResId( STR_NOENTRY ) ) ,aSTR_COMPARE_OPERATORS( ResId( STR_COMPARE_OPERATORS ) ) + ,m_xQueryComposer(_rxComposer) ,m_xColumns( _rxCols ) ,m_xConnection( _rxConnection ) ,m_xMetaData( _rxConnection->getMetaData() ) - ,m_xQueryComposer(_rxComposer) ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) { DBG_CTOR(DlgFilterCrit,NULL); @@ -264,7 +270,7 @@ //------------------------------------------------------------------------------ sal_Int32 DlgFilterCrit::GetOSQLPredicateType(sal_uInt16 nPos,sal_uInt16 nCount) const { - sal_Int32 ePreType; + sal_Int32 ePreType( SQLFilterOperator::EQUAL ); if(nCount == 10) { @@ -460,10 +466,9 @@ } } } - catch( const Exception& e ) + catch( const Exception& ) { - e; // make compiler happy - DBG_ERROR( "DlgFilterCrit::getMatchingColumn: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } return xColumn; @@ -478,10 +483,9 @@ if ( xColumns.is() && xColumns->hasByName( _rFieldName ) ) xColumns->getByName( _rFieldName ) >>= xColumn; } - catch( const Exception& e ) + catch( const Exception& ) { - e; // make compiler happy - DBG_ERROR( "DlgFilterCrit::getMatchingColumn: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } return xColumn; @@ -817,7 +821,7 @@ //------------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( DlgFilterCrit, ListSelectCompHdl, ListBox *, pListBox ) +IMPL_LINK_INLINE_START( DlgFilterCrit, ListSelectCompHdl, ListBox *, /*pListBox*/ ) { EnableLines(); return 0; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
