Tag: cws_src680_rptchart01 User: oj Date: 2008-02-18 09:52:53+0000 Modified: dba/dbaccess/inc/genericcontroller.hxx dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: #i85225# fix for visibility of commands File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.5&r2=1.5.96.1 Delta lines: +4 -3 ------------------- --- genericcontroller.hxx 2007-08-02 14:25:13+0000 1.5 +++ genericcontroller.hxx 2008-02-18 09:52:50+0000 1.5.96.1 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.96.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:25:13 $ + * last change: $Author: oj $ $Date: 2008/02/18 09:52:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -187,6 +187,7 @@ sal_Bool bEnabled; optional< bool > bChecked; + optional< bool > bInvisible; ::com::sun::star::uno::Any aValue; optional< ::rtl::OUString > sTitle; 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.81&r2=1.81.70.1 Delta lines: +8 -3 ------------------- --- genericcontroller.cxx 2007-09-26 14:48:32+0000 1.81 +++ genericcontroller.cxx 2008-02-18 09:52:50+0000 1.81.70.1 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.81 $ + * $Revision: 1.81.70.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:48:32 $ + * last change: $Author: oj $ $Date: 2008/02/18 09:52:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ -135,6 +136,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; @@ -466,6 +468,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() ) @@ -488,6 +492,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]
