User: kz Date: 2008-03-06 18:27:12+0000 Modified: dba/dbaccess/source/ui/inc/unodatbr.hxx
Log: INTEGRATION: CWS odbmacros2 (1.69.82); FILE MERGED 2008/02/06 21:44:22 fs 1.69.82.5: #i49133# don't support XScriptInvocationContext if our associated document does not support XEmbeddedScripts, or if we cannot unambiguously be associated with with a dooc 2008/01/24 10:08:19 fs 1.69.82.4: implDirectSQL was never used 2007/12/19 07:20:35 fs 1.69.82.3: #i10000# 2007/12/19 06:12:01 fs 1.69.82.2: #i49133# +m_xCurrentDatabaseDocument 2007/12/18 21:21:23 fs 1.69.82.1: #i49133# implement XScriptInvocationContext File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: unodatbr.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/unodatbr.hxx?r1=1.69&r2=1.70 Delta lines: +16 -8 -------------------- --- unodatbr.hxx 2007-07-24 12:09:55+0000 1.69 +++ unodatbr.hxx 2008-03-06 18:27:09+0000 1.70 @@ -63,8 +63,11 @@ #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> #endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ -#include <cppuhelper/implbase2.hxx> +#ifndef _COM_SUN_STAR_DOCUMENT_XSCRIPTINVOCATIONCONTEXT_HPP_ +#include <com/sun/star/document/XScriptInvocationContext.hpp> +#endif +#ifndef _CPPUHELPER_IMPLBASE3_HXX_ +#include <cppuhelper/implbase3.hxx> #endif #ifndef _DBACCESS_UI_CALLBACKS_HXX_ #include "callbacks.hxx" @@ -108,8 +111,9 @@ class ImageProvider; // ===================================================================== - typedef ::cppu::ImplHelper2 < ::com::sun::star::frame::XStatusListener + typedef ::cppu::ImplHelper3 < ::com::sun::star::frame::XStatusListener , ::com::sun::star::view::XSelectionSupplier + , ::com::sun::star::document::XScriptInvocationContext > SbaTableQueryBrowser_Base; class SbaTableQueryBrowser :public SbaXDataBrowserController @@ -122,6 +126,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > m_xCollator; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xCurrentFrameParent; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMainToolbar; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xCurrentDatabaseDocument; ::osl::Mutex m_aEntryMutex; @@ -162,7 +167,8 @@ sal_Bool m_bShowMenu; // if TRUE the menu should be visible otherwise not sal_Bool m_bInSuspend; sal_Bool m_bEnableBrowser; - + ::boost::optional< bool > + m_aDocScriptSupport; // relevant if and only if we are associated with exactly one DBDoc /** updateTitle will be called when a new frame is attached */ @@ -239,6 +245,9 @@ //IController virtual void notifyHiContrastChanged(); + // XScriptInvocationContext + virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (::com::sun::star::uno::RuntimeException); + protected: // SbaXDataBrowserController overridables virtual sal_Bool InitializeForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > & xForm); @@ -354,7 +363,6 @@ getImageProviderFor( SvLBoxEntry* _pAnyEntry ); void implAdministrate( SvLBoxEntry* _pApplyTo ); - void implDirectSQL( SvLBoxEntry* _pApplyTo ); TransferableHelper* implCopyObject( SvLBoxEntry* _pApplyTo, sal_Int32 _nCommandType, sal_Bool _bAllowConnection = sal_True ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
