diff options
| author | Noel Grandin <noel@peralex.com> | 2012-12-31 11:49:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2012-12-31 11:51:09 +0200 |
| commit | 63894cb4fed44aed01092cdee1fe30463eb5223e (patch) | |
| tree | 49225f3967958bdf3bd44ac98881b7a3c144daeb /dbaccess | |
| parent | e795b4d80dec9eb1e9b63daa4e31c03d8d68f220 (diff) | |
fix fdo#58451
I introduced this bug during my "shiny UNO" conversions.
We pass around SQLException as an Any in the IDL, so we need to treat
it like that it the service code.
Change-Id: Ib55b1e156c93fb1488b21ab4d1423b25cb13a5cf
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/uno/unosqlmessage.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 3260f2fed556..69cd5866cd18 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -889,7 +889,6 @@ void OGenericUnoController::disposing() m_xMasterDispatcher = NULL; m_xSlaveDispatcher = NULL; - m_xServiceFactory = NULL; m_xTitleHelper.clear(); m_xUrlTransformer.clear(); m_aInitParameters.clear(); diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 6e52da92afb0..6a5662408207 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -100,13 +100,13 @@ void OSQLMessageDialog::initialize(Sequence<Any> const & args) throw (com::sun:: { OUString title; Reference< com::sun::star::awt::XWindow > parentWindow; - Reference< com::sun::star::sdbc::SQLException > sqlException; + com::sun::star::uno::Any sqlException; if ((args.getLength() == 3) && (args[0] >>= title) && (args[1] >>= parentWindow) && (args[2] >>= sqlException)) { Sequence<Any> s(3); s[0] <<= PropertyValue( "Title", -1, makeAny(title), PropertyState_DIRECT_VALUE); s[1] <<= PropertyValue( "ParentWindow", -1, makeAny(parentWindow), PropertyState_DIRECT_VALUE); - s[2] <<= PropertyValue( "SQLException", -1, makeAny(sqlException), PropertyState_DIRECT_VALUE); + s[2] <<= PropertyValue( "SQLException", -1, sqlException, PropertyState_DIRECT_VALUE); OGenericUnoDialog::initialize(s); } else { OGenericUnoDialog::initialize(args); |