diff options
| author | Michael Stahl <mst@apache.org> | 2011-09-17 21:41:28 +0000 |
|---|---|---|
| committer | Michael Stahl <mst@apache.org> | 2011-09-17 21:41:28 +0000 |
| commit | 0e146fc26f44e44bcbc427016c47e4e23605a391 (patch) | |
| tree | 165b121d3a66c19dadabf1826355675fd3ec0734 /sfx2 | |
| parent | 8851d704aea1525436ed9e0fa5b6395aca7e0901 (diff) | |
fs34c: #i117625# when assigning events, only throw if there is an invalid type given, *not* if the type is correct, but the sequence is merely empty
# HG changeset patch
# User Frank Schoenheit [fs] <frank.schoenheit@oracle.com>
# Date 1301640073 -7200
# Node ID e4014e6b2cb422bb8dca7dad4ba34f28d42cb86d
# Parent a25f2ab3257e6b811ccb2436661f74d0c65719cd
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index c2680d702414..33505c99e14d 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -90,10 +90,10 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY & { if ( maEventNames[i] == aName ) { - const ::comphelper::NamedValueCollection aEventDescriptor( rElement ); // check for correct type of the element - if ( rElement.hasValue() && aEventDescriptor.empty() ) + if ( !::comphelper::NamedValueCollection::canExtractFrom( rElement ) ) throw ILLEGALARGUMENTEXCEPTION(); + ::comphelper::NamedValueCollection const aEventDescriptor( rElement ); // create Configuration at first, creation might call this method also and that would overwrite everything // we might have stored before! |