User: kz Date: 2008-03-05 17:08:11+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.81.70); FILE MERGED 2008/02/18 09:52:50 oj 1.81.70.1: #i85225# fix for visibility of commands 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.82&r2=1.83 Delta lines: +5 -0 ------------------- --- genericcontroller.cxx 2008-03-05 16:52:59+0000 1.82 +++ genericcontroller.cxx 2008-03-05 17:08:08+0000 1.83 @@ -120,6 +120,7 @@ #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> #endif +#include <com/sun/star/frame/status/Visibility.hpp> #ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_ #include <com/sun/star/util/XModifiable.hpp> #endif @@ -136,6 +137,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::frame::status; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -467,6 +469,8 @@ _out_rStates.push_back( makeAny( *_rFeatureState.sTitle ) ); if ( !!_rFeatureState.bChecked ) _out_rStates.push_back( makeAny( (sal_Bool)*_rFeatureState.bChecked ) ); + if ( !!_rFeatureState.bInvisible ) + _out_rStates.push_back( makeAny( Visibility( !*_rFeatureState.bInvisible ) ) ); if ( _rFeatureState.aValue.hasValue() ) _out_rStates.push_back( _rFeatureState.aValue ); if ( _out_rStates.empty() ) @@ -489,6 +493,7 @@ if ( bAlreadyCached ) if ( ( rCachedState.bEnabled == aFeatState.bEnabled ) && ( rCachedState.bChecked == aFeatState.bChecked ) + && ( rCachedState.bInvisible == aFeatState.bInvisible ) && ( rCachedState.sTitle == aFeatState.sTitle ) ) return; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
