summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorStephan Bergmann <sb@openoffice.org>2001-02-08 13:04:28 +0000
committerStephan Bergmann <sb@openoffice.org>2001-02-08 13:04:28 +0000
commitf986ef4accbf714e9468f35ddf16851a673aaadd (patch)
tree1bcd2f5534c1a73dc416d0f914b917c44cedb365 /ucb
parentc1f00ba89fbcd2dadb8dda42bdc17d320e2990ce (diff)
#83617# Work around Solaris compiler bug to catch ResultSetException as well as SQLException.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx21
1 files changed, 18 insertions, 3 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index b4ae33a273ef..c3598b178a21 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cachedcontentresultset.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: kso $ $Date: 2000-10-31 10:37:35 $
+ * last change: $Author: sb $ $Date: 2001-02-08 14:04:28 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,6 +69,10 @@
#include <com/sun/star/ucb/FetchError.hpp>
#endif
+#ifndef _COM_SUN_STAR_UCB_RESULTSETEXCEPTION_HPP_
+#include <com/sun/star/ucb/ResultSetException.hpp>
+#endif
+
#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
#endif
@@ -1470,7 +1474,18 @@ sal_Bool SAL_CALL CachedContentResultSet
//unknown final count:
aGuard.clear();
- sal_Bool bValid = m_xResultSetOrigin->absolute( row );
+ // Solaris has problems catching or propagating derived exceptions
+ // when only the base class is known, so make ResultSetException
+ // (derived from SQLException) known here:
+ sal_Bool bValid;
+ try
+ {
+ bValid = m_xResultSetOrigin->absolute( row );
+ }
+ catch (ResultSetException &)
+ {
+ throw;
+ }
aGuard.reacquire();
if( m_bFinalCount )