Tag: cws_src680_oj14 User: fs Date: 2007-06-06 09:29:59+0000 Modified: dba/reportdesign/source/ui/dlg/AddField.cxx dba/reportdesign/source/ui/inc/AddField.hxx dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i78077# also need to listen for changes in the Filter property File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: AddField.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/AddField.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +8 -3 ------------------- --- AddField.cxx 2007-06-06 08:29:56+0000 1.1.2.4 +++ AddField.cxx 2007-06-06 09:29:56+0000 1.1.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: AddField.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2007/06/06 08:29:56 $ + * last change: $Author: fs $ $Date: 2007/06/06 09:29:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -234,6 +234,7 @@ m_pChangeListener->addProperty( PROPERTY_COMMAND ); m_pChangeListener->addProperty( PROPERTY_COMMANDTYPE ); m_pChangeListener->addProperty( PROPERTY_ESCAPEPROCESSING ); + m_pChangeListener->addProperty( PROPERTY_FILTER ); } catch( const Exception& ) { @@ -321,20 +322,24 @@ ::rtl::OUString sCommand( m_aCommandName ); sal_Int32 nCommandType( m_nCommandType ); sal_Bool bEscapeProcessing( m_bEscapeProcessing ); + ::rtl::OUString sFilter( m_sFilter ); OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType ); - OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_ESCAPEPROCESSING ) >>= m_bEscapeProcessing ); + OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_ESCAPEPROCESSING ) >>= bEscapeProcessing ); + OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_FILTR ) >>= sFilter ); if ( ( sCommand == m_aCommandName ) && ( nCommandType == m_nCommandType ) && ( bEscapeProcessing == m_bEscapeProcessing ) + && ( sFilter == m_sFilter ) ) return; m_aCommandName = sCommand; m_nCommandType = nCommandType; m_bEscapeProcessing = bEscapeProcessing; + m_sFilter = sFilter; // add the columns to the list m_xColumns.clear(); Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: AddField.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/AddField.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +3 -2 ------------------- --- AddField.hxx 2007-06-05 20:17:36+0000 1.1.2.2 +++ AddField.hxx 2007-06-06 09:29:56+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: AddField.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: fs $ $Date: 2007/06/05 20:17:36 $ + * last change: $Author: fs $ $Date: 2007/06/06 09:29:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,7 @@ ::std::auto_ptr<OAddFieldWindowListBox> m_pListBox; ::rptui::OReportController& m_rController; ::rtl::OUString m_aCommandName; + ::rtl::OUString m_sFilter; sal_Int32 m_nCommandType; sal_Bool m_bEscapeProcessing; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.1.2.22&r2=1.1.2.23 Delta lines: +4 -3 ------------------- --- ReportController.cxx 2007-06-05 20:55:38+0000 1.1.2.22 +++ ReportController.cxx 2007-06-06 09:29:56+0000 1.1.2.23 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.1.2.22 $ + * $Revision: 1.1.2.23 $ * - * last change: $Author: fs $ $Date: 2007/06/05 20:55:38 $ + * last change: $Author: fs $ $Date: 2007/06/06 09:29:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2242,6 +2242,7 @@ else if ( evt.PropertyName.equals( PROPERTY_COMMAND ) || evt.PropertyName.equals( PROPERTY_COMMANDTYPE ) || evt.PropertyName.equals( PROPERTY_ESCAPEPROCESSING ) + || evt.PropertyName.equals( PROPERTY_FILTER ) ) { InvalidateFeature(SID_FM_ADD_FIELD); @@ -2995,8 +2996,8 @@ TPropertyNamePair aPropertyMediation; aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMAND, PROPERTY_COMMAND ) ); aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_COMMANDTYPE, PROPERTY_COMMANDTYPE ) ); - aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_FILTER, PROPERTY_FILTER ) ); aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_ESCAPEPROCESSING, PROPERTY_ESCAPEPROCESSING ) ); + aPropertyMediation.insert( TPropertyNamePair::value_type( PROPERTY_FILTER, PROPERTY_FILTER ) ); m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition.get(), xRowSetProp, aPropertyMediation ); m_xRowSet = xRowSet; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
