summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-08-07 11:16:18 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2014-08-07 11:34:24 +0200
commit5be4407d0716f78acdcdf24de135af91f17e51be (patch)
treef21199e1d628c3ec0c984a6b438b71df109b8cd2
parent5ecec388bb117426661c4e5f65cb84aeb245064c (diff)
fdo#82151 fixup
The dbaccess unoapi test calls css::sdb::XSingleSelectQueryComposer::appendFilterByColumn in a state where there is no current row, and thus no column value. This does not make sense, but let's not break the build while I figure out how to fix the unoapi test. Change-Id: If813a1544ec9a5dac6f87197982d10576c91cd8c
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx17
1 files changed, 12 insertions, 5 deletions
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 50ff4adcad2b..e367828e100f 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -25,6 +25,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <tools/debug.hxx>
using namespace dbaccess;
@@ -110,12 +111,18 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue( Any& rValue, sal_Int32 nH
{
rValue = m_pGetValue(m_nPos).makeAny();
}
- catch (css::sdbc::SQLException & e)
+ catch(const SQLException &e)
{
- css::uno::Any a(cppu::getCaughtException());
- throw css::lang::WrappedTargetException(
- "wrapped css::sdbc::SQLException: " + e.Message,
- css::uno::Reference<css::uno::XInterface>(), a);
+ // TODO: doing nothing matches the previous behaviour,
+ // (and keeps dbaccess unoapi test working...)
+ // but should be investigated... If the value could not be
+ // fetched, that's a different result than "value is null",
+ // which corresponds to an empty Any.
+ //throw WrappedTargetRuntimeException("Could not retrieve column value", *const_cast<ORowSetDataColumn*>(this), Any(e));
+ // css::uno::Any a(cppu::getCaughtException());
+ // throw css::lang::WrappedTargetException(
+ // "wrapped css::sdbc::SQLException: " + e.Message,
+ // css::uno::Reference<css::uno::XInterface>(), a);
}
}
else if ( PROPERTY_ID_LABEL == nHandle && !m_sLabel.isEmpty() )