summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-09-06 08:35:19 +0100
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-09-06 08:41:01 +0100
commitb991d27d3d47d29a376cafe08f8665327170dd0a (patch)
treec5e7f0249b6586f0cb77c084962a9e6aa3f9bcfe /connectivity
parent525bb53ab85ca2606db80edaf4ae33710921bad1 (diff)
CID#1079053 Uncaught Exception.
In this case we can just propagate the DeploymentException (is a RuntimeException). Change-Id: Ic807ec039af3856f90d4e798e1304a72421b4db6
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx3
2 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index f5fcb26a65ce..0d531235b717 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -112,7 +112,7 @@ void SAL_CALL OConnection::release() throw()
}
void OConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)
- throw(SQLException)
+ throw(SQLException, RuntimeException)
{
SAL_INFO("connectivity.firebird", "construct().");
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index c7fe44c163d2..7a21acad0110 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -127,7 +127,8 @@ namespace connectivity
public:
virtual void construct( const ::rtl::OUString& url,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
OConnection(FirebirdDriver* _pDriver);
virtual ~OConnection();
DPTS.getDataPilotTables ();
@@ -278,11 +278,11 @@ public class ScDataPilotFieldGroupItemObj extends TestCase
}
DPT.insertNewByName ("DataPilotTable", sCellAdress, DPDsc);
- XIndexAccess xIA = (XIndexAccess) UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ());
+ XIndexAccess xIA = UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ());
XIndexAccess IA = null;
try
{
- XDataPilotDescriptor xDPT = (XDataPilotDescriptor) UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0));
+ XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0));
IA = xDPT.getRowFields ();
//getSRange(IA);
System.out.println ("COUNT: "+IA.getCount ());
@@ -307,14 +307,14 @@ public class ScDataPilotFieldGroupItemObj extends TestCase
try
{
- XDataPilotFieldGrouping dpfg = (XDataPilotFieldGrouping) UnoRuntime.queryInterface (XDataPilotFieldGrouping.class, datapilotfield);
+ XDataPilotFieldGrouping dpfg = UnoRuntime.queryInterface (XDataPilotFieldGrouping.class, datapilotfield);
String[] elements = new String[]{"aName","otherName"};
dpfg.createNameGroup (elements);
DataPilotFieldGroupInfo dpgi=null;
- xIA = (XIndexAccess) UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ());
+ xIA = UnoRuntime.queryInterface (XIndexAccess.class,DPTS.getDataPilotTables ());
try
{
- XDataPilotDescriptor xDPT = (XDataPilotDescriptor) UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0));
+ XDataPilotDescriptor xDPT = UnoRuntime.queryInterface (XDataPilotDescriptor.class,xIA.getByIndex (0));
IA = xDPT.getRowFields ();
}
catch (com.sun.star.lang.WrappedTargetException e)
@@ -335,13 +335,13 @@ public class ScDataPilotFieldGroupItemObj extends TestCase
if (((Boolean)xPropertySet.getPropertyValue ("IsGroupField")).booleanValue ())
{
xPropertySet = (XPropertySet) UnoRuntime.queryInterface (XPropertySet.class, datapilotfield);
- XNamed xNamed = (XNamed) UnoRuntime.queryInterface (XNamed.class, IA.getByIndex (i));
+ XNamed xNamed = UnoRuntime.queryInterface (XNamed.class, IA.getByIndex (i));
System.out.println ("name: "+xNamed.getName ());
dpgi = (DataPilotFieldGroupInfo) xPropertySet.getPropertyValue ("GroupInfo");
}
}
groups = dpgi.Groups;
- XIndexAccess groupAccess = (XIndexAccess) UnoRuntime.queryInterface(XIndexAccess.class, groups);
+ XIndexAccess groupAccess = UnoRuntime.queryInterface(XIndexAccess.class, groups);
XNameAccess groupNames = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, groupAccess.getByIndex(0));
oObj = (XInterface) UnoRuntime.queryInterface(XInterface.class, groupNames.getByName("aName"));
}