summaryrefslogtreecommitdiff
path: root/basic/source/inc/namecont.hxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-06-06 12:28:52 +0000
committerRüdiger Timm <rt@openoffice.org>2008-06-06 12:28:52 +0000
commitfd6e95f4758857c5126c7b232fa7fb20f1a90d5c (patch)
tree622e6e7ea7ed3e5f7f1463a0079e3bf8c2b635f5 /basic/source/inc/namecont.hxx
parent96746b3d3fbe2f067917c886b2d91e089bcb0975 (diff)
INTEGRATION: CWS dba30c (1.4.12); FILE MERGED
2008/05/13 07:01:02 fs 1.4.12.1: joining changes from CWS odbmacros3 to CWS dba30c 2008/04/30 09:26:26 fs 1.4.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/namecont.hxx')
-rw-r--r--basic/source/inc/namecont.hxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index e8208c490072..bc50152d7459 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: namecont.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@@ -280,7 +280,7 @@ protected:
( const ::rtl::OUString& aName, const ::rtl::OUString& aLibInfoFileURL,
const ::rtl::OUString& StorageURL, sal_Bool ReadOnly ) = 0;
virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) = 0;
- virtual sal_Bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) = 0;
+ virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const = 0;
virtual void SAL_CALL writeLibraryElement
(
::com::sun::star::uno::Any aElement,
@@ -571,7 +571,11 @@ protected:
private:
/** checks whether the lib is readonly, or a readonly link, throws an IllegalArgumentException if so
*/
- void impl_checkReadOnly();
+ void impl_checkReadOnly();
+ /** checks whether the library is loaded, throws a LibraryNotLoadedException (wrapped in a WrappedTargetException),
+ if not.
+ */
+ void impl_checkLoaded();
public:
SfxLibrary(
@@ -643,6 +647,9 @@ public:
virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference<
::com::sun::star::container::XContainerListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+ virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const = 0;
};