User: hr Date: 06/06/19 19:10:37 Modified: /dba/connectivity/source/sdbcx/ VIndex.cxx
Log: INTEGRATION: CWS warnings01 (1.15.30); FILE MERGED 2006/06/14 10:56:24 fs 1.15.30.3: #i66367# reverted previous changes related to replacing IdPropertyArrayHelper with PropertyArrayHelper - there's a subtle difference between both ids ... 2005/11/16 12:59:32 fs 1.15.30.2: #i57457# warning free code 2005/11/07 14:44:16 fs 1.15.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/sdbcx/ ========================================== File [changed]: VIndex.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VIndex.cxx?r1=1.15&r2=1.16 Delta lines: +20 -19 --------------------- --- VIndex.cxx 8 Sep 2005 07:43:41 -0000 1.15 +++ VIndex.cxx 20 Jun 2006 02:10:35 -0000 1.16 @@ -42,6 +42,9 @@ #ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ #include "connectivity/sdbcx/VColumn.hxx" #endif +#ifndef _DBHELPER_DBEXCEPTION_HXX_ +#include <connectivity/dbexception.hxx> +#endif #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> #endif @@ -52,10 +55,11 @@ #include "TConnection.hxx" #endif // ------------------------------------------------------------------------- -using namespace connectivity; -using namespace connectivity; -using namespace connectivity::sdbcx; -using namespace cppu; +using namespace ::connectivity; +using namespace ::connectivity; +using namespace ::dbtools; +using namespace ::connectivity::sdbcx; +using namespace ::cppu; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -95,10 +99,10 @@ // ------------------------------------------------------------------------- OIndex::OIndex(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True) - , m_pColumns(NULL) ,m_IsUnique(sal_False) - ,m_IsClustered(sal_False) ,m_IsPrimaryKeyIndex(sal_False) + ,m_IsClustered(sal_False) + ,m_pColumns(NULL) { } // ------------------------------------------------------------------------- @@ -109,11 +113,11 @@ sal_Bool _isClustered, sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) - ,m_pColumns(NULL) ,m_Catalog(_Catalog) ,m_IsUnique(_isUnique) ,m_IsPrimaryKeyIndex(_isPrimaryKeyIndex) ,m_IsClustered(_isClustered) + ,m_pColumns(NULL) { m_Name = _Name; } @@ -123,12 +127,9 @@ delete m_pColumns; } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* OIndex::createArrayHelper( sal_Int32 _nId) const +::cppu::IPropertyArrayHelper* OIndex::createArrayHelper( sal_Int32 /*_nId*/ ) const { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; - describeProperties(aProps); - changePropertyAttributte(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); + return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper& SAL_CALL OIndex::getInfoHelper() @@ -195,7 +196,7 @@ } catch( const Exception& ) { - // allowed + OSL_ENSURE( false, "OIndex::getColumns: caught an exception!" ); } return const_cast<OIndex*>(this)->m_pColumns; @@ -220,7 +221,7 @@ return m_Name; } // ----------------------------------------------------------------------------- -void SAL_CALL OIndex::setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OIndex::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
