diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:45:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 18:45:13 +0000 |
| commit | eedb9580133378bcd38de3b1641682b767082b52 (patch) | |
| tree | c2dcbdd7d4651e7ff68c07990643846d3c2aef90 /sfx2 | |
| parent | 553057eec5c8452e901f1f533322cbcdc4eda999 (diff) | |
INTEGRATION: CWS odbmacros2 (1.6.2); FILE MERGED
2008/03/04 12:11:23 fs 1.6.2.8: RESYNC: (1.7-1.8); FILE MERGED
2008/02/04 13:15:22 fs 1.6.2.7: RESYNC: (1.6-1.7); FILE MERGED
2008/01/06 21:47:50 fs 1.6.2.6: #i49133# static CallXScript version taking an ScriptDocument (not necessarily a document) now
2007/12/21 20:37:50 fs 1.6.2.5: #i49133# GetModel made const (want to use it in a const context, and have an incompatible build, anyway)
2007/12/18 21:09:14 fs 1.6.2.4: #i49133# WorkingDocument (XModel) replaced with CurrentComponent (XInterface)
2007/12/17 12:38:50 fs 1.6.2.3: GetScriptableDocument not needed anymore
2007/12/11 23:10:17 fs 1.6.2.2: #i49133# GetScriptableDocument
2007/12/11 22:20:35 fs 1.6.2.1: #i49133# +CallXScript (static version)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 8697dcd1d1e6..04977e2f78f8 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -4,9 +4,9 @@ * * $RCSfile: objsh.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2008-03-05 18:27:05 $ + * last change: $Author: kz $ $Date: 2008-03-06 19:45:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,6 +60,9 @@ #ifndef _COM_SUN_STAR_SCRIPT_XLIBRARYCONTAINER_HPP_ #include <com/sun/star/script/XLibraryContainer.hpp> #endif +#ifndef _COM_SUN_STAR_SCRIPT_PROVIDER_XSCRIPTPROVIDERSUPPLIER_HPP_ +#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> +#endif #ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> #endif @@ -321,9 +324,9 @@ public: sal_Bool bOnlyVisible = sal_True ); static SfxObjectShell* Current(); static sal_uInt16 Count(); - static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - GetWorkingDocument(); - static void SetWorkingDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + GetCurrentComponent(); + static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); virtual void Invalidate(USHORT nId = 0); @@ -439,6 +442,15 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ); + static ErrCode CallXScript( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxScriptContext, + const ::rtl::OUString& rScriptURL, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, + ::com::sun::star::uno::Any& aRet, + ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam + ); + /** adjusts the internal macro mode, according to the current security settings Finally, the macro mode is either NEVER_EXECUTE or ALWAYS_EXECUTE_NO_WARN. @@ -630,7 +642,8 @@ public: virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); void SetModel( SfxBaseModel* pModel ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel(); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& + GetModel() const; // Nur uebergangsweise fuer die Applikationen !!! void SetBaseModel( SfxBaseModel* pModel ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel(); |