summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx15
1 files changed, 11 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 2c2eb7e1291c..3d9206d0803a 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: databaseobjectview.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -77,6 +77,9 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
#endif
+#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#include <comphelper/namedvaluecollection.hxx>
+#endif
#ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
@@ -148,7 +151,11 @@ namespace dbaui
{
Sequence< PropertyValue > aDispatchArgs;
fillDispatchArgs( aDispatchArgs, _rDataSource, _rObjectName );
- return doDispatch( ::comphelper::concatSequences( aDispatchArgs, _rCreationArgs ) );
+
+ ::comphelper::NamedValueCollection aDispArgs( aDispatchArgs );
+ aDispArgs.merge( _rCreationArgs, true );
+
+ return doDispatch( aDispArgs.getPropertyValues() );
}
//----------------------------------------------------------------------
@@ -189,9 +196,9 @@ namespace dbaui
if ( xReturn.is() )
xReturn.set(m_xFrameLoader,UNO_QUERY);
}
- catch(Exception&)
+ catch( const Exception& )
{
- OSL_ENSURE(sal_False, "DatabaseObjectView::getDispatcher: caught an exception while loading the component!");
+ DBG_UNHANDLED_EXCEPTION();
}
}
return xReturn;