From 96746b3d3fbe2f067917c886b2d91e089bcb0975 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 6 Jun 2008 12:28:37 +0000 Subject: INTEGRATION: CWS dba30c (1.8.12); FILE MERGED 2008/05/13 07:00:20 fs 1.8.12.1: joining changes from CWS odbmacros3 to CWS dba30c 2008/04/30 09:26:25 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 --- basic/source/inc/dlgcont.hxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'basic/source/inc') diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 9a73aed5aecb..4917975e8ee2 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dlgcont.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -54,7 +54,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer ( 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, @@ -162,6 +162,11 @@ public: { return m_xStringResourcePersistence; } + + static bool containsValidDialog( const ::com::sun::star::uno::Any& aElement ); + +protected: + virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any aElement ) const; }; } // namespace basic -- cgit