Kaydet (Commit) 63894cb4 authored tarafından Noel Grandin's avatar Noel Grandin

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
üst e795b4d8
......@@ -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();
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment