summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-10-09 08:28:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-10-09 08:37:36 +0200
commit52028d4632d4898ad0f9119841bcf171f6e18682 (patch)
tree34c116ec97ff31ae990b2a12d07762c436f9aa7f /comphelper
parent9aa36a1ad39e37c372cc833a44fba450b8cc30cd (diff)
Revert "coverity#1224993 Uncaught exception"
This reverts commit b66a96d792e9ef8022547f835ed4633c8e7f4c10, follow-up commit will fix w/o breaking JunitTest_framework_unoapi. Change-Id: Iac12d52c2eb9a1e4ab09d24910cee1838cc7d883
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/misc/sequenceashashmap.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index b34d8c93cd8e..35f2d6bf118a 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -75,9 +75,11 @@ void SequenceAsHashMap::operator<<(const css::uno::Any& aSource)
return;
}
- throw std::invalid_argument("Any contains wrong type.");
+ throw css::beans::IllegalTypeException(
+ "Any contains wrong type." );
}
+
void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lSource)
{
sal_Int32 c = lSource.getLength();
@@ -92,7 +94,8 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
(lP.Name.isEmpty()) ||
(!lP.Value.hasValue())
)
- throw std::invalid_argument("PropertyValue struct contains no useful information.");
+ throw css::beans::IllegalTypeException(
+ "PropertyValue struct contains no useful information." );
(*this)[lP.Name] = lP.Value;
continue;
}
@@ -104,14 +107,16 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
(lN.Name.isEmpty()) ||
(!lN.Value.hasValue())
)
- throw std::invalid_argument("NamedValue struct contains no useful information.");
+ throw css::beans::IllegalTypeException(
+ "NamedValue struct contains no useful information." );
(*this)[lN.Name] = lN.Value;
continue;
}
// ignore VOID Any ... but reject wrong filled ones!
if (lSource[i].hasValue())
- throw std::invalid_argument("Any contains wrong type.");
+ throw css::beans::IllegalTypeException(
+ "Any contains wrong type." );
}
}