Tag: cws_src680_qiq User: fs Date: 06/05/16 22:19:27 Modified: /dba/connectivity/source/commontools/ dbmetadata.cxx
Log: default construction File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbmetadata.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbmetadata.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +21 -6 -------------------- --- dbmetadata.cxx 17 May 2006 05:08:22 -0000 1.1.2.2 +++ dbmetadata.cxx 17 May 2006 05:19:24 -0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: dbmetadata.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: fs $ $Date: 2006/05/17 05:08:22 $ + * last change: $Author: fs $ $Date: 2006/05/17 05:19:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,9 @@ #ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX #include <connectivity/dbmetadata.hxx> #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif /** === begin UNO includes === **/ #ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ @@ -84,12 +87,24 @@ if ( !_metaDataImpl.xConnectionMetaData.is() ) throw IllegalArgumentException(); } + + static void lcl_checkConnected( DatabaseMetaData_Impl& _metaDataImpl ) + { + if ( !_metaDataImpl.xConnection.is() ) + throwSQLException( "not connected", SQL_CONNECTION_DOES_NOT_EXIST, NULL ); + } } //==================================================================== //= DatabaseMetaData //==================================================================== //-------------------------------------------------------------------- + DatabaseMetaData::DatabaseMetaData() + :m_pImpl( new DatabaseMetaData_Impl ) + { + } + + //-------------------------------------------------------------------- DatabaseMetaData::DatabaseMetaData( const Reference< XConnection >& _connection ) :m_pImpl( new DatabaseMetaData_Impl ) { @@ -98,9 +113,8 @@ //-------------------------------------------------------------------- DatabaseMetaData::DatabaseMetaData( const DatabaseMetaData& _copyFrom ) - :m_pImpl( new DatabaseMetaData_Impl ) + :m_pImpl( new DatabaseMetaData_Impl( *_copyFrom.m_pImpl ) ) { - lcl_construct( *m_pImpl, _copyFrom.m_pImpl->xConnection ); } //-------------------------------------------------------------------- @@ -109,8 +123,7 @@ if ( this == &_copyFrom ) return *this; - m_pImpl.reset( new DatabaseMetaData_Impl ); - lcl_construct( *m_pImpl, _copyFrom.m_pImpl->xConnection ); + m_pImpl.reset( new DatabaseMetaData_Impl( *_copyFrom.m_pImpl ) ); } //-------------------------------------------------------------------- @@ -121,6 +134,8 @@ //-------------------------------------------------------------------- bool SAL_CALL DatabaseMetaData::supportsSubqueriesInFrom() const { + lcl_checkConnected( *m_pImpl ); + bool supportsSubQueries = false; try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
