Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-19 13:25:52+0000 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: 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.75&r2=1.75.2.1 Delta lines: +11 -8 -------------------- --- UITools.cxx 2007-11-21 16:07:06+0000 1.75 +++ UITools.cxx 2007-12-19 13:25:50+0000 1.75.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: UITools.cxx,v $ * - * $Revision: 1.75 $ + * $Revision: 1.75.2.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 16:07:06 $ + * last change: $Author: fs $ $Date: 2007/12/19 13:25:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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]
