diff options
| -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); |