Tag: cws_src680_qiq User: fs Date: 2006/07/04 07:34:47 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: reverted a previous change which just worked around a bug in framework - now fixed this bug (#i66983#) properly File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.68.10.5&r2=1.68.10.6 Delta lines: +4 -10 -------------------- --- genericcontroller.cxx 3 Jul 2006 14:09:34 -0000 1.68.10.5 +++ genericcontroller.cxx 4 Jul 2006 14:34:44 -0000 1.68.10.6 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.68.10.5 $ + * $Revision: 1.68.10.6 $ * - * last change: $Author: fs $ $Date: 2006/07/03 14:09:34 $ + * last change: $Author: fs $ $Date: 2006/07/04 14:34:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -452,16 +452,10 @@ // ................................................................... void lcl_collectStates( const FeatureState& _rFeatureState, States& _out_rStates ) { - if ( !!_rFeatureState.sTitle ) - _out_rStates.push_back( makeAny( *_rFeatureState.sTitle ) ); if ( !!_rFeatureState.bChecked ) _out_rStates.push_back( makeAny( (sal_Bool)*_rFeatureState.bChecked ) ); - - // order matters for the two states above: framework resets the check state of toolbox items - // as soon as a string state is broadcasted, so we send the string first. You can verify or - // falsify the presence of this bug by checking whether the ADDTABLE slot in the toolbar - // of the query/relation designer works properly, in particular whether it has the proper state - + if ( !!_rFeatureState.sTitle ) + _out_rStates.push_back( makeAny( *_rFeatureState.sTitle ) ); if ( _out_rStates.empty() ) _out_rStates.push_back( Any() ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
