Tag: cws_src680_qiq User: fs Date: 06/06/19 02:27:55 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx /dba/dbaccess/source/ui/browser/ brwctrlr.cxx, genericcontroller.cxx, makefile.mk, unodatbr.cxx /dba/dbaccess/source/ui/inc/ genericcontroller.hxx /dba/dbaccess/source/ui/misc/ singledoccontroller.cxx /dba/dbaccess/source/ui/querydesign/ querycontroller.cxx /dba/dbaccess/source/ui/relationdesign/ RelationController.cxx /dba/dbaccess/source/ui/tabledesign/ TableController.cxx
Log: during #i51143#: A FeatureState can now transport more than one state. In particular, it has typed bChecked and sTitle members, instead of the previous unchecked aState File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.29.12.3&r2=1.29.12.4 Delta lines: +15 -15 --------------------- --- AppController.cxx 24 May 2006 06:49:21 -0000 1.29.12.3 +++ AppController.cxx 19 Jun 2006 09:27:49 -0000 1.29.12.4 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.29.12.3 $ + * $Revision: 1.29.12.4 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:21 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -647,11 +647,11 @@ break; case ID_BROWSER_SORTUP: aReturn.bEnabled = getContainer()->isFilled() && getContainer()->getElementCount(); - aReturn.aState <<= (aReturn.bEnabled && getContainer()->isSortUp()); + aReturn.bChecked = aReturn.bEnabled && getContainer()->isSortUp(); break; case ID_BROWSER_SORTDOWN: aReturn.bEnabled = getContainer()->isFilled() && getContainer()->getElementCount(); - aReturn.aState <<= (aReturn.bEnabled && !getContainer()->isSortUp()); + aReturn.bChecked = aReturn.bEnabled && !getContainer()->isSortUp(); break; case SID_NEWDOC: @@ -661,19 +661,19 @@ break; case SID_DB_APP_VIEW_TABLES: aReturn.bEnabled = sal_True; - aReturn.aState <<= getContainer()->getElementType() == E_TABLE; + aReturn.bChecked = getContainer()->getElementType() == E_TABLE; break; case SID_DB_APP_VIEW_QUERIES: aReturn.bEnabled = sal_True; - aReturn.aState <<= getContainer()->getElementType() == E_QUERY; + aReturn.bChecked = getContainer()->getElementType() == E_QUERY; break; case SID_DB_APP_VIEW_FORMS: aReturn.bEnabled = sal_True; - aReturn.aState <<= getContainer()->getElementType() == E_FORM; + aReturn.bChecked = getContainer()->getElementType() == E_FORM; break; case SID_DB_APP_VIEW_REPORTS: aReturn.bEnabled = sal_True; - aReturn.aState <<= getContainer()->getElementType() == E_REPORT; + aReturn.bChecked = getContainer()->getElementType() == E_REPORT; break; case ID_NEW_QUERY_DESIGN: case ID_NEW_QUERY_SQL: @@ -808,18 +808,18 @@ break; case SID_DB_APP_DISABLE_PREVIEW: aReturn.bEnabled = !isDataSourceReadOnly(); - aReturn.aState <<= getContainer()->getPreviewMode() == E_PREVIEWNONE; + aReturn.bChecked = getContainer()->getPreviewMode() == E_PREVIEWNONE; break; case SID_DB_APP_VIEW_DOCINFO_PREVIEW: { ElementType eType = getContainer()->getElementType(); aReturn.bEnabled = !isDataSourceReadOnly() && (E_REPORT == eType || E_FORM == eType); - aReturn.aState <<= getContainer()->getPreviewMode() == E_DOCUMENTINFO; + aReturn.bChecked = getContainer()->getPreviewMode() == E_DOCUMENTINFO; } break; case SID_DB_APP_VIEW_DOC_PREVIEW: aReturn.bEnabled = !isDataSourceReadOnly(); - aReturn.aState <<= getContainer()->getPreviewMode() == E_DOCUMENT; + aReturn.bChecked = getContainer()->getPreviewMode() == E_DOCUMENT; break; case ID_BROWSER_UNDO: aReturn.bEnabled = sal_False; @@ -842,7 +842,7 @@ { DATASOURCE_TYPE eType = m_aTypeCollection.getType(::comphelper::getString(m_xDataSource->getPropertyValue(PROPERTY_URL))); ::rtl::OUString sDSTypeName = m_aTypeCollection.getTypeDisplayName(eType); - aReturn.aState <<= sDSTypeName; + aReturn.sTitle = sDSTypeName; } break; case SID_DB_APP_STATUS_DBNAME: @@ -878,12 +878,12 @@ } else sDatabaseName = m_aTypeCollection.getEmbeddedDatabaseUIName(getORB()); - aReturn.aState <<= ::rtl::OUString(sDatabaseName); + aReturn.sTitle = sDatabaseName; } break; case SID_DB_APP_STATUS_USERNAME: if ( aReturn.bEnabled = m_xDataSource.is() ) - aReturn.aState = m_xDataSource->getPropertyValue(PROPERTY_USER); + m_xDataSource->getPropertyValue( PROPERTY_USER ) >>= aReturn.sTitle; break; case SID_DB_APP_STATUS_HOSTNAME: if ( aReturn.bEnabled = m_xDataSource.is() ) @@ -900,7 +900,7 @@ ,sDatabaseName ,sHostName ,nPortNumber); - aReturn.aState <<= ::rtl::OUString(sHostName); + aReturn.sTitle = sHostName; } } break; Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: brwctrlr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/brwctrlr.cxx?r1=1.91.16.1&r2=1.91.16.2 Delta lines: +6 -6 ------------------- --- brwctrlr.cxx 11 May 2006 10:38:04 -0000 1.91.16.1 +++ brwctrlr.cxx 19 Jun 2006 09:27:50 -0000 1.91.16.2 @@ -4,9 +4,9 @@ * * $RCSfile: brwctrlr.cxx,v $ * - * $Revision: 1.91.16.1 $ + * $Revision: 1.91.16.2 $ * - * last change: $Author: fs $ $Date: 2006/05/11 10:38:04 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1543,7 +1543,7 @@ else aReturn.bEnabled = sal_True; - aReturn.aState <<= ::rtl::OUString((ID_BROWSER_UNDORECORD == nId) ? m_sStateUndoRecord : m_sStateSaveRecord); + aReturn.sTitle = (ID_BROWSER_UNDORECORD == nId) ? m_sStateUndoRecord : m_sStateSaveRecord; } break; case ID_BROWSER_EDITDOC: @@ -1566,7 +1566,7 @@ aReturn.bEnabled = sal_True; sal_Int16 nGridMode = getBrowserView()->getVclControl()->GetOptions(); - aReturn.aState = ::comphelper::makeBoolAny(nGridMode > DbGridControl::OPT_READONLY); + aReturn.bChecked = nGridMode > DbGridControl::OPT_READONLY; } break; case ID_BROWSER_FILTERED: @@ -1577,12 +1577,12 @@ ::rtl::OUString aHaving = ::comphelper::getString(xActiveSet->getPropertyValue(PROPERTY_HAVING_CLAUSE)); if ( aFilter.getLength() || aHaving.getLength() ) { - aReturn.aState = xActiveSet->getPropertyValue(PROPERTY_APPLYFILTER); + xActiveSet->getPropertyValue( PROPERTY_APPLYFILTER ) >>= aReturn.bChecked; aReturn.bEnabled = sal_True; } else { - aReturn.aState = ::comphelper::makeBoolAny(sal_False); + aReturn.bChecked = sal_False; aReturn.bEnabled = sal_False; } } File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.68.10.1&r2=1.68.10.2 Delta lines: +57 -44 --------------------- --- genericcontroller.cxx 12 May 2006 13:47:00 -0000 1.68.10.1 +++ genericcontroller.cxx 19 Jun 2006 09:27:50 -0000 1.68.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.68.10.1 $ + * $Revision: 1.68.10.2 $ * - * last change: $Author: fs $ $Date: 2006/05/12 13:47:00 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -429,6 +429,36 @@ }; // ----------------------------------------------------------------------- +namespace +{ + typedef ::std::vector< Any > States; + + // ................................................................... + void lcl_notifyMultipleStates( XStatusListener& _rListener, FeatureStateEvent& _rEvent, const States& _rStates ) + { + for ( States::const_iterator state = _rStates.begin(); + state != _rStates.end(); + ++state + ) + { + _rEvent.State = *state; + _rListener.statusChanged( _rEvent ); + } + } + + // ................................................................... + void lcl_collectStates( const FeatureState& _rFeatureState, States& _out_rStates ) + { + if ( !!_rFeatureState.bChecked ) + _out_rStates.push_back( makeAny( (sal_Bool)*_rFeatureState.bChecked ) ); + if ( !!_rFeatureState.sTitle ) + _out_rStates.push_back( makeAny( *_rFeatureState.sTitle ) ); + if ( _out_rStates.empty() ) + _out_rStates.push_back( Any() ); + } +} + +// ----------------------------------------------------------------------- void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rFeature, const Reference< XStatusListener > & xListener, sal_Bool _bIgnoreCache) { sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId; @@ -436,42 +466,19 @@ FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary - if(!_bIgnoreCache) + if ( !_bIgnoreCache ) { // check if we really need to notify the listeners : this method may be called much more often than needed, so check // the cached state of the feature - sal_Bool bAlreadyCached = (m_aStateCache.find(nFeat) != m_aStateCache.end()); - if (bAlreadyCached && (rCachedState.bEnabled == aFeatState.bEnabled)) + sal_Bool bAlreadyCached = ( m_aStateCache.find(nFeat) != m_aStateCache.end() ); + if ( bAlreadyCached && ( rCachedState.bEnabled == aFeatState.bEnabled ) ) { // the enabled flag hasn't changed, maybe the state ? - if (rCachedState.aState.getValueTypeClass() == aFeatState.aState.getValueTypeClass()) - { // at least the type of the state hasn't - sal_Bool bEqualValue = sal_False; - switch (rCachedState.aState.getValueTypeClass()) - { - case TypeClass_VOID: - bEqualValue = !aFeatState.aState.hasValue(); - break; - case TypeClass_BOOLEAN: - bEqualValue = ::comphelper::getBOOL(rCachedState.aState) == ::comphelper::getBOOL(aFeatState.aState); - break; - case TypeClass_SHORT: - bEqualValue = ::comphelper::getINT16(rCachedState.aState) == ::comphelper::getINT16(aFeatState.aState); - break; - case TypeClass_LONG: - bEqualValue = ::comphelper::getINT32(rCachedState.aState) == ::comphelper::getINT32(aFeatState.aState); - break; - case TypeClass_STRING: - bEqualValue = ::comphelper::getString(rCachedState.aState).equals(::comphelper::getString(aFeatState.aState)); - break; - default: - DBG_ERROR("OGenericUnoController::ImplBroadcastFeatureState : unknown state type (not implemented yet) !"); - break; - } - if (bEqualValue) + if ( ( rCachedState.bChecked != aFeatState.bChecked ) + || ( rCachedState.sTitle != aFeatState.sTitle ) + ) return; } } - } rCachedState = aFeatState; FeatureStateEvent aEvent; @@ -480,12 +487,14 @@ m_xUrlTransformer->parseStrict(aEvent.FeatureURL); aEvent.Source = (XDispatch*)this; aEvent.IsEnabled = aFeatState.bEnabled; - aEvent.Requery = aFeatState.bRequery; - aEvent.State = aFeatState.aState; + + // collect all states to be notified + States aStates; + lcl_collectStates( aFeatState, aStates ); // a special listener ? - if (xListener.is()) - xListener->statusChanged(aEvent); + if ( xListener.is() ) + lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates ); else { // no -> iterate through all listeners responsible for the URL StringBag aFeatureCommands; @@ -508,10 +517,8 @@ DispatchTarget& rCurrent = *iterSearch; if ( aFeatureCommands.find( rCurrent.aURL.Complete ) != aFeatureCommands.end() ) { - aEvent.FeatureURL.Complete = rCurrent.aURL.Complete; - if (m_xUrlTransformer.is()) - m_xUrlTransformer->parseStrict(aEvent.FeatureURL); - rCurrent.xListener->statusChanged(aEvent); + aEvent.FeatureURL = rCurrent.aURL; + lcl_notifyMultipleStates( *rCurrent.xListener.get(), aEvent, aStates ); } ++iterSearch; } @@ -729,10 +736,16 @@ // ----------------------------------------------------------------------- void OGenericUnoController::addStatusListener(const Reference< XStatusListener > & aListener, const URL& _rURL) throw(RuntimeException) { + // parse the ULR now and here, this saves later parsing in each notification round + URL aParsedURL( _rURL ); + if ( m_xUrlTransformer.is() ) + m_xUrlTransformer->parseStrict( aParsedURL ); + // remeber the listener together with the URL - m_arrStatusListener.insert(m_arrStatusListener.end(), DispatchTarget(_rURL, aListener)); + m_arrStatusListener.insert( m_arrStatusListener.end(), DispatchTarget( aParsedURL, aListener ) ); + // initially broadcast the state - ImplBroadcastFeatureState(_rURL.Complete, aListener, sal_True); + ImplBroadcastFeatureState( aParsedURL.Complete, aListener, sal_True ); // force the new state to be broadcasted to the new listener } File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/makefile.mk?r1=1.16&r2=1.16.124.1 Delta lines: +4 -4 ------------------- --- makefile.mk 8 Sep 2005 14:29:57 -0000 1.16 +++ makefile.mk 19 Jun 2006 09:27:51 -0000 1.16.124.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.16.124.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 14:29:57 $ +# last change: $Author: fs $ $Date: 2006/06/19 09:27:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -44,9 +44,9 @@ # --- Files -------------------------------------------------------- EXCEPTIONSFILES=\ + $(SLO)$/genericcontroller.obj \ $(SLO)$/dsbrowserDnD.obj \ $(SLO)$/dataview.obj \ - $(SLO)$/genericcontroller.obj \ $(SLO)$/dbexchange.obj \ $(SLO)$/dbloader.obj \ $(SLO)$/sbagrid.obj \ File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.174.10.2&r2=1.174.10.3 Delta lines: +4 -4 ------------------- --- unodatbr.cxx 24 May 2006 06:49:23 -0000 1.174.10.2 +++ unodatbr.cxx 19 Jun 2006 09:27:51 -0000 1.174.10.3 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.174.10.2 $ + * $Revision: 1.174.10.3 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:23 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1668,7 +1668,7 @@ case ID_BROWSER_EXPLORER: { // this slot is available even if no form is loaded aReturn.bEnabled = m_bEnableBrowser; - aReturn.aState = ::cppu::bool2any(haveExplorer()); + aReturn.bChecked = haveExplorer(); return aReturn; } case ID_BROWSER_REMOVEFILTER: @@ -1766,7 +1766,7 @@ String sObject(aName.getStr()); sTitle.SearchAndReplace('#',sObject); - aReturn.aState <<= ::rtl::OUString(sTitle); + aReturn.sTitle = sTitle; aReturn.bEnabled = sal_True; } break; Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/genericcontroller.hxx?r1=1.36.18.2&r2=1.36.18.3 Delta lines: +49 -6 -------------------- --- genericcontroller.hxx 24 May 2006 06:49:25 -0000 1.36.18.2 +++ genericcontroller.hxx 19 Jun 2006 09:27:51 -0000 1.36.18.3 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.36.18.2 $ + * $Revision: 1.36.18.3 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:25 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -108,6 +108,8 @@ #include <comphelper/namedvaluecollection.hxx> #endif +#include <boost/optional.hpp> + class Window; class VCLXWindow; namespace dbaui @@ -129,16 +131,57 @@ > OGenericUnoController_CTRBASE; // ==================================================================== + // = optional + // ==================================================================== + /** convenience wrapper around boost::optional, allowing type assignments + */ + template < typename T > + class optional : public ::boost::optional< T > + { + typedef ::boost::optional< T > base_type; + + public: + optional ( ) : base_type( ) { } + explicit optional ( T const& val ) : base_type( val ) { } + optional ( optional const& rhs ) : base_type( rhs ) { } + + public: + optional& operator= ( T const& rhs ) + { + base_type::reset( rhs ); + return *this; + } + }; + + template< typename T > + inline bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & _any, optional< T >& _value ) + { + _value.reset(); // de-init the optional value + + T directValue; + if ( _any >>= directValue ) + _value.reset( directValue ); + + return !!_value; + } + + // ==================================================================== // = FeatureState // ==================================================================== - /// a smaller version of the FeatureEvent to be broadcasted by an ::com::sun::star::frame::XController + /** describes the state of a feature + + In opposite to the FeatureStateEvent in css.frame, this one allows for multiple states to be specified at once. + With this, you can for instance specify that a toolbox item is checked, and has a certain title, at the same + time. + */ struct FeatureState { - ::com::sun::star::uno::Any aState; sal_Bool bEnabled; - sal_Bool bRequery; - FeatureState() : bEnabled(sal_False), bRequery(sal_False) { } + optional< bool > bChecked; + optional< ::rtl::OUString > sTitle; + + FeatureState() : bEnabled(sal_False) { } }; // ==================================================================== Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: singledoccontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/singledoccontroller.cxx?r1=1.16.118.2&r2=1.16.118.3 Delta lines: +4 -4 ------------------- --- singledoccontroller.cxx 19 May 2006 10:53:05 -0000 1.16.118.2 +++ singledoccontroller.cxx 19 Jun 2006 09:27:52 -0000 1.16.118.3 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.16.118.2 $ + * $Revision: 1.16.118.3 $ * - * last change: $Author: fs $ $Date: 2006/05/19 10:53:05 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -444,7 +444,7 @@ String sUndo(ModuleRes(STR_UNDO_COLON)); sUndo += String(RTL_CONSTASCII_USTRINGPARAM(" ")); sUndo += m_aUndoManager.GetUndoActionComment(); - aReturn.aState <<= ::rtl::OUString(sUndo); + aReturn.sTitle = sUndo; } break; case ID_BROWSER_REDO: @@ -454,7 +454,7 @@ String sRedo(ModuleRes(STR_REDO_COLON)); sRedo += String(RTL_CONSTASCII_USTRINGPARAM(" ")); sRedo += m_aUndoManager.GetRedoActionComment(); - aReturn.aState <<= ::rtl::OUString(sRedo); + aReturn.sTitle = sRedo; } break; default: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: querycontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.103.4.7&r2=1.103.4.8 Delta lines: +7 -7 ------------------- --- querycontroller.cxx 24 May 2006 06:49:29 -0000 1.103.4.7 +++ querycontroller.cxx 19 Jun 2006 09:27:52 -0000 1.103.4.8 @@ -4,9 +4,9 @@ * * $RCSfile: querycontroller.cxx,v $ * - * $Revision: 1.103.4.7 $ + * $Revision: 1.103.4.8 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:29 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -464,7 +464,7 @@ break; case ID_BROWSER_ESACPEPROCESSING: - aReturn.aState = ::cppu::bool2any(!m_bEsacpeProcessing); + aReturn.bChecked = !m_bEsacpeProcessing; aReturn.bEnabled = !m_bIndependent && ( m_pSqlIterator != NULL ) && !m_bDesign; break; case SID_RELATION_ADD_RELATION: @@ -489,7 +489,7 @@ break; case ID_BROWSER_SQL: aReturn.bEnabled = m_bEsacpeProcessing && m_pSqlIterator; - aReturn.aState = ::cppu::bool2any(m_bDesign); + aReturn.bChecked = m_bDesign; break; case SID_BROWSER_CLEAR_QUERY: aReturn.bEnabled = isEditable() && (m_sStatement.getLength() || !m_vTableData.empty()); @@ -497,19 +497,19 @@ case SID_QUERY_VIEW_FUNCTIONS: case SID_QUERY_VIEW_TABLES: case SID_QUERY_VIEW_ALIASES: - aReturn.aState = ::cppu::bool2any(getContainer() && getContainer()->isSlotEnabled(_nId)); + aReturn.bChecked = getContainer() && getContainer()->isSlotEnabled(_nId); aReturn.bEnabled = m_bDesign; break; case SID_QUERY_DISTINCT_VALUES: aReturn.bEnabled = m_bDesign && isEditable(); - aReturn.aState = ::cppu::bool2any(m_bDistinct); + aReturn.bChecked = m_bDistinct; break; case ID_BROWSER_QUERY_EXECUTE: aReturn.bEnabled = sal_True; break; case SID_DB_QUERY_PREVIEW: aReturn.bEnabled = sal_True; - aReturn.aState <<= ::cppu::bool2any(getContainer() && getContainer()->getPreviewFrame().is()); + aReturn.bChecked = getContainer() && getContainer()->getPreviewFrame().is(); break; #if OSL_DEBUG_LEVEL > 1 case ID_EDIT_QUERY_SQL: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationController.cxx?r1=1.42.118.3&r2=1.42.118.4 Delta lines: +3 -3 ------------------- --- RelationController.cxx 24 May 2006 06:49:30 -0000 1.42.118.3 +++ RelationController.cxx 19 Jun 2006 09:27:52 -0000 1.42.118.4 @@ -4,9 +4,9 @@ * * $RCSfile: RelationController.cxx,v $ * - * $Revision: 1.42.118.3 $ + * $Revision: 1.42.118.4 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:30 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -237,7 +237,7 @@ { case SID_RELATION_ADD_RELATION: aReturn.bEnabled = m_vTableData.size() > 1 && isConnected() && isEditable(); - aReturn.aState = ::cppu::bool2any(sal_False); + aReturn.bChecked = false; break; case ID_BROWSER_SAVEDOC: aReturn.bEnabled = haveDataSource() && isModified(); Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.103.2.4&r2=1.103.2.5 Delta lines: +3 -3 ------------------- --- TableController.cxx 24 May 2006 06:49:31 -0000 1.103.2.4 +++ TableController.cxx 19 Jun 2006 09:27:53 -0000 1.103.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.103.2.4 $ + * $Revision: 1.103.2.5 $ * - * last change: $Author: fs $ $Date: 2006/05/24 06:49:31 $ + * last change: $Author: fs $ $Date: 2006/06/19 09:27:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -295,7 +295,7 @@ aReturn.bEnabled = sal_True; break; case ID_BROWSER_EDITDOC: - aReturn.aState = ::cppu::bool2any(isEditable()); + aReturn.bChecked = isEditable(); aReturn.bEnabled = m_bNew || isEditable();// the editable flag is set through this one -> || isAddAllowed() || isDropAllowed() || isAlterAllowed(); break; case ID_BROWSER_SAVEDOC: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
