User: kz Date: 2008-03-06 18:27:51+0000 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: INTEGRATION: CWS odbmacros2 (1.75.2); FILE MERGED 2008/02/20 13:28:02 fs 1.75.2.2.2.1: some DBG_UNHANDLED_EXCEPTIONs 2008/02/04 13:08:13 fs 1.75.2.2: RESYNC: (1.75-1.76); FILE MERGED 2007/12/19 13:25:50 fs 1.75.2.1: getDataSourceName_displayError: database context arg is not necessary File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.76&r2=1.77 Delta lines: +8 -5 ------------------- --- UITools.cxx 2008-01-30 08:51:13+0000 1.76 +++ UITools.cxx 2008-03-06 18:27:48+0000 1.77 @@ -186,6 +186,9 @@ #ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> #endif +#ifndef COMPHELPER_COMPONENTCONTEXT_HXX +#include <comphelper/componentcontext.hxx> +#endif #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> @@ -410,18 +413,18 @@ return aInfo; } // ----------------------------------------------------------------------------- -Reference< XDataSource > getDataSourceByName_displayError( const Reference< XNameAccess >& _rxDBContext, - const ::rtl::OUString& _rDataSourceName, Window* _pErrorMessageParent, Reference< XMultiServiceFactory > _rxORB, - bool _bDisplayError) +Reference< XDataSource > getDataSourceByName_displayError( const ::rtl::OUString& _rDataSourceName, + Window* _pErrorMessageParent, Reference< XMultiServiceFactory > _rxORB, bool _bDisplayError) { - OSL_PRECOND( _rxDBContext.is() && _rxORB.is(), "getDataSourceByName_displayError: invalid service factory!" ); + ::comphelper::ComponentContext aContext( _rxORB ); + Reference< XNameAccess > xDatabaseContext( aContext.createComponent( "com.sun.star.sdb.DatabaseContext" ), UNO_QUERY_THROW ); Reference< XDataSource > xDatasource; Any aError; SQLExceptionInfo aSQLError; try { - _rxDBContext->getByName( _rDataSourceName ) >>= xDatasource; + xDatabaseContext->getByName( _rDataSourceName ) >>= xDatasource; } catch(const WrappedTargetException& e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
