User: hr Date: 06/06/19 20:17:16 Modified: /dba/dbaccess/source/ui/inc/ genericcontroller.hxx
Log: INTEGRATION: CWS warnings01 (1.35.48); FILE MERGED 2006/05/23 23:56:34 sb 1.35.48.2: RESYNC: (1.35-1.36); FILE MERGED 2006/03/24 15:36:18 fs 1.35.48.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: 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&r2=1.37 Delta lines: +2 -15 -------------------- --- genericcontroller.hxx 31 Mar 2006 12:15:22 -0000 1.36 +++ genericcontroller.hxx 20 Jun 2006 03:17:14 -0000 1.37 @@ -236,11 +236,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; @@ -379,22 +377,11 @@ // 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::XStatusListener > & 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]
