summaryrefslogtreecommitdiff
path: root/basic/source/inc/scriptcont.hxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-06 12:29:08 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-06 12:29:08 +0000
commitb36546765d19976fffa04d718ef215a4bcfa2c27 (patch)
treeaa8a9633c5867559a694abd00af63236a7be9371 /basic/source/inc/scriptcont.hxx
parentfd6e95f4758857c5126c7b232fa7fb20f1a90d5c (diff)
INTEGRATION: CWS dba30c (1.8.12); FILE MERGED
2008/05/13 07:01:34 fs 1.8.12.1: joining changes from CWS odbmacros3 to CWS dba30c 2008/04/30 09:26:26 fs 1.8.4.1: add some safety against using an unloaded script/dialog library - this now throws an exception, instead of silently doing nothing/nonsense
Diffstat (limited to 'basic/source/inc/scriptcont.hxx')
-rw-r--r--basic/source/inc/scriptcont.hxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index f2938fc7768b..b679c74b1236 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: scriptcont.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL,
const ::rtl::OUString& StorageURL, sal_Bool ReadOnly );
virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void );
- virtual sal_Bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement );
+ virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const;
virtual void SAL_CALL writeLibraryElement
(
::com::sun::star::uno::Any aElement,
@@ -169,6 +169,11 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xSFI,
const ::rtl::OUString& aLibInfoFileURL, const ::rtl::OUString& aStorageURL, sal_Bool ReadOnly
);
+
+ static bool containsValidModule( const ::com::sun::star::uno::Any& _rElement );
+
+protected:
+ virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const;
};
} // namespace base