Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:29:19 Modified: dba/connectivity/source/commontools/dbtools.cxx
Log: RESYNC: (1.59-1.60); FILE MERGED File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.57.14.2&r2=1.57.14.3 Delta lines: +28 -66 --------------------- --- dbtools.cxx 20 Mar 2006 11:07:38 -0000 1.57.14.2 +++ dbtools.cxx 4 Jul 2006 07:29:16 -0000 1.57.14.3 @@ -42,6 +42,9 @@ #ifndef _DBHELPER_DBCONVERSION_HXX_ #include <connectivity/dbconversion.hxx> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> @@ -179,6 +182,9 @@ #ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include <com/sun/star/sdbc/XParameters.hpp> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #include <algorithm> using namespace ::comphelper; @@ -867,6 +873,8 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule) { OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!"); + OSL_ENSURE( _eComposeRule == eInDataManipulation, "qualifiedNameComponents: un-implemented case!" ); + OSL_UNUSED( _eComposeRule ); ::rtl::OUString sSeparator = _rxConnMetaData->getCatalogSeparator(); ::rtl::OUString sName(_rQualifiedName); @@ -994,7 +1002,7 @@ } catch(IllegalArgumentException& e) { - e; + OSL_UNUSED( e ); #ifdef DBG_UTIL ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("TransferFormComponentProperties : could not transfer the value for property \""); sMessage += pResult->Name; @@ -1421,56 +1429,6 @@ return xReturn; } -namespace -{ - class OMetaDataWrapper - { - const Reference< XDatabaseMetaData > m_xMetaData; - public: - OMetaDataWrapper(const Reference< XDatabaseMetaData >& _xMetaData) : m_xMetaData(_xMetaData){} - - bool supportsSchemasInDataManipulation( ) - { - return m_xMetaData->supportsSchemasInDataManipulation() ? true : false; - } - bool supportsSchemasInProcedureCalls( ) - { - return m_xMetaData->supportsSchemasInProcedureCalls() ? true : false; - } - bool supportsSchemasInTableDefinitions( ) - { - return m_xMetaData->supportsSchemasInTableDefinitions() ? true : false; - } - bool supportsSchemasInIndexDefinitions( ) - { - return m_xMetaData->supportsSchemasInIndexDefinitions() ? true : false; - } - bool supportsSchemasInPrivilegeDefinitions( ) - { - return m_xMetaData->supportsSchemasInPrivilegeDefinitions() ? true : false; - } - bool supportsCatalogsInDataManipulation( ) - { - return m_xMetaData->supportsCatalogsInDataManipulation() ? true : false; - } - bool supportsCatalogsInProcedureCalls( ) - { - return m_xMetaData->supportsCatalogsInProcedureCalls() ? true : false; - } - bool supportsCatalogsInTableDefinitions( ) - { - return m_xMetaData->supportsCatalogsInTableDefinitions() ? true : false; - } - bool supportsCatalogsInIndexDefinitions( ) - { - return m_xMetaData->supportsCatalogsInIndexDefinitions() ? true : false; - } - bool supportsCatalogsInPrivilegeDefinitions( ) - { - return m_xMetaData->supportsCatalogsInPrivilegeDefinitions() ? true : false; - } - }; -} //-------------------------------------------------------------------------- void composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData, const ::rtl::OUString& _rCatalog, @@ -1487,26 +1445,31 @@ return; // just to be save here OSL_ENSURE(_rName.getLength(), "composeTableName : at least the name should be non-empty !"); - ::std::mem_fun_t<bool,OMetaDataWrapper> aCatalogCall = ::std::mem_fun(&OMetaDataWrapper::supportsCatalogsInDataManipulation); - ::std::mem_fun_t<bool,OMetaDataWrapper> aSchemaCall = ::std::mem_fun(&OMetaDataWrapper::supportsSchemasInDataManipulation); + typedef sal_Bool (SAL_CALL XDatabaseMetaData::*GetBooleanMetaData)(); + GetBooleanMetaData catalogUsage = &XDatabaseMetaData::supportsCatalogsInDataManipulation; + GetBooleanMetaData schemaUsage = &XDatabaseMetaData::supportsSchemasInDataManipulation; switch ( _eComposeRule ) { case eInTableDefinitions: - aCatalogCall = ::std::mem_fun(&OMetaDataWrapper::supportsCatalogsInTableDefinitions); - aSchemaCall = ::std::mem_fun(&OMetaDataWrapper::supportsSchemasInTableDefinitions); + catalogUsage = &XDatabaseMetaData::supportsCatalogsInTableDefinitions; + schemaUsage = &XDatabaseMetaData::supportsSchemasInTableDefinitions; break; case eInIndexDefinitions: - aCatalogCall = ::std::mem_fun(&OMetaDataWrapper::supportsCatalogsInIndexDefinitions); - aSchemaCall = ::std::mem_fun(&OMetaDataWrapper::supportsSchemasInIndexDefinitions); + catalogUsage = &XDatabaseMetaData::supportsCatalogsInIndexDefinitions; + schemaUsage = &XDatabaseMetaData::supportsSchemasInIndexDefinitions; break; case eInProcedureCalls: - aCatalogCall = ::std::mem_fun(&OMetaDataWrapper::supportsCatalogsInProcedureCalls); - aSchemaCall = ::std::mem_fun(&OMetaDataWrapper::supportsSchemasInProcedureCalls); + catalogUsage = &XDatabaseMetaData::supportsCatalogsInProcedureCalls; + schemaUsage = &XDatabaseMetaData::supportsSchemasInProcedureCalls; break; case eInPrivilegeDefinitions: - aCatalogCall = ::std::mem_fun(&OMetaDataWrapper::supportsCatalogsInPrivilegeDefinitions); - aSchemaCall = ::std::mem_fun(&OMetaDataWrapper::supportsSchemasInPrivilegeDefinitions); + catalogUsage = &XDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions; + schemaUsage = &XDatabaseMetaData::supportsSchemasInPrivilegeDefinitions; + break; + case eInDataManipulation: + catalogUsage = &XDatabaseMetaData::supportsCatalogsInDataManipulation; + schemaUsage = &XDatabaseMetaData::supportsSchemasInDataManipulation; break; } @@ -1517,11 +1480,10 @@ static ::rtl::OUString sEmpty; static ::rtl::OUString sSeparator = ::rtl::OUString::createFromAscii("."); - OMetaDataWrapper aWrapper(_rxMetaData); _rComposedName = sEmpty; ::rtl::OUString sCatalogSep; sal_Bool bCatlogAtStart = sal_True; - if ( _bUseCatalogInSelect && _rCatalog.getLength() && aCatalogCall(&aWrapper) ) + if ( _bUseCatalogInSelect && _rCatalog.getLength() && (_rxMetaData.get()->*catalogUsage)() ) { sCatalogSep = _rxMetaData->getCatalogSeparator(); bCatlogAtStart = _rxMetaData->isCatalogAtStart(); @@ -1533,7 +1495,7 @@ } } - if ( _bUseSchemaInSelect && _rSchema.getLength() && aSchemaCall(&aWrapper) ) + if ( _bUseSchemaInSelect && _rSchema.getLength() && (_rxMetaData.get()->*schemaUsage)() ) { QUOTE(_rComposedName,_rSchema); _rComposedName += sSeparator; @@ -1541,7 +1503,7 @@ QUOTE(_rComposedName,_rName); - if ( _bUseCatalogInSelect && _rCatalog.getLength() && !bCatlogAtStart && sCatalogSep.getLength() && aCatalogCall(&aWrapper) ) + if ( _bUseCatalogInSelect && _rCatalog.getLength() && !bCatlogAtStart && sCatalogSep.getLength() && (_rxMetaData.get()->*catalogUsage)() ) { _rComposedName += sCatalogSep; QUOTE(_rComposedName,_rCatalog); @@ -1899,7 +1861,7 @@ sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, - sal_Int32 scale) throw(SQLException, RuntimeException) + sal_Int32 /*scale*/) throw(SQLException, RuntimeException) { if(!x.hasValue()) _xParams->setNull(parameterIndex,sqlType); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
