summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-05-05 15:01:04 +0000
committerKurt Zenker <kz@openoffice.org>2008-05-05 15:01:04 +0000
commit9cb20caf294f12d1681b61075de3b38175fca171 (patch)
treebec43837b0b984f99b33e0a88aab17c84e104c23 /dbaccess/source/ui
parentdda9d33610eb20b709a2cc7e510f85041b3bd23a (diff)
INTEGRATION: CWS dba30b (1.8.4); FILE MERGED
2008/04/15 22:14:03 fs 1.8.4.2: RESYNC: (1.8-1.10); FILE MERGED 2008/03/16 14:06:14 fs 1.8.4.1: #i86996# support for passing additional parameters
Diffstat (limited to 'dbaccess/source/ui')
-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;