summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-11-29 15:54:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-30 11:24:43 +0100
commita28b4c1e3e5855c208c9d940de8e922de33eb129 (patch)
treefa00dec6958566944bac920bea062494d441fda7 /cppuhelper
parent1c1d3b6727af2b937d83cc63a94b00f51bb0dff8 (diff)
Do not override the message of an underlying PropertyVetoException
Change-Id: I9c1026ad87f3031f1c56066ab24d23d3a6d8782b Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/propertysetmixin.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index babad635a3d9..c3c30fb3acd9 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -625,7 +625,12 @@ void PropertySetMixinImpl::Impl::setProperty(
& css::beans::PropertyAttribute::CONSTRAINED)
!= 0))
{
- throw css::beans::PropertyVetoException("Invalid " + name, object);
+ css::beans::PropertyVetoException exc;
+ e.TargetException >>= exc;
+ if (exc.Message.isEmpty() )
+ throw css::beans::PropertyVetoException("Invalid " + name, object);
+ else
+ throw exc;
} else {
throw css::lang::WrappedTargetException(
e.Message, object, e.TargetException);