Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:18:43 Modified: dba/dbaccess/inc/genericcontroller.hxx
Log: cwsresync changes File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +7 -18 -------------------- --- genericcontroller.hxx 25 Apr 2006 13:06:21 -0000 1.1.2.2 +++ genericcontroller.hxx 4 Jul 2006 07:18:40 -0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2006/04/25 13:06:21 $ + * last change: $Author: oj $ $Date: 2006/07/04 07:18:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -201,7 +201,7 @@ private: SupportedFeatures m_aSupportedFeatures; // look at the name -#if OSL_DEBUG_LEVEL >= 2 +#ifdef DBG_UTIL bool m_bDescribingSupportedFeatures; #endif @@ -239,11 +239,9 @@ ODataView* m_pView; // our (VCL) "main window" sal_Bool m_bPreview; sal_Bool m_bReadOnly; - sal_Int32 m_nInInvalidate; sal_Bool m_bFrameUiActive : 1; // updated in ::frameAction sal_Bool m_bCurrentlyModified : 1; - sal_Bool m_bCurrentlyInConnect : 1; @@ -384,22 +382,13 @@ // if xListener is NULL the change will be forwarded to all listeners to the given ::com::sun::star::util::URL // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state -#if defined(_MSC_VER) && (_MSC_VER >= 1310 ) - static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > m_subst; - virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = m_subst, sal_Bool _bForceBroadcast = sal_False); -#else - virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > (), sal_Bool _bForceBroadcast = sal_False); -#endif + virtual void InvalidateFeature(const ::rtl::OUString& rURLPath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListen +er > & xListener = NULL, sal_Bool _bForceBroadcast = sal_False); // if there is an ::com::sun::star::util::URL translation for the id ('handle') the preceding InvalidateFeature is used. // if there is a toolbar slot with the given id it is updated (the new state is determined via GetState) // if _bForceBroadcast is sal_True, the current feature state is broadcasted no matter if it is the same as the cached state -#if defined(_MSC_VER) && (_MSC_VER >= 1310 ) - typedef ::com::sun::star::frame::XStatusListener xstlist_type; - typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; - virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = xlistener_type(), sal_Bool _bForceBroadcast = sal_False); -#else - virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > (), sal_Bool _bForceBroadcast = sal_False); -#endif //_MSC_VER >= 1310 + virtual void InvalidateFeature(sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xListener += NULL, sal_Bool _bForceBroadcast = sal_False); /** InvalidateAll invalidates all features currently known */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
