Tag: cws_src680_qiq User: fs Date: 06/05/31 04:05:36 Modified: /dba/dbaccess/source/core/misc/ objectnameapproval.cxx
Log: ObjectNameApproval now always throwing an SQLException File Changes: Directory: /dba/dbaccess/source/core/misc/ ========================================== File [changed]: objectnameapproval.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/misc/objectnameapproval.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +4 -19 -------------------- --- objectnameapproval.cxx 30 May 2006 12:56:32 -0000 1.1.2.3 +++ objectnameapproval.cxx 31 May 2006 11:05:33 -0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: objectnameapproval.cxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: fs $ $Date: 2006/05/30 12:56:32 $ + * last change: $Author: fs $ $Date: 2006/05/31 11:05:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,7 +74,6 @@ using ::com::sun::star::sdb::tools::XObjectNames; using ::com::sun::star::uno::XInterface; using ::com::sun::star::sdbc::SQLException; - using ::com::sun::star::lang::WrappedTargetException; /** === end UNO using === **/ namespace CommandType = com::sun::star::sdb::CommandType; @@ -86,19 +85,17 @@ { WeakReference< XConnection > aConnection; sal_Int32 nCommandType; - ObjectNameApproval::ErrorReportType eErrorReportType; }; //==================================================================== //= ObjectNameApproval //==================================================================== //-------------------------------------------------------------------- - ObjectNameApproval::ObjectNameApproval( const Reference< XConnection >& _rxConnection, ObjectType _eType, ErrorReportType _eReportType ) + ObjectNameApproval::ObjectNameApproval( const Reference< XConnection >& _rxConnection, ObjectType _eType ) :m_pImpl( new ObjectNameApproval_Impl ) { m_pImpl->aConnection = _rxConnection; m_pImpl->nCommandType = _eType == TypeQuery ? CommandType::QUERY : CommandType::TABLE; - m_pImpl->eErrorReportType = _eReportType; } //-------------------------------------------------------------------- @@ -115,19 +112,7 @@ Reference< XConnectionTools > xConnectionTools( xConnection, UNO_QUERY_THROW ); Reference< XObjectNames > xObjectNames( xConnectionTools->getObjectNames(), UNO_QUERY_THROW ); - try - { xObjectNames->checkNameIsUsed( m_pImpl->nCommandType, _rName ); - } - catch( const SQLException& ) - { - if ( m_pImpl->eErrorReportType == ThrowSQLException ) - throw; - - WrappedTargetException aWrapped; - aWrapped.TargetException = ::cppu::getCaughtException(); - throw aWrapped; - } } //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
