diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-02-12 13:49:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-02-12 13:49:29 +0000 |
| commit | e7a928c5b74129907cfc70af7a36a183dffff676 (patch) | |
| tree | 0f8cfeb14b665ac136b3129dcb37617988c4e52d /basic | |
| parent | 9eedad899f4882298d3ff8e1bad7d317a5dc50a0 (diff) | |
INTEGRATION: CWS basexc_SRC680 (1.4.4.1.2); FILE MERGED
2007/02/01 08:57:03 fs 1.4.4.1.2.1: #i74058# let the SfxLibrary throw proper exceptions when being readonly (RuntimeException is not appropriate here)
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/uno/namecont.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 67b376fdc633..c4ef30b43057 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -4,9 +4,9 @@ * * $RCSfile: namecont.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2007-01-29 15:06:29 $ + * last change: $Author: kz $ $Date: 2007-02-12 14:49:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2545,12 +2545,21 @@ sal_Bool SfxLibrary::hasByName( const OUString& aName ) return bRet; } +void SfxLibrary::impl_checkReadOnly() +{ + if( mbReadOnly || (mbLink && mbReadOnlyLink) ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Library is readonly." ) ), + // TODO: resource + *this, 0 + ); +} + // Methods XNameReplace void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { - if( mbReadOnly || (mbLink && mbReadOnlyLink) ) - throw RuntimeException(); + impl_checkReadOnly(); maNameContainer.replaceByName( aName, aElement ); mbModified = sal_True; @@ -2561,8 +2570,7 @@ void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) void SfxLibrary::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { - if( mbReadOnly || (mbLink && mbReadOnlyLink) ) - throw RuntimeException(); + impl_checkReadOnly(); maNameContainer.insertByName( aName, aElement ); mbModified = sal_True; @@ -2571,8 +2579,7 @@ void SfxLibrary::insertByName( const OUString& aName, const Any& aElement ) void SfxLibrary::removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - if( mbReadOnly || (mbLink && mbReadOnlyLink) ) - throw RuntimeException(); + impl_checkReadOnly(); maNameContainer.removeByName( Name ); mbModified = sal_True; |