Tag: cws_src680_odbmacros2 User: fs Date: 2008-02-06 08:31:01+0000 Modified: dba/dbaccess/source/ui/inc/brwctrlr.hxx
Log: copying the fix for #i85879# into this CWS: cleanup the toolbar mess in the data source browser File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: brwctrlr.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/brwctrlr.hxx?r1=1.38.98.2&r2=1.38.98.3 Delta lines: +17 -53 --------------------- --- brwctrlr.hxx 2007-12-18 21:21:43+0000 1.38.98.2 +++ brwctrlr.hxx 2008-02-06 08:30:58+0000 1.38.98.3 @@ -4,9 +4,9 @@ * * $RCSfile: brwctrlr.hxx,v $ * - * $Revision: 1.38.98.2 $ + * $Revision: 1.38.98.3 $ * - * last change: $Author: fs $ $Date: 2007/12/18 21:21:43 $ + * last change: $Author: fs $ $Date: 2008/02/06 08:30:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,75 +36,35 @@ #ifndef _SBA_BWRCTRLR_HXX #define _SBA_BWRCTRLR_HXX -#ifndef DBAUI_GENERICCONTROLLER_HXX #include "genericcontroller.hxx" -#endif -#ifndef _SBX_BRWVIEW_HXX +#include "moduledbu.hxx" #include "brwview.hxx" -#endif -#ifndef _SBA_GRID_HXX #include "sbagrid.hxx" -#endif -#ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_ + +/** === begin UNO includes === **/ #include <com/sun/star/form/XLoadable.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include <com/sun/star/container/XContainerListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XSQLERRORLISTENER_HPP_ #include <com/sun/star/sdb/XSQLErrorListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include <com/sun/star/sdbc/XRowSet.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XRESETLISTENER_HPP_ #include <com/sun/star/form/XResetListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XDATABASEPARAMETERLISTENER_HPP_ #include <com/sun/star/form/XDatabaseParameterListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XCONFIRMDELETELISTENER_HPP_ #include <com/sun/star/form/XConfirmDeleteListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XFORMCOMPONENT_HPP_ #include <com/sun/star/form/XFormComponent.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XFOCUSLISTENER_HPP_ #include <com/sun/star/awt/XFocusListener.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#endif -#ifndef _SV_TIMER_HXX +#include <com/sun/star/frame/XModule.hpp> +/** === end UNO includes === **/ + #include <vcl/timer.hxx> -#endif -#ifndef _TRANSFER_HXX #include <svtools/transfer.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _VOS_THREAD_HXX_ #include <vos/thread.hxx> -#endif -#ifndef _SFXCANCEL_HXX #include <svtools/cancel.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE8_HXX_ -#include <cppuhelper/implbase8.hxx> -#endif -#ifndef _CLIPLISTENER_HXX +#include <cppuhelper/implbase9.hxx> #include <svtools/cliplistener.hxx> -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif + class ResMgr; struct FmFoundRecordInformation; struct FmSearchContext; @@ -114,7 +74,7 @@ // ========================================================================= - typedef ::cppu::ImplInheritanceHelper8 < OGenericUnoController + typedef ::cppu::ImplInheritanceHelper9 < OGenericUnoController , ::com::sun::star::sdb::XSQLErrorListener , ::com::sun::star::form::XDatabaseParameterListener , ::com::sun::star::form::XConfirmDeleteListener @@ -123,6 +83,7 @@ , ::com::sun::star::awt::XFocusListener , ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::frame::XModule > SbaXDataBrowserController_Base; class SbaXDataBrowserController :public SbaXDataBrowserController_Base @@ -156,6 +117,7 @@ String m_sStateSaveRecord; String m_sStateUndoRecord; + ::rtl::OUString m_sModuleIdentifier; // members for asynchronous load operations ::vos::OThread* m_pLoadThread; // the thread wherein the form is loaded @@ -227,6 +189,10 @@ // XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); + // XModule + virtual void SAL_CALL setIdentifier( const ::rtl::OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException); + // ::com::sun::star::awt::XFocusListener virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); @@ -345,8 +311,6 @@ virtual sal_Bool SaveModified(sal_Bool bAskFor = sal_True); // save the modified record - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; // a PropertySet corresponding to the cursor field a column is bound to // if nViewPos is (sal_uInt16)-1 (the default) then the field for the current column will be retrieved --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
