Tag: cws_src680_mingwport2 User: vg Date: 2006/07/12 03:38:05 Modified: dba/connectivity/source/drivers/ado/ACallableStatement.cxx dba/connectivity/source/drivers/ado/AColumn.cxx dba/connectivity/source/drivers/ado/AConnection.cxx dba/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx dba/connectivity/source/drivers/ado/AGroup.cxx dba/connectivity/source/drivers/ado/AIndex.cxx dba/connectivity/source/drivers/ado/AKey.cxx dba/connectivity/source/drivers/ado/APreparedStatement.cxx dba/connectivity/source/drivers/ado/AResultSet.cxx dba/connectivity/source/drivers/ado/AStatement.cxx dba/connectivity/source/drivers/ado/ATable.cxx dba/connectivity/source/drivers/ado/AUser.cxx dba/connectivity/source/drivers/ado/AView.cxx dba/connectivity/source/drivers/ado/Aolevariant.cxx dba/connectivity/source/drivers/ado/makefile.mk dba/connectivity/source/drivers/mozab/makefile.mk dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk dba/connectivity/source/drivers/odbc/makefile.mk dba/connectivity/source/inc/OSubComponent.hxx dba/connectivity/source/inc/ado/AConnection.hxx dba/connectivity/source/inc/ado/ATable.hxx dba/connectivity/source/inc/ado/AUser.hxx dba/connectivity/source/inc/ado/Aolevariant.hxx dba/connectivity/source/inc/ado/Aolewrap.hxx dba/connectivity/source/parse/sqlflex.l
Log: #i53572# MinGW port efforts File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ACallableStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ACallableStatement.cxx?r1=1.6&r2=1.6.22.1 Delta lines: +5 -5 ------------------- --- ACallableStatement.cxx 8 Sep 2005 05:25:53 -0000 1.6 +++ ACallableStatement.cxx 12 Jul 2006 10:37:58 -0000 1.6.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: ACallableStatement.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:25:53 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -227,12 +227,12 @@ } // ------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OCallableStatement::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OCallableStatement::acquire() throw() { OPreparedStatement::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OCallableStatement::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OCallableStatement::release() throw() { OPreparedStatement::release(); } File [changed]: AColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AColumn.cxx?r1=1.23&r2=1.23.22.1 Delta lines: +5 -5 ------------------- --- AColumn.cxx 8 Sep 2005 05:26:27 -0000 1.23 +++ AColumn.cxx 12 Jul 2006 10:37:58 -0000 1.23.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AColumn.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.23.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:26:27 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -312,12 +312,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoColumn::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoColumn::acquire() throw() { OColumn_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoColumn::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoColumn::release() throw() { OColumn_ADO::release(); } File [changed]: AConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AConnection.cxx?r1=1.24&r2=1.24.20.1 Delta lines: +9 -5 ------------------- --- AConnection.cxx 29 Mar 2006 12:14:19 -0000 1.24 +++ AConnection.cxx 12 Jul 2006 10:37:58 -0000 1.24.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: AConnection.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.20.1 $ * - * last change: $Author: obo $ $Date: 2006/03/29 12:14:19 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -197,7 +197,7 @@ osl_decrementInterlockedCount( &m_refCount ); } //----------------------------------------------------------------------------- -void SAL_CALL OConnection::release() throw(RuntimeException) +void SAL_CALL OConnection::release() throw() { relase_ChildImpl(); } @@ -514,7 +514,11 @@ // m_aTables.disposing(); for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - ::comphelper::disposeComponent(i->get()); + { + // cannot assign temp to no-const ref + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp = (i->get()); + ::comphelper::disposeComponent(temp); + } m_aStatements.clear(); m_bClosed = sal_True; File [changed]: ADatabaseMetaDataResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx?r1=1.20&r2=1.20.22.1 Delta lines: +12 -5 -------------------- --- ADatabaseMetaDataResultSet.cxx 8 Sep 2005 05:27:46 -0000 1.20 +++ ADatabaseMetaDataResultSet.cxx 12 Jul 2006 10:37:58 -0000 1.20.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: ADatabaseMetaDataResultSet.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:27:46 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -685,21 +685,25 @@ } //------------------------------------------------------------------------------ sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ResultSetConcurrency::READ_ONLY; } //------------------------------------------------------------------------------ sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ResultSetType::FORWARD_ONLY; } //------------------------------------------------------------------------------ sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return FetchDirection::FORWARD; } //------------------------------------------------------------------------------ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=-1; if(m_pRecordSet) @@ -708,16 +712,19 @@ } //------------------------------------------------------------------------------ ::rtl::OUString ODatabaseMetaDataResultSet::getCursorName() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ::rtl::OUString(); } //------------------------------------------------------------------------------ void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 _par0) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------------------ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { if(m_pRecordSet) m_pRecordSet->put_CacheSize(_par0); @@ -1208,12 +1215,12 @@ m_xMetaData = pMetaData; } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw() { ODatabaseMetaDataResultSet_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL ODatabaseMetaDataResultSet::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::release() throw() { ODatabaseMetaDataResultSet_BASE::release(); } File [changed]: AGroup.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AGroup.cxx?r1=1.16&r2=1.16.22.1 Delta lines: +5 -5 ------------------- --- AGroup.cxx 8 Sep 2005 05:28:29 -0000 1.16 +++ AGroup.cxx 12 Jul 2006 10:37:58 -0000 1.16.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AGroup.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:28:29 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -200,12 +200,12 @@ } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoGroup::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoGroup::acquire() throw() { OGroup_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoGroup::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoGroup::release() throw() { OGroup_ADO::release(); } File [changed]: AIndex.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AIndex.cxx?r1=1.19&r2=1.19.22.1 Delta lines: +5 -5 ------------------- --- AIndex.cxx 8 Sep 2005 05:28:57 -0000 1.19 +++ AIndex.cxx 12 Jul 2006 10:37:59 -0000 1.19.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AIndex.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.19.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:28:57 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -167,12 +167,12 @@ OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoIndex::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoIndex::acquire() throw() { OIndex_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoIndex::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoIndex::release() throw() { OIndex_ADO::release(); } File [changed]: AKey.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AKey.cxx?r1=1.18&r2=1.18.22.1 Delta lines: +5 -5 ------------------- --- AKey.cxx 8 Sep 2005 05:29:25 -0000 1.18 +++ AKey.cxx 12 Jul 2006 10:37:59 -0000 1.18.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AKey.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:29:25 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -175,12 +175,12 @@ } // ------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoKey::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoKey::acquire() throw() { OKey_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoKey::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoKey::release() throw() { OKey_ADO::release(); } File [changed]: APreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/APreparedStatement.cxx?r1=1.18&r2=1.18.8.1 Delta lines: +5 -5 ------------------- --- APreparedStatement.cxx 21 Dec 2005 13:15:13 -0000 1.18 +++ APreparedStatement.cxx 12 Jul 2006 10:37:59 -0000 1.18.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: APreparedStatement.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.8.1 $ * - * last change: $Author: obo $ $Date: 2005/12/21 13:15:13 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -521,12 +521,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OPreparedStatement::acquire() throw() { OStatement_Base::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OPreparedStatement::release() throw() { OStatement_Base::release(); } File [changed]: AResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AResultSet.cxx?r1=1.20&r2=1.20.8.1 Delta lines: +12 -5 -------------------- --- AResultSet.cxx 21 Dec 2005 13:15:25 -0000 1.20 +++ AResultSet.cxx 12 Jul 2006 10:37:59 -0000 1.20.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: AResultSet.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.20.8.1 $ * - * last change: $Author: obo $ $Date: 2005/12/21 13:15:25 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1000,6 +1000,7 @@ } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getResultSetConcurrency() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=0; LockTypeEnum eRet; @@ -1019,6 +1020,7 @@ } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getResultSetType() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=0; CursorTypeEnum eRet; @@ -1043,11 +1045,13 @@ } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getFetchDirection() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return FetchDirection::FORWARD; } //------------------------------------------------------------------------------ sal_Int32 OResultSet::getFetchSize() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nValue=-1; m_pRecordSet->get_CacheSize(&nValue); @@ -1055,16 +1059,19 @@ } //------------------------------------------------------------------------------ ::rtl::OUString OResultSet::getCursorName() const + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ::rtl::OUString(); } //------------------------------------------------------------------------------ void OResultSet::setFetchDirection(sal_Int32 _par0) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { } //------------------------------------------------------------------------------ void OResultSet::setFetchSize(sal_Int32 _par0) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { m_pRecordSet->put_CacheSize(_par0); } @@ -1166,12 +1173,12 @@ } } // ----------------------------------------------------------------------------- -void SAL_CALL OResultSet::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::acquire() throw() { OResultSet_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OResultSet::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::release() throw() { OResultSet_BASE::release(); } File [changed]: AStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AStatement.cxx?r1=1.22&r2=1.22.8.1 Delta lines: +7 -7 ------------------- --- AStatement.cxx 21 Dec 2005 13:15:37 -0000 1.22 +++ AStatement.cxx 12 Jul 2006 10:37:59 -0000 1.22.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: AStatement.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.8.1 $ * - * last change: $Author: obo $ $Date: 2005/12/21 13:15:37 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -148,7 +148,7 @@ OStatement_BASE::disposing(); } //----------------------------------------------------------------------------- -void SAL_CALL OStatement_Base::release() throw(RuntimeException) +void SAL_CALL OStatement_Base::release() throw() { relase_ChildImpl(); } @@ -846,17 +846,17 @@ } IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement"); // ----------------------------------------------------------------------------- -void SAL_CALL OStatement_Base::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OStatement_Base::acquire() throw() { OStatement_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OStatement::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OStatement::acquire() throw() { OStatement_Base::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OStatement::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OStatement::release() throw() { OStatement_Base::release(); } File [changed]: ATable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ATable.cxx?r1=1.27&r2=1.27.22.1 Delta lines: +8 -8 ------------------- --- ATable.cxx 8 Sep 2005 05:31:23 -0000 1.27 +++ ATable.cxx 12 Jul 2006 10:37:59 -0000 1.27.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: ATable.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.27.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:31:23 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -205,7 +205,7 @@ void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); m_aTable.put_Name(newName); ADOS::ThrowException(*(m_pCatalog->getConnection()->getConnection()),*this); @@ -222,7 +222,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); sal_Bool bError = sal_True; OAdoColumn* pColumn = NULL; @@ -242,7 +242,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(rBHelper.bDisposed); + checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); Reference< XPropertySet > xOld; m_pColumns->getByIndex(index) >>= xOld; @@ -282,12 +282,12 @@ OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue); } // ------------------------------------------------------------------------- -void SAL_CALL OAdoTable::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoTable::acquire() throw() { OTable_TYPEDEF::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoTable::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoTable::release() throw() { OTable_TYPEDEF::release(); } File [changed]: AUser.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AUser.cxx?r1=1.16&r2=1.16.22.1 Delta lines: +11 -11 --------------------- --- AUser.cxx 8 Sep 2005 05:31:50 -0000 1.16 +++ AUser.cxx 12 Jul 2006 10:37:59 -0000 1.16.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AUser.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.16.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:31:50 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:37:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -188,12 +188,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoUser::acquire() throw(RuntimeException) +void SAL_CALL OAdoUser::acquire() throw() { OUser_TYPEDEF::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoUser::release() throw(RuntimeException) +void SAL_CALL OAdoUser::release() throw() { OUser_TYPEDEF::release(); } @@ -201,7 +201,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } @@ -209,7 +209,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); sal_Int32 nRights = 0; RightsEnum eRights = m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)); @@ -222,7 +222,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessGrant,RightsEnum(ADOS::mapRights2Ado(objPrivileges))); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } @@ -230,7 +230,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessRevoke,RightsEnum(ADOS::mapRights2Ado(objPrivileges))); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } @@ -239,7 +239,7 @@ void SAL_CALL OAdoUser::changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.ChangePassword(objPassword,newPassword); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } File [changed]: AView.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AView.cxx?r1=1.13&r2=1.13.22.1 Delta lines: +5 -5 ------------------- --- AView.cxx 8 Sep 2005 05:32:17 -0000 1.13 +++ AView.cxx 12 Jul 2006 10:38:00 -0000 1.13.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AView.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 05:32:17 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -132,12 +132,12 @@ OView_ADO::getFastPropertyValue(rValue,nHandle); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoView::acquire() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoView::acquire() throw() { OView_ADO::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoView::release() throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OAdoView::release() throw() { OView_ADO::release(); } File [changed]: Aolevariant.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/Aolevariant.cxx?r1=1.11&r2=1.11.12.1 Delta lines: +14 -11 --------------------- --- Aolevariant.cxx 23 Sep 2005 11:37:59 -0000 1.11 +++ Aolevariant.cxx 12 Jul 2006 10:38:00 -0000 1.11.12.1 @@ -4,9 +4,9 @@ * * $RCSfile: Aolevariant.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.12.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 11:37:59 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,7 +64,7 @@ } OLEString::OLEString(const ::rtl::OUString& _sBStr) { - m_sStr = ::SysAllocString(_sBStr); + m_sStr = ::SysAllocString(reinterpret_cast<LPCOLESTR>(_sBStr.getStr())); } OLEString::~OLEString() { @@ -75,7 +75,7 @@ { if(m_sStr) ::SysFreeString(m_sStr); - m_sStr = ::SysAllocString(_rSrc); + m_sStr = ::SysAllocString(reinterpret_cast<LPCOLESTR>(_rSrc.getStr())); return *this; } OLEString& OLEString::operator=(const OLEString& _rSrc) @@ -97,7 +97,7 @@ } OLEString::operator ::rtl::OUString() const { - return (m_sStr != NULL) ? ::rtl::OUString(m_sStr,::SysStringLen(m_sStr)) : ::rtl::OUString(); + return (m_sStr != NULL) ? ::rtl::OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : ::rtl::OUString(); } OLEString::operator BSTR() const { @@ -139,7 +139,7 @@ { ::VariantInit(this); vt = VT_BSTR; - bstrVal = SysAllocString(us); + bstrVal = SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); } OLEVariant::~OLEVariant() { @@ -299,7 +299,7 @@ HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); vt = VT_BSTR; - bstrVal = ::SysAllocString(us); + bstrVal = ::SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); } void OLEVariant::setNoArg() { @@ -399,7 +399,7 @@ OLEVariant::operator rtl::OUString() const { if (V_VT(this) == VT_BSTR) - return V_BSTR(this); + return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(this))); if(isNull()) return ::rtl::OUString(); @@ -408,7 +408,7 @@ varDest.ChangeType(VT_BSTR, this); - return V_BSTR(&varDest); + return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(&varDest))); } // ----------------------------------------------------------------------------- @@ -484,7 +484,10 @@ // ----------------------------------------------------------------------------- ::rtl::OUString OLEVariant::getString() const { - return isNull() ? ::rtl::OUString() : (rtl::OUString)*this; + if(isNull()) + return ::rtl::OUString(); + else + return *this; } // ----------------------------------------------------------------------------- sal_Bool OLEVariant::getBool() const File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/makefile.mk?r1=1.9&r2=1.9.136.1 Delta lines: +8 -6 ------------------- --- makefile.mk 8 Sep 2005 05:33:41 -0000 1.9 +++ makefile.mk 12 Jul 2006 10:38:00 -0000 1.9.136.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.136.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 05:33:41 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:38:00 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -85,6 +85,8 @@ $(SLO)$/adoimp.obj EXCEPTIONSFILES= \ + $(SLO)$/ADatabaseMetaDataImpl.obj \ + $(SLO)$/Aolevariant.obj \ $(SLO)$/ADatabaseMetaData.obj \ $(SLO)$/AColumn.obj \ $(SLO)$/AColumns.obj \ @@ -122,9 +124,9 @@ $(VOSLIB) \ $(OSLLIB) \ $(SALLIB) \ - ole32.lib \ - oleaut32.lib \ - uuid.lib \ + $(OLE32LIB) \ + $(OLEAUT32LIB) \ + $(UUIDLIB) \ $(DBTOOLSLIB) \ $(COMPHELPERLIB) Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.21&r2=1.21.110.1 Delta lines: +20 -4 -------------------- --- makefile.mk 21 Dec 2005 13:17:39 -0000 1.21 +++ makefile.mk 12 Jul 2006 10:38:00 -0000 1.21.110.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.21.110.1 $ # -# last change: $Author: obo $ $Date: 2005/12/21 13:17:39 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:38:00 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -68,8 +68,12 @@ .ENDIF .IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom +.ELSE LIB += $(MOZ_LIB) MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib +.ENDIF .ELSE "$(OS)"=="WNT" MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom .ENDIF @@ -167,6 +171,7 @@ SHL2VERSIONMAP= $(TARGET2).map SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR) SHL2OBJS=$(SLO2FILES) +.IF "$(OS)"=="WNT" SHL2STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -176,10 +181,21 @@ $(DBTOOLSLIB) \ $(COMPHELPERLIB) \ $(MOZ_LIB_XPCOM) +.ELSE +SHL2STDLIBS=\ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(VOSLIB) \ + $(OSLLIB) \ + $(SALLIB) \ + $(DBTOOLSLIB) \ + $(COMPHELPERLIB) \ + $(MOZ_LIB_XPCOM) +.ENDIF .IF "$(GUI)"=="WNT" SHL2STDLIBS += \ - shell32.lib + $(SHELL32LIB) .ENDIF # "$(GUI)"=="WNT" SHL2DEPN= Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk?r1=1.5&r2=1.5.22.1 Delta lines: +19 -3 -------------------- --- makefile.mk 8 Sep 2005 06:27:00 -0000 1.5 +++ makefile.mk 12 Jul 2006 10:38:00 -0000 1.5.22.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.22.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 06:27:00 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:38:00 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -98,6 +98,21 @@ -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content .IF "$(GUI)" == "WNT" +.IF "$(COM)" == "GCC" +INCPOST += $(MOZINC) +CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ + -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ + -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ + -DNS_MT_SUPPORTED -DNETLIB_THREAD \ + -DOJI -DWIN32 -D_X86_ -D_WINDOWS \ + -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \ + -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \ + -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL +CFLAGSCXX += \ + -fno-rtti -Wall -Wconversion -Wpointer-arith \ + -Wcast-align -Woverloaded-virtual -Wsynth \ + -Wno-long-long +.ELSE .IF "$(DBG_LEVEL)" == "0" INCPRE += $(MOZINC) CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ @@ -122,6 +137,7 @@ -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \ -UDEBUG CFLAGS += -Zi -GR- -W3 -Gy -MDd -UDEBUG +.ENDIF .ENDIF .ENDIF .IF "$(GUI)" == "UNX" Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?r1=1.17&r2=1.17.22.1 Delta lines: +19 -3 -------------------- --- makefile.mk 8 Sep 2005 06:31:02 -0000 1.17 +++ makefile.mk 12 Jul 2006 10:38:01 -0000 1.17.22.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.17.22.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 06:31:02 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:38:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -96,6 +96,21 @@ -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" +INCPOST += $(MOZINC) +CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ + -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ + -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ + -DNS_MT_SUPPORTED -DNETLIB_THREAD \ + -DOJI -DWIN32 -D_X86_ -D_WINDOWS \ + -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \ + -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \ + -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL +CFLAGSCXX += \ + -fno-rtti -Wall -Wconversion -Wpointer-arith \ + -Wcast-align -Woverloaded-virtual -Wsynth \ + -Wno-long-long +.ELSE .IF "$(DBG_LEVEL)" == "0" INCPRE += $(MOZINC) CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ @@ -120,6 +135,7 @@ -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \ -UDEBUG CFLAGS += -Zi -GR- -W3 -Gy -MDd -UDEBUG +.ENDIF .ENDIF .ENDIF .IF "$(GUI)" == "UNX" Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/makefile.mk?r1=1.14&r2=1.14.136.1 Delta lines: +4 -4 ------------------- --- makefile.mk 8 Sep 2005 06:36:23 -0000 1.14 +++ makefile.mk 12 Jul 2006 10:38:01 -0000 1.14.136.1 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.14.136.1 $ # -# last change: $Author: rt $ $Date: 2005/09/08 06:36:23 $ +# last change: $Author: vg $ $Date: 2006/07/12 10:38:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -110,7 +110,7 @@ $(SALLIB) .IF "$(ODBCBASELIB)" == "" -SHL2STDLIBS+= iodbcbase.lib +SHL2STDLIBS+= $(ODBCBASELIB) .ENDIF SHL2DEPN=$(SHL1TARGETN) Directory: /dba/connectivity/source/inc/ ======================================== File [changed]: OSubComponent.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/OSubComponent.hxx?r1=1.9&r2=1.9.136.1 Delta lines: +6 -5 ------------------- --- OSubComponent.hxx 8 Sep 2005 06:37:56 -0000 1.9 +++ OSubComponent.hxx 12 Jul 2006 10:38:01 -0000 1.9.136.1 @@ -4,9 +4,9 @@ * * $RCSfile: OSubComponent.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.136.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:37:56 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,13 +83,14 @@ protected: void dispose_ChildImpl() { - ::osl::MutexGuard aGuard( m_pDerivedImplementation->rBHelper.rMutex ); + // avoid ambiguity + ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex ); m_xParent = NULL; } void relase_ChildImpl() { ::connectivity::release(m_pDerivedImplementation->m_refCount, - m_pDerivedImplementation->rBHelper, + m_pDerivedImplementation->WEAK::rBHelper, m_xParent, m_pDerivedImplementation); Directory: /dba/connectivity/source/inc/ado/ ============================================ File [changed]: AConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/AConnection.hxx?r1=1.15&r2=1.15.22.1 Delta lines: +4 -4 ------------------- --- AConnection.hxx 8 Sep 2005 06:49:04 -0000 1.15 +++ AConnection.hxx 12 Jul 2006 10:38:02 -0000 1.15.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: AConnection.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:49:04 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -124,7 +124,7 @@ // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL release() throw(); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); File [changed]: ATable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/ATable.hxx?r1=1.10&r2=1.10.136.1 Delta lines: +5 -4 ------------------- --- ATable.hxx 8 Sep 2005 06:54:00 -0000 1.10 +++ ATable.hxx 12 Jul 2006 10:38:02 -0000 1.10.136.1 @@ -4,9 +4,9 @@ * * $RCSfile: ATable.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.136.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:54:00 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,7 @@ namespace ado { typedef connectivity::sdbcx::OTable OTable_TYPEDEF; + typedef connectivity::sdbcx::OTableDescriptor_BASE OTableDescriptor_BASE_TYPEDEF; class OAdoTable : public OTable_TYPEDEF { @@ -74,7 +75,7 @@ OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); - ::rtl::OUString SAL_CALL getName() { return m_Name; } + ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException) { return m_Name; } ::rtl::OUString getSchema() const { return m_SchemaName; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; // com::sun::star::lang::XUnoTunnel File [changed]: AUser.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/AUser.hxx?r1=1.7&r2=1.7.136.1 Delta lines: +4 -3 ------------------- --- AUser.hxx 8 Sep 2005 06:54:35 -0000 1.7 +++ AUser.hxx 12 Jul 2006 10:38:02 -0000 1.7.136.1 @@ -4,9 +4,9 @@ * * $RCSfile: AUser.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.136.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:54:35 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,7 @@ { class OCatalog; typedef connectivity::sdbcx::OUser OUser_TYPEDEF; + typedef connectivity::sdbcx::OUser_BASE OUser_BASE_TYPEDEF; class OAdoUser : public OUser_TYPEDEF { File [changed]: Aolevariant.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/Aolevariant.hxx?r1=1.9&r2=1.9.22.1 Delta lines: +6 -3 ------------------- --- Aolevariant.hxx 8 Sep 2005 06:55:37 -0000 1.9 +++ Aolevariant.hxx 12 Jul 2006 10:38:02 -0000 1.9.22.1 @@ -4,9 +4,9 @@ * * $RCSfile: Aolevariant.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.22.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:55:37 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,6 +37,9 @@ #ifndef _SAL_TYPES_H_ #include <sal/types.h> +#endif +#ifdef __MINGW32__ +#include <windows.h> #endif #include <oaidl.h> #ifndef _RTL_USTRING_HXX_ File [changed]: Aolewrap.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/Aolewrap.hxx?r1=1.10&r2=1.10.136.1 Delta lines: +11 -11 --------------------- --- Aolewrap.hxx 8 Sep 2005 06:55:54 -0000 1.10 +++ Aolewrap.hxx 12 Jul 2006 10:38:02 -0000 1.10.136.1 @@ -4,9 +4,9 @@ * * $RCSfile: Aolewrap.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.136.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:55:54 $ + * last change: $Author: vg $ $Date: 2006/07/12 10:38:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -166,12 +166,12 @@ ////////////////////////////////////////////////////////////////////// - inline void Refresh(){pInterface->Refresh();} + inline void Refresh(){WpOLEBase<Ts>::pInterface->Refresh();} inline sal_Int32 GetItemCount() const { sal_Int32 nCount = 0; - return pInterface ? (SUCCEEDED(pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); + return WpOLEBase<Ts>::pInterface ? (SUCCEEDED(WpOLEBase<Ts>::pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); } inline WrapT GetItem(sal_Int32 index) const @@ -179,7 +179,7 @@ OSL_ENSURE(index >= 0 && index<GetItemCount(),"Wrong index for field!"); T* pT = NULL; WrapT aRet(NULL); - if(SUCCEEDED(pInterface->get_Item(OLEVariant(index), &pT))) + if(SUCCEEDED(WpOLEBase<Ts>::pInterface->get_Item(OLEVariant(index), &pT))) aRet.setWithOutAddRef(pT); return aRet; } @@ -188,7 +188,7 @@ { T* pT = NULL; WrapT aRet(NULL); - if(SUCCEEDED(pInterface->get_Item(index, &pT))) + if(SUCCEEDED(WpOLEBase<Ts>::pInterface->get_Item(index, &pT))) aRet.setWithOutAddRef(pT); return aRet; } @@ -197,7 +197,7 @@ { WrapT aRet(NULL); T* pT = NULL; - if (FAILED(pInterface->get_Item(OLEVariant(sStr), &pT))) + if (FAILED(WpOLEBase<Ts>::pInterface->get_Item(OLEVariant(sStr), &pT))) { #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTemp("Unknown Item: "); @@ -211,7 +211,7 @@ } inline void fillElementNames(TStringVector& _rVector) { - if(IsValid()) + if(WpOLEBase<Ts>::IsValid()) { Refresh(); sal_Int32 nCount = GetItemCount(); @@ -241,12 +241,12 @@ inline sal_Bool Append(const WrapT& aWrapT) { - return SUCCEEDED(pInterface->Append(OLEVariant((T*)aWrapT))); + return SUCCEEDED(WpOLEBase<Ts>::pInterface->Append(OLEVariant((T*)aWrapT))); }; inline sal_Bool Delete(const ::rtl::OUString& sName) { - return SUCCEEDED(pInterface->Delete(OLEVariant(sName))); + return SUCCEEDED(WpOLEBase<Ts>::pInterface->Delete(OLEVariant(sName))); }; Directory: /dba/connectivity/source/parse/ ========================================== File [changed]: sqlflex.l Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlflex.l?r1=1.28&r2=1.28.12.1 Delta lines: +0 -0 ------------------- --- sqlflex.l 23 Sep 2005 11:42:24 -0000 1.28 +++ sqlflex.l 12 Jul 2006 10:38:03 -0000 1.28.12.1 @@ -2,7 +2,7 @@ //-------------------------------------------------------------------------- // -// $Header: dba/connectivity/source/parse/sqlflex.l,v 1.28 2005/09/23 11:42:24 hr Exp $ +// $Header: dba/connectivity/source/parse/sqlflex.l,v 1.28.12.1 2006/07/12 10:38:03 vg Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -10,7 +10,7 @@ // OJ // // Last change: -// $Author: hr $ $Date: 2005/09/23 11:42:24 $ $Revision: 1.28 $ +// $Author: vg $ $Date: 2006/07/12 10:38:03 $ $Revision: 1.28.12.1 $ // // Description: // --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
