User: kz Date: 2008-05-05 16:01:08+0000 Modified: dba/dbaccess/source/ui/misc/databaseobjectview.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: databaseobjectview.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/databaseobjectview.cxx?r1=1.10&r2=1.11 Delta lines: +12 -5 -------------------- --- databaseobjectview.cxx 2008-04-10 16:05:01+0000 1.10 +++ databaseobjectview.cxx 2008-05-05 16:01:04+0000 1.11 @@ -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 @@ { 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 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
