[Libreoffice-commits] .: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/browser/genericcontroller.cxx |    1 -
 dbaccess/source/ui/uno/unosqlmessage.cxx         |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 63894cb4fed44aed01092cdee1fe30463eb5223e
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Dec 31 11:49:50 2012 +0200

    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

diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 3260f2f..69cd586 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 6e52da9..6a56624 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);