diff options
Diffstat (limited to 'connectivity/source/commontools')
40 files changed, 681 insertions, 681 deletions
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx index 99bdeee12131..047a30b39d33 100644 --- a/connectivity/source/commontools/AutoRetrievingBase.cxx +++ b/connectivity/source/commontools/AutoRetrievingBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ namespace connectivity ::rtl::OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const ::rtl::OUString& _sInsertStatement) const { ::rtl::OUString sStmt = _sInsertStatement; - OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. isAutoRetrievingEnabled is false!"); + OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. isAutoRetrievingEnabled is false!"); sStmt = sStmt.toAsciiUpperCase(); ::rtl::OUString sStatement; if ( sStmt.compareToAscii("INSERT",6) == 0 ) @@ -60,7 +60,7 @@ namespace connectivity sStmt = sStmt.copy(1); } while (sStmt.indexOf(' ') == 0 ); - + nIntoIndex = 0; ::rtl::OUString sTableName = sStmt.getToken(0,' ',nIntoIndex); sStatement = sStatement.replaceAt(nIndex,sTable.getLength(),sTableName); diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx index 48681b61e1f9..7de16e76d2f9 100644 --- a/connectivity/source/commontools/BlobHelper.cxx +++ b/connectivity/source/commontools/BlobHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,13 +59,13 @@ BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) // ----------------------------------------------------------------------------- ::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this ); + ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this ); return 0; } // ----------------------------------------------------------------------------- ::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); + ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); return 0; } diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index fd0da2f093e5..2d3368fec703 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace connectivity using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace dbtools; - namespace starjava = com::sun::star::java; + namespace starjava = com::sun::star::java; //------------------------------------------------------------------------------ const sal_Unicode CHAR_PLACE = '_'; const sal_Unicode CHAR_WILD = '%'; @@ -280,7 +280,7 @@ namespace connectivity if ( _pJVM.is() ) { jvmaccess::VirtualMachine::AttachGuard aGuard(_pJVM); - JNIEnv* pEnv = aGuard.getEnvironment(); + JNIEnv* pEnv = aGuard.getEnvironment(); if( pEnv ) { ::rtl::OString sClassName = ::rtl::OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US); @@ -296,7 +296,7 @@ namespace connectivity } -#include <ctype.h> //isdigit +#include <ctype.h> //isdigit namespace dbtools { //------------------------------------------------------------------ @@ -320,10 +320,10 @@ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSp if(!isCharOk(*pStr,_rSpecials)) return sal_False; - if ( rName.getLength() - && ( (rName.toChar() == '_') - || ( (rName.toChar() >= '0') - && (rName.toChar() <= '9') + if ( rName.getLength() + && ( (rName.toChar() == '_') + || ( (rName.toChar() >= '0') + && (rName.toChar() <= '9') ) ) ) diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 18252103945b..74ca78a4e48f 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect m_xUnoTunnel.set(m_xConnection,UNO_QUERY); m_xServiceInfo.set(m_xConnection,UNO_QUERY); - Reference< XProxyFactory > xProxyFactory(_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),UNO_QUERY); + Reference< XProxyFactory > xProxyFactory(_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),UNO_QUERY); Reference< XAggregation > xConProxy = xProxyFactory->createProxy(_xConnection); if (xConProxy.is()) { diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 3f5093c3a225..0726db320ca0 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -149,10 +149,10 @@ using namespace ::com::sun::star::beans; // check if this is really a timestamp or only a date if ( bOk ) { - if (bQuote) + if (bQuote) aRet.appendAscii("{TS '"); aRet.append(DBTypeConversion::toDateTimeString(aDateTime)); - if (bQuote) + if (bQuote) aRet.appendAscii("'}"); break; } @@ -179,12 +179,12 @@ using namespace ::com::sun::star::beans; else bOk = _rVal >>= aDate; OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not date!"); - if (bQuote) + if (bQuote) aRet.appendAscii("{D '"); aRet.append(DBTypeConversion::toDateString(aDate)); - if (bQuote) + if (bQuote) aRet.appendAscii("'}"); - } break; + } break; case DataType::TIME: { Time aTime; @@ -206,10 +206,10 @@ using namespace ::com::sun::star::beans; else bOk = _rVal >>= aTime; OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal is not time!"); - if (bQuote) + if (bQuote) aRet.appendAscii("{T '"); aRet.append(DBTypeConversion::toTimeString(aTime)); - if (bQuote) + if (bQuote) aRet.appendAscii("'}"); } break; } @@ -271,7 +271,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, // und noch eine Sonderbehandlung, diesmal fuer Prozent-Formate if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass)) - { // die Formatierung soll eigentlich als Prozent erfolgen, aber der String stellt nur eine + { // die Formatierung soll eigentlich als Prozent erfolgen, aber der String stellt nur eine // einfache Nummer dar -> anpassen ::rtl::OUString sExpanded(rString); static ::rtl::OUString s_sPercentSymbol = ::rtl::OUString::createFromAscii("%"); @@ -286,7 +286,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, case NumberFormat::DATETIME: case NumberFormat::TIME: DBTypeConversion::setValue(xVariant,rNullDate,fValue,nRealUsedTypeClass); - // xVariant->updateDouble(toStandardDbDate(rNullDate, fValue)); + // xVariant->updateDouble(toStandardDbDate(rNullDate, fValue)); break; case NumberFormat::CURRENCY: case NumberFormat::NUMBER: @@ -339,27 +339,27 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, default: { double nValue = rValue; -// Reference<XPropertySet> xProp(xVariant,UNO_QUERY); -// if ( xProp.is() -// && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) -// && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) ) -// { -// switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) -// { -// case DataType::TINYINT: -// nValue = static_cast<sal_uInt8>(rValue); -// break; -// case DataType::SMALLINT: -// nValue = static_cast<sal_uInt16>(rValue); -// break; -// case DataType::INTEGER: -// nValue = static_cast<sal_uInt32>(rValue); -// break; -// case DataType::BIGINT: -// nValue = static_cast<sal_uInt64>(rValue); -// break; -// } -// } +// Reference<XPropertySet> xProp(xVariant,UNO_QUERY); +// if ( xProp.is() +// && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) +// && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) ) +// { +// switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) +// { +// case DataType::TINYINT: +// nValue = static_cast<sal_uInt8>(rValue); +// break; +// case DataType::SMALLINT: +// nValue = static_cast<sal_uInt16>(rValue); +// break; +// case DataType::INTEGER: +// nValue = static_cast<sal_uInt32>(rValue); +// break; +// case DataType::BIGINT: +// nValue = static_cast<sal_uInt64>(rValue); +// break; +// } +// } xVariant->updateDouble(nValue); } } @@ -383,8 +383,8 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant, default: { Reference<XPropertySet> xProp(xVariant,UNO_QUERY); - if ( xProp.is() - && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) + if ( xProp.is() + && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) ) { switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) @@ -497,13 +497,13 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant, double fValue = xVariant->getDouble(); if (!xVariant->wasNull()) aString = xFormatter->convertNumberToString(nKey, fValue); - } break; + } break; case NumberFormat::CURRENCY: { double fValue = xVariant->getDouble(); if (!xVariant->wasNull()) aString = xFormatter->getInputString(nKey, fValue); - } break; + } break; case NumberFormat::TEXT: aString = xFormatter->formatString(nKey, xVariant->getString()); break; diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index cc19bce60abb..12564203dd36 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ using namespace connectivity; using namespace utl; using namespace ::com::sun::star; -namespace +namespace { void lcl_convert(const uno::Sequence< ::rtl::OUString >& _aSource,uno::Any& _rDest) { @@ -101,7 +101,7 @@ namespace } } // ----------------------------------------------------------------------------- -DriversConfigImpl::DriversConfigImpl() +DriversConfigImpl::DriversConfigImpl() { } // ----------------------------------------------------------------------------- @@ -174,7 +174,7 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) sOldPattern = aIter->first; } } - + return sRet; } // ----------------------------------------------------------------------------- @@ -194,7 +194,7 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) sOldPattern = aIter->first; } } - + return sRet; } // ----------------------------------------------------------------------------- @@ -215,7 +215,7 @@ const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const ::rtl // ----------------------------------------------------------------------------- const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const { - const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); + const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); const ::comphelper::NamedValueCollection* pRet = NULL; ::rtl::OUString sOldPattern; TInstalledDrivers::const_iterator aIter = rDrivers.begin(); diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 9afa80803867..cc57466d7cc0 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,9 +93,9 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } // ----------------------------------------------------------------------------- @@ -130,7 +130,7 @@ void ODatabaseMetaDataResultSet::disposing(void) OPropertySetHelper::disposing(); ::osl::MutexGuard aGuard(m_aMutex); - m_aStatement = NULL; + m_aStatement = NULL; m_xMetaData.clear(); m_aRowsIter = m_aRows.end(); m_aRows.clear(); @@ -155,7 +155,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -877,7 +877,7 @@ namespace &cppu::createSingleComponentFactory, 0, 0 }, { &ParameterSubstitution::create, &ParameterSubstitution::getImplementationName_Static, &ParameterSubstitution::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } using ::rtl::OUString; @@ -911,6 +911,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implNam return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } -} // extern "C" +} // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index 7113ed87c573..baa6dd20390b 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -183,8 +183,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 co sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { -// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) -// return (*m_mColumnsIter).second.isReadOnly(); +// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +// return (*m_mColumnsIter).second.isReadOnly(); return sal_True; } @@ -192,8 +192,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*co sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { -// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) -// return (*m_mColumnsIter).second.isDefinitelyWritable(); +// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +// return (*m_mColumnsIter).second.isDefinitelyWritable(); return sal_False; ; @@ -201,8 +201,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_ // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { -// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) -// return (*m_mColumnsIter).second.isWritable(); +// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +// return (*m_mColumnsIter).second.isWritable(); return isDefinitelyWritable(column); } // ------------------------------------------------------------------------- @@ -255,7 +255,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnMap() void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { setColumnMap(); - + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"), ColumnValue::NO_NULLS, 0,0,0, diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index ae67f54233ae..5e020b71c931 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,49 +64,49 @@ namespace { case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - bIsCompatible = (DataType::CHAR == _eType2) - || (DataType::VARCHAR == _eType2) - || (DataType::DECIMAL == _eType2) - || (DataType::NUMERIC == _eType2) - || (DataType::LONGVARCHAR == _eType2); + bIsCompatible = (DataType::CHAR == _eType2) + || (DataType::VARCHAR == _eType2) + || (DataType::DECIMAL == _eType2) + || (DataType::NUMERIC == _eType2) + || (DataType::LONGVARCHAR == _eType2); break; case DataType::DOUBLE: case DataType::REAL: - bIsCompatible = (DataType::DOUBLE == _eType2) - || (DataType::REAL == _eType2); + bIsCompatible = (DataType::DOUBLE == _eType2) + || (DataType::REAL == _eType2); break; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: - bIsCompatible = (DataType::BINARY == _eType2) - || (DataType::VARBINARY == _eType2) - || (DataType::LONGVARBINARY == _eType2); + bIsCompatible = (DataType::BINARY == _eType2) + || (DataType::VARBINARY == _eType2) + || (DataType::LONGVARBINARY == _eType2); break; case DataType::INTEGER: - bIsCompatible = (DataType::SMALLINT == _eType2) - || (DataType::TINYINT == _eType2) - || (DataType::BIT == _eType2) - || (DataType::BOOLEAN == _eType2); + bIsCompatible = (DataType::SMALLINT == _eType2) + || (DataType::TINYINT == _eType2) + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::SMALLINT: - bIsCompatible = (DataType::TINYINT == _eType2) - || (DataType::BIT == _eType2) - || (DataType::BOOLEAN == _eType2); + bIsCompatible = (DataType::TINYINT == _eType2) + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::TINYINT: - bIsCompatible = (DataType::BIT == _eType2) - || (DataType::BOOLEAN == _eType2); + bIsCompatible = (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::BLOB: case DataType::CLOB: case DataType::OBJECT: - bIsCompatible = (DataType::BLOB == _eType2) - || (DataType::CLOB == _eType2) - || (DataType::OBJECT == _eType2); + bIsCompatible = (DataType::BLOB == _eType2) + || (DataType::CLOB == _eType2) + || (DataType::OBJECT == _eType2); break; default: @@ -127,8 +127,8 @@ namespace tracing { struct AllocationType { - const sal_Char* pName; - sal_Int32 nAllocatedUnits; + const sal_Char* pName; + sal_Int32 nAllocatedUnits; AllocationType( ) : pName( NULL ), nAllocatedUnits( 0 ) { } }; @@ -137,23 +137,23 @@ namespace tracing class AllocationTracer { public: - typedef ::std::vector< AllocationType > AllocationState; - static AllocationState s_aAllocated; - static ::osl::Mutex s_aMutex; + typedef ::std::vector< AllocationType > AllocationState; + static AllocationState s_aAllocated; + static ::osl::Mutex s_aMutex; public: static void registerUnit( const sal_Char* _pName ); static void revokeUnit( const sal_Char* _pName ); private: - static AllocationState::iterator getLocation( const sal_Char* _pName ); + static AllocationState::iterator getLocation( const sal_Char* _pName ); }; // ============================================================================= - AllocationTracer::AllocationState::iterator AllocationTracer::getLocation( const sal_Char* _pName ) + AllocationTracer::AllocationState::iterator AllocationTracer::getLocation( const sal_Char* _pName ) { AllocationState::iterator aLookFor = s_aAllocated.begin(); - for ( ; + for ( ; aLookFor != s_aAllocated.end(); ++aLookFor ) @@ -165,13 +165,13 @@ namespace tracing // not found s_aAllocated.push_back( AllocationType() ); aLookFor = s_aAllocated.end(); --aLookFor; - aLookFor->pName = _pName; // note that this assumes that _pName is a constant string .... + aLookFor->pName = _pName; // note that this assumes that _pName is a constant string .... return aLookFor; } // ============================================================================= - AllocationTracer::AllocationState AllocationTracer::s_aAllocated; - ::osl::Mutex AllocationTracer::s_aMutex; + AllocationTracer::AllocationState AllocationTracer::s_aAllocated; + ::osl::Mutex AllocationTracer::s_aMutex; // ============================================================================= void AllocationTracer::registerUnit( const sal_Char* _pName ) @@ -191,8 +191,8 @@ namespace tracing --aPos->nAllocatedUnits; } -#define TRACE_ALLOC( type ) tracing::AllocationTracer::registerUnit( #type ); -#define TRACE_FREE( type ) tracing::AllocationTracer::revokeUnit( #type ); +#define TRACE_ALLOC( type ) tracing::AllocationTracer::registerUnit( #type ); +#define TRACE_FREE( type ) tracing::AllocationTracer::revokeUnit( #type ); } #else #define TRACE_ALLOC( type ) @@ -373,9 +373,9 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) if ( m_eTypeKind != _rRH.m_eTypeKind || (_rRH.m_bNull && !m_bNull) || m_bSigned != _rRH.m_bSigned) free(); - m_bBound = _rRH.m_bBound; - m_eTypeKind = _rRH.m_eTypeKind; - m_bSigned = _rRH.m_bSigned; + m_bBound = _rRH.m_bBound; + m_eTypeKind = _rRH.m_eTypeKind; + m_bSigned = _rRH.m_bSigned; if(m_bNull && !_rRH.m_bNull) { @@ -392,7 +392,7 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) case DataType::BIGINT: if ( _rRH.m_bSigned ) { - m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( sal_Int64 ) } else @@ -402,59 +402,59 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) } break; case DataType::FLOAT: - m_aValue.m_pValue = new float(*(float*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new float(*(float*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( float ) break; case DataType::DOUBLE: case DataType::REAL: - m_aValue.m_pValue = new double(*(double*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new double(*(double*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( double ) break; case DataType::DATE: - m_aValue.m_pValue = new Date(*(Date*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Date(*(Date*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Date ) break; case DataType::TIME: - m_aValue.m_pValue = new Time(*(Time*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Time(*(Time*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Time ) break; case DataType::TIMESTAMP: - m_aValue.m_pValue = new DateTime(*(DateTime*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new DateTime(*(DateTime*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( DateTime ) break; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: - m_aValue.m_pValue = new Sequence<sal_Int8>(*(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Sequence<sal_Int8>(*(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Sequence_sal_Int8 ) break; case DataType::BIT: case DataType::BOOLEAN: - m_aValue.m_bBool = _rRH.m_aValue.m_bBool; + m_aValue.m_bBool = _rRH.m_aValue.m_bBool; break; case DataType::TINYINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; + m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; else - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; break; case DataType::SMALLINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; else - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; break; case DataType::INTEGER: if ( _rRH.m_bSigned ) - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; else { - m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( sal_Int64 ) } break; default: - m_aValue.m_pValue = new Any(*(Any*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Any(*(Any*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Any ) } } @@ -498,34 +498,34 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) break; case DataType::BIT: case DataType::BOOLEAN: - m_aValue.m_bBool = _rRH.m_aValue.m_bBool; + m_aValue.m_bBool = _rRH.m_aValue.m_bBool; break; case DataType::TINYINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; + m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; else - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; break; case DataType::SMALLINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; else - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; break; case DataType::INTEGER: if ( _rRH.m_bSigned ) - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; else *static_cast<sal_Int64*>(m_aValue.m_pValue) = *(sal_Int64*)_rRH.m_aValue.m_pValue; break; default: - (*(Any*)m_aValue.m_pValue) = (*(Any*)_rRH.m_aValue.m_pValue); + (*(Any*)m_aValue.m_pValue) = (*(Any*)_rRH.m_aValue.m_pValue); } } - m_bNull = _rRH.m_bNull; + m_bNull = _rRH.m_bNull; // OJ: BUGID: 96277 - m_eTypeKind = _rRH.m_eTypeKind; + m_eTypeKind = _rRH.m_eTypeKind; return *this; } @@ -1009,8 +1009,8 @@ Any ORowSetValue::makeAny() const { ::rtl::OUStringBuffer sVal = ::rtl::OUString::createFromAscii("0x"); Sequence<sal_Int8> aSeq(getSequence()); - const sal_Int8* pBegin = aSeq.getConstArray(); - const sal_Int8* pEnd = pBegin + aSeq.getLength(); + const sal_Int8* pBegin = aSeq.getConstArray(); + const sal_Int8* pEnd = pBegin + aSeq.getLength(); for(;pBegin != pEnd;++pBegin) sVal.append((sal_Int32)*pBegin,16); aRet = sVal.makeStringAndClear(); @@ -1062,7 +1062,7 @@ Any ORowSetValue::makeAny() const return aRet; } // ------------------------------------------------------------------------- -sal_Bool ORowSetValue::getBool() const +sal_Bool ORowSetValue::getBool() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getBool" ); sal_Bool bRet = sal_False; @@ -1091,7 +1091,7 @@ sal_Bool ORowSetValue::getBool() const // run through case DataType::DECIMAL: case DataType::NUMERIC: - + bRet = ::rtl::OUString(m_aValue.m_pString).toInt32() != 0; break; case DataType::BIGINT: @@ -1139,7 +1139,7 @@ sal_Bool ORowSetValue::getBool() const return bRet; } // ------------------------------------------------------------------------- -sal_Int8 ORowSetValue::getInt8() const +sal_Int8 ORowSetValue::getInt8() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getInt8" ); @@ -1212,7 +1212,7 @@ sal_Int8 ORowSetValue::getInt8() const return nRet; } // ------------------------------------------------------------------------- -sal_Int16 ORowSetValue::getInt16() const +sal_Int16 ORowSetValue::getInt16() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getInt16" ); @@ -1285,7 +1285,7 @@ sal_Int16 ORowSetValue::getInt16() const return nRet; } // ------------------------------------------------------------------------- -sal_Int32 ORowSetValue::getInt32() const +sal_Int32 ORowSetValue::getInt32() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getInt32" ); sal_Int32 nRet = 0; @@ -1358,7 +1358,7 @@ sal_Int32 ORowSetValue::getInt32() const return nRet; } // ------------------------------------------------------------------------- -sal_Int64 ORowSetValue::getLong() const +sal_Int64 ORowSetValue::getLong() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getLong" ); sal_Int64 nRet = 0; @@ -1431,7 +1431,7 @@ sal_Int64 ORowSetValue::getLong() const return nRet; } // ------------------------------------------------------------------------- -float ORowSetValue::getFloat() const +float ORowSetValue::getFloat() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getFloat" ); float nRet = 0; @@ -1508,7 +1508,7 @@ float ORowSetValue::getFloat() const return nRet; } // ------------------------------------------------------------------------- -double ORowSetValue::getDouble() const +double ORowSetValue::getDouble() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDouble" ); @@ -1681,7 +1681,7 @@ void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype) m_eTypeKind = _nDatatype; } // ----------------------------------------------------------------------------- -Sequence<sal_Int8> ORowSetValue::getSequence() const +Sequence<sal_Int8> ORowSetValue::getSequence() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getSequence" ); Sequence<sal_Int8> aSeq; @@ -1708,13 +1708,13 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const } if(xStream.is()) { - const sal_uInt32 nBytesToRead = 65535; - sal_uInt32 nRead; + const sal_uInt32 nBytesToRead = 65535; + sal_uInt32 nRead; do { ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq; - + nRead = xStream->readSomeBytes( aReadSeq, nBytesToRead ); if( nRead ) @@ -1754,7 +1754,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const } // ----------------------------------------------------------------------------- -::com::sun::star::util::Date ORowSetValue::getDate() const +::com::sun::star::util::Date ORowSetValue::getDate() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDate" ); ::com::sun::star::util::Date aValue; @@ -1783,9 +1783,9 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const case DataType::TIMESTAMP: { ::com::sun::star::util::DateTime* pDateTime = static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue); - aValue.Day = pDateTime->Day; - aValue.Month = pDateTime->Month; - aValue.Year = pDateTime->Year; + aValue.Day = pDateTime->Day; + aValue.Month = pDateTime->Month; + aValue.Year = pDateTime->Year; } break; default: @@ -1799,7 +1799,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const return aValue; } // ----------------------------------------------------------------------------- -::com::sun::star::util::Time ORowSetValue::getTime() const +::com::sun::star::util::Time ORowSetValue::getTime() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getTime" ); ::com::sun::star::util::Time aValue; @@ -1824,10 +1824,10 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const case DataType::TIMESTAMP: { ::com::sun::star::util::DateTime* pDateTime = static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue); - aValue.HundredthSeconds = pDateTime->HundredthSeconds; - aValue.Seconds = pDateTime->Seconds; - aValue.Minutes = pDateTime->Minutes; - aValue.Hours = pDateTime->Hours; + aValue.HundredthSeconds = pDateTime->HundredthSeconds; + aValue.Seconds = pDateTime->Seconds; + aValue.Minutes = pDateTime->Minutes; + aValue.Hours = pDateTime->Hours; } break; case DataType::TIME: @@ -1844,7 +1844,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const return aValue; } // ----------------------------------------------------------------------------- -::com::sun::star::util::DateTime ORowSetValue::getDateTime() const +::com::sun::star::util::DateTime ORowSetValue::getDateTime() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDateTime" ); ::com::sun::star::util::DateTime aValue; @@ -1869,18 +1869,18 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const case DataType::DATE: { ::com::sun::star::util::Date* pDate = static_cast< ::com::sun::star::util::Date*>(m_aValue.m_pValue); - aValue.Day = pDate->Day; - aValue.Month = pDate->Month; - aValue.Year = pDate->Year; + aValue.Day = pDate->Day; + aValue.Month = pDate->Month; + aValue.Year = pDate->Year; } break; case DataType::TIME: { ::com::sun::star::util::Time* pTime = static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue); - aValue.HundredthSeconds = pTime->HundredthSeconds; - aValue.Seconds = pTime->Seconds; - aValue.Minutes = pTime->Minutes; - aValue.Hours = pTime->Hours; + aValue.HundredthSeconds = pTime->HundredthSeconds; + aValue.Seconds = pTime->Seconds; + aValue.Minutes = pTime->Minutes; + aValue.Hours = pTime->Hours; } break; case DataType::TIMESTAMP: @@ -1982,9 +1982,9 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const = 0; virtual Reference< XInputStream > getBinaryStream() const = 0; virtual Reference< XInputStream > getCharacterStream() const = 0; - virtual Reference< XBlob > getBlob() const = 0; - virtual Reference< XClob > getClob() const = 0; - virtual Any getObject() const = 0; + virtual Reference< XBlob > getBlob() const = 0; + virtual Reference< XClob > getClob() const = 0; + virtual Any getObject() const = 0; virtual sal_Bool wasNull() const = 0; virtual ~IValueSource() { } @@ -2014,9 +2014,9 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const { return m_xRow->getBytes( m_nPos ); }; virtual Reference< XInputStream > getBinaryStream() const { return m_xRow->getBinaryStream( m_nPos ); }; virtual Reference< XInputStream > getCharacterStream() const { return m_xRow->getCharacterStream( m_nPos ); }; - virtual Reference< XBlob > getBlob() const { return m_xRow->getBlob( m_nPos ); }; - virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); }; - virtual Any getObject() const { return m_xRow->getObject( m_nPos ,NULL); }; + virtual Reference< XBlob > getBlob() const { return m_xRow->getBlob( m_nPos ); }; + virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); }; + virtual Any getObject() const { return m_xRow->getObject( m_nPos ,NULL); }; virtual sal_Bool wasNull() const { return m_xRow->wasNull( ); }; private: @@ -2047,8 +2047,8 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const { return m_xColumn->getBytes(); }; virtual Reference< XInputStream > getBinaryStream() const { return m_xColumn->getBinaryStream(); }; virtual Reference< XInputStream > getCharacterStream() const { return m_xColumn->getCharacterStream(); }; - virtual Reference< XBlob > getBlob() const { return m_xColumn->getBlob(); }; - virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; + virtual Reference< XBlob > getBlob() const { return m_xColumn->getBlob(); }; + virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; virtual Any getObject() const { return m_xColumn->getObject( NULL ); }; virtual sal_Bool wasNull() const { return m_xColumn->wasNull( ); }; @@ -2324,7 +2324,7 @@ void ORowSetValue::fill(const Any& _rValue) } } break; - + default: OSL_ENSURE(0,"Unknown type"); break; diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 3cbf44a64eab..3d20ad6eb8b5 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ namespace connectivity ::rtl::OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText); if(pNode) - { // special handling for parameters + { // special handling for parameters OSQLParseNode::substituteParameterNames(pNode); pNode->parseNodeToStr( sNewSql, xConnection ); delete pNode; diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 40e119419f2d..590cfb648934 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -// Makes parser a static resource, +// Makes parser a static resource, // we're synchronized externally. // But watch out, the parser might have // state not visible to this code! @@ -97,9 +97,9 @@ public: */ class BinaryFunctionExpression : public ExpressionNode { - const ExpressionFunct meFunct; - ExpressionNodeSharedPtr mpFirstArg; - ExpressionNodeSharedPtr mpSecondArg; + const ExpressionFunct meFunct; + ExpressionNodeSharedPtr mpFirstArg; + ExpressionNodeSharedPtr mpSecondArg; public: @@ -113,7 +113,7 @@ public: { ORowSetValueDecoratorRef aRet; switch(meFunct) - { + { case ENUM_FUNC_EQUATION: aRet = new ORowSetValueDecorator(sal_Bool(mpFirstArg->evaluate(_aRow )->getValue() == mpSecondArg->evaluate(_aRow )->getValue()) ); break; @@ -131,7 +131,7 @@ public: virtual void fill(const ODatabaseMetaDataResultSet::ORow& _aRow ) const { switch(meFunct) - { + { case ENUM_FUNC_EQUATION: (*mpFirstArg->evaluate(_aRow )) = mpSecondArg->evaluate(_aRow )->getValue(); break; @@ -168,7 +168,7 @@ struct ParserContext // arguments from. If all arguments to an operator are constant, // the operator pushes a precalculated result on the stack, and // a composite ExpressionNode otherwise. - OperandStack maOperandStack; + OperandStack maOperandStack; }; typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; @@ -178,7 +178,7 @@ typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; class ConstantFunctor { - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mpContext; public: @@ -197,7 +197,7 @@ public: */ class IntConstantFunctor { - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mpContext; public: IntConstantFunctor( const ParserContextSharedPtr& rContext ) : @@ -220,12 +220,12 @@ public: @tpl Generator Generator functor, to generate an ExpressionNode of appropriate type - + */ class BinaryFunctionFunctor { - const ExpressionFunct meFunct; - ParserContextSharedPtr mpContext; + const ExpressionFunct meFunct; + ParserContextSharedPtr mpContext; public: @@ -259,8 +259,8 @@ public: */ class UnaryFunctionExpression : public ExpressionNode { - const ExpressionFunct meFunct; - ExpressionNodeSharedPtr mpArg; + const ExpressionFunct meFunct; + ExpressionNodeSharedPtr mpArg; public: UnaryFunctionExpression( const ExpressionFunct eFunct, const ExpressionNodeSharedPtr& rArg ) : @@ -288,11 +288,11 @@ public: class UnaryFunctionFunctor { - const ExpressionFunct meFunct; - ParserContextSharedPtr mpContext; + const ExpressionFunct meFunct; + ParserContextSharedPtr mpContext; public : - + UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ), mpContext( rContext ) @@ -300,7 +300,7 @@ public : } void operator()( StringIteratorT, StringIteratorT ) const { - + ParserContext::OperandStack& rNodeStack( mpContext->maOperandStack ); if( rNodeStack.size() < 1 ) @@ -318,20 +318,20 @@ public : less literally written down below, only slightly obfuscated by the parser actions): - basic_expression = - number | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + '(' additive_expression ')' + + unary_expression = basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) - - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) */ class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar > @@ -364,29 +364,29 @@ public: using ::boost::spirit::as_lower_d; using ::boost::spirit::strlit; using ::boost::spirit::inhibit_case; - + typedef inhibit_case<strlit<> > token_t; token_t COLUMN = as_lower_d[ "column" ]; token_t OR_ = as_lower_d[ "or" ]; token_t AND_ = as_lower_d[ "and" ]; - integer = + integer = int_p [IntConstantFunctor(self.getContext())]; - argument = + argument = integer | lexeme_d[ +( range_p('a','z') | range_p('A','Z') | range_p('0','9') ) ] [ ConstantFunctor(self.getContext()) ] ; - unaryFunction = + unaryFunction = (COLUMN >> '(' >> integer >> ')' ) [ UnaryFunctionFunctor( UNARY_FUNC_COLUMN, self.getContext()) ] ; - assignment = + assignment = unaryFunction >> ch_p('=') >> argument [ BinaryFunctionFunctor( ENUM_FUNC_EQUATION, self.getContext()) ] ; @@ -397,12 +397,12 @@ public: | ( assignment >> AND_ >> assignment ) [ BinaryFunctionFunctor( ENUM_FUNC_AND, self.getContext()) ] ; - orExpression = + orExpression = andExpression | ( orExpression >> OR_ >> andExpression ) [ BinaryFunctionFunctor( ENUM_FUNC_OR, self.getContext()) ] ; - basicExpression = + basicExpression = orExpression ; @@ -419,16 +419,16 @@ public: { return basicExpression; } - + private: - // the constituents of the Spirit arithmetic expression grammar. + // the constituents of the Spirit arithmetic expression grammar. // For the sake of readability, without 'ma' prefix. - ::boost::spirit::rule< ScannerT > basicExpression; - ::boost::spirit::rule< ScannerT > unaryFunction; - ::boost::spirit::rule< ScannerT > assignment; - ::boost::spirit::rule< ScannerT > integer,argument; - ::boost::spirit::rule< ScannerT > orExpression,andExpression; - }; + ::boost::spirit::rule< ScannerT > basicExpression; + ::boost::spirit::rule< ScannerT > unaryFunction; + ::boost::spirit::rule< ScannerT > assignment; + ::boost::spirit::rule< ScannerT > integer,argument; + ::boost::spirit::rule< ScannerT > orExpression,andExpression; + }; const ParserContextSharedPtr& getContext() const { @@ -436,15 +436,15 @@ public: } private: - ParserContextSharedPtr mpParserContext; // might get modified during parsing + ParserContextSharedPtr mpParserContext; // might get modified during parsing }; - + #ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE const ParserContextSharedPtr& getParserContext() { static ParserContextSharedPtr lcl_parserContext( new ParserContext() ); - // clear node stack (since we reuse the static object, that's + // clear node stack (since we reuse the static object, that's // the whole point here) while( !lcl_parserContext->maOperandStack.empty() ) lcl_parserContext->maOperandStack.pop(); @@ -456,10 +456,10 @@ const ParserContextSharedPtr& getParserContext() ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _sFunction) { - // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* - // gives better conversion robustness here (we might want to map space + // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* + // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiFunction( + const ::rtl::OString& rAsciiFunction( rtl::OUStringToOString( _sFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiFunction.getStr() ); @@ -477,7 +477,7 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _s ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( + const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( ::boost::spirit::parse( aStart, aEnd, aExpressionGrammer, @@ -489,7 +489,7 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _s if( !aParseInfo.full ) throw ParseError( "RowFunctionParser::parseFunction(): string not fully parseable" ); - // parser's state stack now must contain exactly _one_ ExpressionNode, + // parser's state stack now must contain exactly _one_ ExpressionNode, // which represents our formula. if( pContext->maOperandStack.size() != 1 ) throw ParseError( "RowFunctionParser::parseFunction(): incomplete or empty expression" ); diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 691a0c48d084..09d87b6abe58 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ namespace connectivity }; } -OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent +OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -97,10 +97,10 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) if ( !m_pImpl ) m_pImpl = new OColumnsHelperImpl(isCaseSensitive()); - sal_Bool bQueryInfo = sal_True; + sal_Bool bQueryInfo = sal_True; sal_Bool bAutoIncrement = sal_False; - sal_Bool bIsCurrency = sal_False; - sal_Int32 nDataType = DataType::OTHER; + sal_Bool bIsCurrency = sal_False; + sal_Int32 nDataType = DataType::OTHER; ColumnInformationMap::iterator aFind = m_pImpl->m_aColumnInfo.find(_rName); if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it @@ -111,10 +111,10 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) } if ( aFind != m_pImpl->m_aColumnInfo.end() ) { - bQueryInfo = sal_False; - bAutoIncrement = aFind->second.first.first; - bIsCurrency = aFind->second.first.second; - nDataType = aFind->second.second; + bQueryInfo = sal_False; + bAutoIncrement = aFind->second.first.first; + bIsCurrency = aFind->second.first.second; + nDataType = aFind->second.second; } // if ( aFind != m_pImpl->m_aColumnInfo.end() ) sdbcx::ObjectType xRet; @@ -146,7 +146,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) else { - xRet.set(::dbtools::createSDBCXColumn( m_pTable, + xRet.set(::dbtools::createSDBCXColumn( m_pTable, xConnection, _rName, isCaseSensitive(), @@ -163,7 +163,7 @@ void OColumnsHelper::impl_refresh() throw(RuntimeException) { if ( m_pTable ) { - m_pImpl->m_aColumnInfo.clear(); + m_pImpl->m_aColumnInfo.clear(); m_pTable->refreshColumns(); } } @@ -182,13 +182,13 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName return cloneDescriptor( descriptor ); Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); - ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); + ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); aSql += ::rtl::OUString::createFromAscii(" ADD "); aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern()); - + Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); if ( xStmt.is() ) { @@ -204,9 +204,9 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!"); if ( m_pTable && !m_pTable->isNew() ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); + ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); aSql += ::rtl::OUString::createFromAscii(" DROP "); diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index a0808ae5e852..b0747dfae28e 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ using namespace com::sun::star::beans; using namespace ::osl; //------------------------------------------------------------------------------ -OMetaConnection::OMetaConnection() - : OMetaConnection_BASE(m_aMutex) +OMetaConnection::OMetaConnection() + : OMetaConnection_BASE(m_aMutex) , m_nTextEncoding(RTL_TEXTENCODING_MS_1252) { } @@ -54,7 +54,7 @@ void OMetaConnection::disposing() m_xMetaData = WeakReference< XDatabaseMetaData>(); for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) { - try + try { Reference< XInterface > xStatement( i->get() ); ::comphelper::disposeComponent( xStatement ); diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 86d89d8698b7..407cdc8fb0ab 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo); Sequence< Any > aTypeInfoSettings; aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")),aTypeInfoSettings); - + if ( xRow.is() ) { static sal_Int32 pTypes[] = { @@ -130,7 +130,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ if ( aTypeInfoSettings.getLength() > 1 && ((aTypeInfoSettings.getLength() % 2) == 0) ) { const Any* pIter = aTypeInfoSettings.getConstArray(); - const Any* pEnd = pIter + aTypeInfoSettings.getLength(); + const Any* pEnd = pIter + aTypeInfoSettings.getLength(); try { for(;pIter != pEnd;++pIter) @@ -156,7 +156,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ aValue.fill(i,*pType,xRow); aRow.push_back(new ORowSetValueDecorator(aValue)); } - + ::std::vector<ExpressionNodeSharedPtr>::iterator aIter = aConditions.begin(); ::std::vector<ExpressionNodeSharedPtr>::iterator aEnd = aConditions.end(); for (; aIter != aEnd; ++aIter) diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 104f2c49ebf5..eb86675dd685 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,20 +39,20 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(sal_True) +OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(sal_True) , m_pTable(_pTable) { construct(); ::std::vector< ::rtl::OUString> aVector; - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns = new OIndexColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- -OIndexHelper::OIndexHelper( OTableHelper* _pTable, +OIndexHelper::OIndexHelper( OTableHelper* _pTable, const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, @@ -80,9 +80,9 @@ void OIndexHelper::refreshColumns() { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + Reference< XResultSet > xResult = m_pTable->getMetaData()->getIndexInfo( m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), aSchema,aTable,sal_False,sal_False); @@ -105,7 +105,7 @@ void OIndexHelper::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns = new OIndexColumns(this,m_aMutex,aVector); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index c601eb2ecbfa..09fd1a773df8 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, +OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector) @@ -60,8 +60,8 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Reference< XResultSet > xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getIndexInfo( m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), @@ -94,8 +94,8 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) sal_Int32 nDataType = xRow->getInt(5); ::rtl::OUString aTypeName(xRow->getString(6)); sal_Int32 nSize = xRow->getInt(7); - sal_Int32 nDec = xRow->getInt(9); - sal_Int32 nNull = xRow->getInt(11); + sal_Int32 nDec = xRow->getInt(9); + sal_Int32 nNull = xRow->getInt(11); ::rtl::OUString aColumnDef(xRow->getString(13)); OIndexColumn* pRet = new OIndexColumn(bAsc, diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 564d36b2bece..c13cd2eebaef 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ typedef connectivity::sdbcx::OCollection OCollection_TYPE; OIndexesHelper::OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector - ) + ) : OCollection(*_pTable,sal_True,_rMutex,_rVector) ,m_pTable(_pTable) { @@ -71,16 +71,16 @@ sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName) sal_Int32 nLen = _rName.indexOf('.'); if ( nLen != -1 ) { - aQualifier = _rName.copy(0,nLen); - aName = _rName.copy(nLen+1); + aQualifier = _rName.copy(0,nLen); + aName = _rName.copy(nLen+1); } else - aName = _rName; - + aName = _rName; + ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Any aCatalog = m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)); Reference< XResultSet > xResult = m_pTable->getMetaData()->getIndexInfo(aCatalog,aSchema,aTable,sal_False,sal_False); @@ -149,18 +149,18 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUStringBuffer aSql( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE "))); - ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString aDot = ::rtl::OUString::createFromAscii("."); + ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aDot = ::rtl::OUString::createFromAscii("."); if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE)))) aSql.appendAscii("UNIQUE "); aSql.appendAscii("INDEX "); - + ::rtl::OUString aCatalog,aSchema,aTable; dbtools::qualifiedNameComponents(m_pTable->getMetaData(),m_pTable->getName(),aCatalog,aSchema,aTable,::dbtools::eInDataManipulation); ::rtl::OUString aComposedName; - + aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable,sal_True,::dbtools::eInIndexDefinitions); if ( _rForName.getLength() ) { @@ -178,12 +178,12 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName { xColProp.set(xColumns->getByIndex(i),UNO_QUERY); aSql.append(::dbtools::quoteName( aQuote,comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))))); - + if ( bAddIndexAppendix ) - { + { - aSql.appendAscii(any2bool(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISASCENDING))) - ? + aSql.appendAscii(any2bool(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISASCENDING))) + ? " ASC" : " DESC"); @@ -236,9 +236,9 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem sal_Int32 nLen = _sElementName.indexOf('.'); if(nLen != -1) aSchema = _sElementName.copy(0,nLen); - aName = _sElementName.copy(nLen+1); + aName = _sElementName.copy(nLen+1); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP INDEX "); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP INDEX "); ::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true ); ::rtl::OUString sIndexName,sTemp; diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index 2efd87fc2c5e..83d83d2c8229 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -51,7 +51,7 @@ OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::O construct(); } // ------------------------------------------------------------------------- -OTableKeyHelper::OTableKeyHelper( OTableHelper* _pTable +OTableKeyHelper::OTableKeyHelper( OTableHelper* _pTable ,const ::rtl::OUString& _Name ,const sdbcx::TKeyProperties& _rProps ) : connectivity::sdbcx::OKey(_Name,_rProps,sal_True) @@ -74,8 +74,8 @@ void OTableKeyHelper::refreshColumns() { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; if ( m_Name.getLength() ) // foreign key { @@ -94,7 +94,7 @@ void OTableKeyHelper::refreshColumns() } } } - + if ( aVector.empty() ) { const Reference< XResultSet > xResult = m_pTable->getMetaData()->getPrimaryKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), @@ -114,7 +114,7 @@ void OTableKeyHelper::refreshColumns() if ( m_pColumns ) m_pColumns ->reFill(aVector); else - m_pColumns = new OKeyColumnsHelper(this,m_aMutex,aVector); + m_pColumns = new OKeyColumnsHelper(this,m_aMutex,aVector); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 297b91974682..ffacd2e16ba5 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,13 +43,13 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey, +OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pKey,sal_True,_rMutex,_rVector) @@ -61,8 +61,8 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; // frist get the related column to _rName Reference< XResultSet > xResult = m_pKey->getTable()->getMetaData()->getImportedKeys( @@ -100,8 +100,8 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) sal_Int32 nDataType = xRow->getInt(5); ::rtl::OUString aTypeName(xRow->getString(6)); sal_Int32 nSize = xRow->getInt(7); - sal_Int32 nDec = xRow->getInt(9); - sal_Int32 nNull = xRow->getInt(11); + sal_Int32 nDec = xRow->getInt(9); + sal_Int32 nNull = xRow->getInt(11); ::rtl::OUString sColumnDef; try { diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 01d2be6d087f..1bfd8d111d80 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; -OKeysHelper::OKeysHelper( OTableHelper* _pTable, +OKeysHelper::OKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, const TStringVector& _rVector ) : OKeys_BASE(*_pTable,sal_True,_rMutex,_rVector,sal_True) @@ -149,7 +149,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c } const ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); + sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); sal_Int32 nUpdateRule = 0, nDeleteRule = 0; ::rtl::OUString sReferencedName; @@ -170,8 +170,8 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c // In this case, really append the new index. ::rtl::OUStringBuffer aSql; aSql.appendAscii("ALTER TABLE "); - ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString aDot = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); + ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aDot = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); aSql.append(composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable, ::dbtools::eInTableDefinitions, false, false, true )); aSql.appendAscii(" ADD "); @@ -196,7 +196,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c aSql.appendAscii(","); ::cppu::extractInterface(xColProp,xColumns->getByIndex(i)); aSql.append( ::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))) ); - + } aSql.appendAscii(")"); @@ -212,11 +212,11 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c aSql.appendAscii(","); xColumns->getByIndex(i) >>= xColProp; aSql.append(::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_RELATEDCOLUMN))))); - + } aSql.appendAscii(")"); - aSql.append(getKeyRuleString(sal_True ,nUpdateRule)); - aSql.append(getKeyRuleString(sal_False ,nDeleteRule)); + aSql.append(getKeyRuleString(sal_True ,nUpdateRule)); + aSql.append(getKeyRuleString(sal_False ,nDeleteRule)); } Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); @@ -227,9 +227,9 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c try { ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - Reference< XResultSet > xResult; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + Reference< XResultSet > xResult; sal_Int32 nColumn = 12; if ( nKeyType == KeyType::FOREIGN ) xResult = m_pTable->getMetaData()->getImportedKeys( m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) @@ -303,7 +303,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName else { aSql.append(getDropForeignKey()); - const ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(); + const ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(); aSql.append( ::dbtools::quoteName( aQuote,_sElementName) ); } diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index a9e21fb27ec3..4cbceb03e85e 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& sTableTypes.realloc(3); sTableTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); sTableTypes[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else .... + sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else .... } try { diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx index 4fd8d9cf1772..005967d4a6cd 100644 --- a/connectivity/source/commontools/TSkipDeletedSet.cxx +++ b/connectivity/source/commontools/TSkipDeletedSet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio { case IResultSetHelper::ABSOLUTE: return moveAbsolute(_nOffset,_bRetrieveData); - case IResultSetHelper::FIRST: // set the movement when positioning failed + case IResultSetHelper::FIRST: // set the movement when positioning failed eDelPosition = IResultSetHelper::NEXT; nDelOffset = 1; break; @@ -75,8 +75,8 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio break; } - sal_Bool bDone = sal_True; - sal_Bool bDataFound = sal_False; + sal_Bool bDone = sal_True; + sal_Bool bDataFound = sal_False; if (_eCursorPosition == IResultSetHelper::LAST) { @@ -105,7 +105,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio { bDataFound = m_pHelper->move(IResultSetHelper::NEXT, 1, sal_False); // we don't need the data here if( bDataFound && ( m_bDeletedVisible || !m_pHelper->isRowDeleted()) ) - { // we weren't on the last row we remember it and move on + { // we weren't on the last row we remember it and move on m_aBookmarksPositions.push_back(m_pHelper->getDriverPos()); //m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(m_pHelper->getDriverPos(),m_aBookmarksPositions.size()+1)).first); } @@ -193,12 +193,12 @@ sal_Bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,sal_Bool _bRetrieveData) } // if ( m_aBookmarksPositions.empty() ) else { - nLastBookmark = (*m_aBookmarksPositions.rbegin())/*->first*/; - nCurPos = /*(**/m_aBookmarksPositions.size()/*->second*/; - nNewPos = nNewPos - nCurPos; - bDataFound = m_pHelper->move(IResultSetHelper::BOOKMARK, nLastBookmark, _bRetrieveData); + nLastBookmark = (*m_aBookmarksPositions.rbegin())/*->first*/; + nCurPos = /*(**/m_aBookmarksPositions.size()/*->second*/; + nNewPos = nNewPos - nCurPos; + bDataFound = m_pHelper->move(IResultSetHelper::BOOKMARK, nLastBookmark, _bRetrieveData); } - + // now move to that row we need and don't count deleted rows while (bDataFound && nNewPos) { diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 6f9022dd0b8a..31fe65d048bf 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v { } // return false if compared values are equal otherwise true - inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const + inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const { const ::std::vector<OKeyType>& aKeyType = pIndex->getKeyType(); ::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin(); @@ -100,7 +100,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v return pKeySet; } // ----------------------------------------------------------------------------- -OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType, +OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType, const ::std::vector<TAscendingOrder>& _aAscending) :m_aKeyType(_aKeyType) ,m_aAscending(_aAscending) diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 0ed36cbfd27a..8cd621cea42f 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ using namespace ::com::sun::star::lang; namespace { /// helper class for column property change events which holds the OComponentDefinition weak -typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_BASE; +typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_BASE; class OTableContainerListener : public OTableContainerListener_BASE { OTableHelper* m_pComponent; @@ -74,15 +74,15 @@ public: virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) { ::rtl::OUString sName; - Event.Accessor >>= sName; + Event.Accessor >>= sName; if ( m_aRefNames.find(sName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) { ::rtl::OUString sOldComposedName,sNewComposedName; - Event.ReplacedElement >>= sOldComposedName; - Event.Accessor >>= sNewComposedName; + Event.ReplacedElement >>= sOldComposedName; + Event.Accessor >>= sNewComposedName; if ( sOldComposedName != sNewComposedName && m_aRefNames.find(sOldComposedName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } @@ -114,10 +114,10 @@ namespace connectivity Reference< ::com::sun::star::sdb::tools::XTableAlteration> m_xAlter; Reference< ::com::sun::star::sdb::tools::XKeyAlteration> m_xKeyAlter; Reference< ::com::sun::star::sdb::tools::XIndexAlteration> m_xIndexAlter; - - Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener> + + Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener> m_xTablePropertyListener; ::std::vector< ColumnDesc > m_aColumnDesc; OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) @@ -146,15 +146,15 @@ namespace connectivity }; } -OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, +OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, - sal_Bool _bCase) + sal_Bool _bCase) :OTable_TYPEDEF(_pTables,_bCase) ,m_pImpl(new OTableHelperImpl(_xConnection)) -{ +{ } // ------------------------------------------------------------------------- -OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, +OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, sal_Bool _bCase, const ::rtl::OUString& _Name, @@ -187,10 +187,10 @@ void SAL_CALL OTableHelper::disposing() m_pImpl->m_xTablePropertyListener.dispose(); } OTable_TYPEDEF::disposing(); - - m_pImpl->m_xConnection = NULL; - m_pImpl->m_xMetaData = NULL; - + + m_pImpl->m_xConnection = NULL; + m_pImpl->m_xMetaData = NULL; + } // ------------------------------------------------------------------------- @@ -206,11 +206,11 @@ namespace while ( _rxResult->next() ) { sName = xRow->getString( 4 ); // COLUMN_NAME - sal_Int32 nField5 = xRow->getInt(5); + sal_Int32 nField5 = xRow->getInt(5); ::rtl::OUString aField6 = xRow->getString(6); - sal_Int32 nField7 = xRow->getInt(7) - , nField9 = xRow->getInt(9) - , nField11= xRow->getInt(11); + sal_Int32 nField7 = xRow->getInt(7) + , nField9 = xRow->getInt(9) + , nField11= xRow->getInt(11); ::rtl::OUString sField12 = xRow->getString(12) ,sField13 = xRow->getString(13); nOrdinalPosition = xRow->getInt( 17 ); // ORDINAL_POSITION @@ -309,7 +309,7 @@ void OTableHelper::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = createColumns(aVector); + m_pColumns = createColumns(aVector); } // ----------------------------------------------------------------------------- const ColumnDesc* OTableHelper::getColumnDescription(const ::rtl::OUString& _sName) const @@ -349,7 +349,7 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames) bAlreadyFetched = true; } } - + m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps)); _rNames.push_back(aPkName); } // if ( xResult.is() && xResult->next() ) @@ -371,22 +371,22 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames) while( xResult->next() ) { // this must be outsid the "if" because we have to call in a right order - sCatalog = xRow->getString(1); + sCatalog = xRow->getString(1); if ( xRow->wasNull() ) sCatalog = ::rtl::OUString(); - aSchema = xRow->getString(2); - aName = xRow->getString(3); + aSchema = xRow->getString(2); + aName = xRow->getString(3); const ::rtl::OUString sForeignKeyColumn = xRow->getString(8); const sal_Int32 nUpdateRule = xRow->getInt(10); const sal_Int32 nDeleteRule = xRow->getInt(11); const ::rtl::OUString sFkName = xRow->getString(12); - + if ( pKeyProps.get() ) { } - - + + if ( sFkName.getLength() && !xRow->wasNull() ) { if ( sOldFKName != sFkName ) @@ -396,7 +396,7 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames) const ::rtl::OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation); pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule)); - pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn); + pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn); _rNames.push_back(sFkName); if ( m_pTables->hasByName(sReferencedName) ) { @@ -429,14 +429,14 @@ void OTableHelper::refreshKeys() { refreshPrimaryKeys(aNames); refreshForgeinKeys(aNames); - m_pKeys = createKeys(aNames); + m_pKeys = createKeys(aNames); } // if(!isNew()) else if (!m_pKeys ) - m_pKeys = createKeys(aNames); + m_pKeys = createKeys(aNames); /*if(m_pKeys) m_pKeys->reFill(aVector); else*/ - + } // ------------------------------------------------------------------------- void OTableHelper::refreshIndexes() @@ -477,7 +477,7 @@ void OTableHelper::refreshIndexes() if(m_pIndexes) m_pIndexes->reFill(aVector); else - m_pIndexes = createIndexes(aVector); + m_pIndexes = createIndexes(aVector); } // ----------------------------------------------------------------------------- ::rtl::OUString OTableHelper::getRenameStart() const @@ -496,7 +496,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( -#ifdef GCC +#ifdef GCC ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed #else rBHelper.bDisposed @@ -538,16 +538,16 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx ::dbtools::qualifiedNameComponents(getMetaData(),newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInTableDefinitions); } // ----------------------------------------------------------------------------- -Reference< XDatabaseMetaData> OTableHelper::getMetaData() const -{ - return m_pImpl->m_xMetaData; +Reference< XDatabaseMetaData> OTableHelper::getMetaData() const +{ + return m_pImpl->m_xMetaData; } // ------------------------------------------------------------------------- void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed( -#ifdef GCC + checkDisposed( +#ifdef GCC ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed #else rBHelper.bDisposed @@ -604,29 +604,29 @@ void OTableHelper::addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyPropert return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -Reference< XConnection> OTableHelper::getConnection() const -{ - return m_pImpl->m_xConnection; +Reference< XConnection> OTableHelper::getConnection() const +{ + return m_pImpl->m_xConnection; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XTableRename> OTableHelper::getRenameService() const -{ - return m_pImpl->m_xRename; +{ + return m_pImpl->m_xRename; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XTableAlteration> OTableHelper::getAlterService() const -{ - return m_pImpl->m_xAlter; +{ + return m_pImpl->m_xAlter; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XKeyAlteration> OTableHelper::getKeyService() const -{ - return m_pImpl->m_xKeyAlter; +{ + return m_pImpl->m_xKeyAlter; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XIndexAlteration> OTableHelper::getIndexService() const -{ - return m_pImpl->m_xIndexAlter; +{ + return m_pImpl->m_xIndexAlter; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index ab8300f66c00..8a30e0f4a486 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ namespace dbtools Reference< XInterface > xKeepAlive(static_cast< XWeak* >(this)); try - { // remove ourself as property change listener + { // remove ourself as property change listener OSL_ENSURE( _rxEventSource.is(), "OAutoConnectionDisposer::stopPropertyListening: invalid event source (no XPropertySet)!" ); if ( _rxEventSource.is() ) { @@ -147,7 +147,7 @@ namespace dbtools void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) { if ( _rEvent.PropertyName.equals( getActiveConnectionPropertyName() ) ) - { // somebody set a new ActiveConnection + { // somebody set a new ActiveConnection Reference< XConnection > xNewConnection; _rEvent.NewValue >>= xNewConnection; @@ -243,7 +243,7 @@ namespace dbtools //--------------------------------------------------------------------- //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index a51cc0eeef02..bee593f44758 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,15 +50,15 @@ namespace dbtools void OCharsetMap::lateConstruct() { const rtl_TextEncoding eFirstEncoding = RTL_TEXTENCODING_DONTKNOW; - const rtl_TextEncoding eLastEncoding = 100; // TODO: a define in rtl/textenc.h would be fine here ... + const rtl_TextEncoding eLastEncoding = 100; // TODO: a define in rtl/textenc.h would be fine here ... OSL_ENSURE( 0 == eFirstEncoding, "OCharsetMap::OCharsetMap: somebody changed the numbers!" ); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof( rtl_TextEncodingInfo ); for ( rtl_TextEncoding eEncoding = eFirstEncoding; eEncoding < eLastEncoding; ++eEncoding ) { - if ( ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) // this is always allowed - it has the special meaning "system encoding" - || ( rtl_getTextEncodingInfo( eEncoding, &aInfo ) - && approveEncoding( eEncoding, aInfo ) + if ( ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) // this is always allowed - it has the special meaning "system encoding" + || ( rtl_getTextEncodingInfo( eEncoding, &aInfo ) + && approveEncoding( eEncoding, aInfo ) ) ) { @@ -103,14 +103,14 @@ namespace dbtools } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const rtl_TextEncoding _eEncoding) const + OCharsetMap::CharsetIterator OCharsetMap::find(const rtl_TextEncoding _eEncoding) const { ensureConstructed( ); return CharsetIterator( this, m_aEncodings.find( _eEncoding ) ); } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const + OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const { ensureConstructed( ); @@ -123,7 +123,7 @@ namespace dbtools eEncoding = rtl_getTextEncodingFromMimeCharset( sMimeByteString.getStr() ); if ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) - { // if we're here, the name is not empty, but unknown -> this is an invalid name + { // if we're here, the name is not empty, but unknown -> this is an invalid name return end(); } } @@ -194,7 +194,7 @@ namespace dbtools ::rtl::OUString sIanaName; if ( RTL_TEXTENCODING_DONTKNOW != eEncoding ) - { // it's not the virtual "system charset" + { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( eEncoding ); OSL_ENSURE( pIanaName, "OCharsetMap::CharsetIterator: invalid mime name!" ); if ( pIanaName ) @@ -204,7 +204,7 @@ namespace dbtools } //------------------------------------------------------------------------- - const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++() + const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++() { OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator++ : invalid position!" ); if ( m_aPos != m_pContainer->m_aEncodings.end()) @@ -213,7 +213,7 @@ namespace dbtools } //------------------------------------------------------------------------- - const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--() + const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--() { OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.begin(), "OCharsetMap::CharsetIterator::operator-- : invalid position!" ); if ( m_aPos != m_pContainer->m_aEncodings.begin() ) @@ -228,7 +228,7 @@ namespace dbtools } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 5b759e170f68..bc05694898f9 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 60addf14828c..89533e389973 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -559,7 +559,7 @@ const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState ) // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index acb995978f5a..04483aa9e9cf 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index c04c76bd7bcd..ec8688d3ed1b 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,8 +121,8 @@ namespace dbtools using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::task; -// using namespace cppu; -// using namespace osl; +// using namespace cppu; +// using namespace osl; //============================================================================== //============================================================================== @@ -173,7 +173,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, return NumberFormat::UNDEFINED; sal_Int32 nFormat = 0; - sal_Int32 nNumberType = _bIsCurrency ? NumberFormat::CURRENCY : NumberFormat::NUMBER; + sal_Int32 nNumberType = _bIsCurrency ? NumberFormat::CURRENCY : NumberFormat::NUMBER; switch (_nDataType) { case DataType::BIT: @@ -209,7 +209,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, { nFormat = _xTypes->getStandardFormat((sal_Int16)nNumberType, _rLocale); } - } break; + } break; case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: @@ -317,10 +317,10 @@ Reference< XConnection > getConnection_allowException( OSL_ENSURE(sal_False, "dbtools::getConnection: error while retrieving data source properties!"); } if(bPwdReq && !sPwd.getLength()) - { // password required, but empty -> connect using an interaction handler + { // password required, but empty -> connect using an interaction handler Reference<XCompletedConnection> xConnectionCompletion(xProp, UNO_QUERY); if (xConnectionCompletion.is()) - { // instantiate the default SDB interaction handler + { // instantiate the default SDB interaction handler Reference< XInteractionHandler > xHandler(_rxFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY); OSL_ENSURE(xHandler.is(), "dbtools::getConnection service com.sun.star.task.InteractionHandler not available!"); if (xHandler.is()) @@ -440,7 +440,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R Reference< XConnection > xPureConnection; if (sDataSourceName.getLength()) - { // the row set's data source property is set + { // the row set's data source property is set // -> try to connect, get user and pwd setting for that ::rtl::OUString sUser, sPwd; @@ -452,7 +452,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R xPureConnection = getConnection_allowException( sDataSourceName, sUser, sPwd, _rxFactory ); } else if (sURL.getLength()) - { // the row set has no data source, but a connection url set + { // the row set has no data source, but a connection url set // -> try to connection with that url Reference< XDriverManager > xDriverManager( _rxFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ConnectionPool")), UNO_QUERY); @@ -464,7 +464,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), xRowSetProps)) xRowSetProps->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; if (sUser.getLength()) - { // use user and pwd together with the url + { // use user and pwd together with the url Sequence< PropertyValue> aInfo(2); aInfo.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); aInfo.getArray()[0].Value <<= sUser; @@ -512,7 +512,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R //------------------------------------------------------------------------------ Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, - sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) + sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { SharedConnection xConnection = lcl_connectRowSet( _rxRowSet, _rxFactory, _bSetAsActiveConnection, true ); return xConnection.getTyped(); @@ -520,7 +520,7 @@ Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, cons //------------------------------------------------------------------------------ SharedConnection ensureRowSetConnection(const Reference< XRowSet>& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, - bool _bUseAutoConnectionDisposer ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) + bool _bUseAutoConnectionDisposer ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { return lcl_connectRowSet( _rxRowSet, _rxFactory, true, _bUseAutoConnectionDisposer ); } @@ -892,8 +892,8 @@ static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaDa sal_Bool bCatlogAtStart = sal_True; if ( _rCatalog.getLength() && aNameComps.bCatalogs ) { - sCatalogSep = _rxMetaData->getCatalogSeparator(); - bCatlogAtStart = _rxMetaData->isCatalogAtStart(); + sCatalogSep = _rxMetaData->getCatalogSeparator(); + bCatlogAtStart = _rxMetaData->isCatalogAtStart(); if ( bCatlogAtStart && sCatalogSep.getLength()) { @@ -971,7 +971,7 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaDa if ( aNameComps.bSchemas ) { sal_Int32 nIndex = sName.indexOf((sal_Unicode)'.'); - // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); + // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); if ( nIndex != -1 ) _rSchema = sName.copy(0, nIndex); sName = sName.copy(nIndex + 1); @@ -1046,8 +1046,8 @@ try for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i) { - if ( (!pOldProps[i].Name.equals(sPropDefaultControl)) - && (!pOldProps[i].Name.equals(sPropLabelControl)) + if ( (!pOldProps[i].Name.equals(sPropDefaultControl)) + && (!pOldProps[i].Name.equals(sPropLabelControl)) ) { // binaere Suche @@ -1056,7 +1056,7 @@ try && ( pResult != pNewProps + nNewLen && pResult->Name == pOldProps[i].Name ) && ( (pResult->Attributes & PropertyAttribute::READONLY) == 0 ) && ( pResult->Type.equals(pOldProps[i].Type)) ) - { // Attribute stimmen ueberein und Property ist nicht read-only + { // Attribute stimmen ueberein und Property ist nicht read-only try { xNewProps->setPropertyValue(pResult->Name, xOldProps->getPropertyValue(pResult->Name)); @@ -1083,7 +1083,7 @@ try sal_Bool bNewIsFormatted = xSI.is() && xSI->supportsService( sFormattedServiceName ); if (!bOldIsFormatted && !bNewIsFormatted) - return; // nothing to do + return; // nothing to do if (bOldIsFormatted && bNewIsFormatted) // nein, wenn beide formatierte Felder sind, dann machen wir keinerlei Konvertierungen @@ -1118,7 +1118,7 @@ try // eine eventuelle-Min-Max-Konvertierung Any aEffectiveMin( xOldProps->getPropertyValue(sPropEffectiveMin) ); if (aEffectiveMin.hasValue()) - { // im Gegensatz zu ValueMin kann EffectiveMin void sein + { // im Gegensatz zu ValueMin kann EffectiveMin void sein if (hasProperty(sPropValueMin, xNewProps)) { OSL_ENSURE(aEffectiveMin.getValueType().getTypeClass() == TypeClass_DOUBLE, @@ -1128,7 +1128,7 @@ try } Any aEffectiveMax( xOldProps->getPropertyValue(sPropEffectiveMax) ); if (aEffectiveMax.hasValue()) - { // analog + { // analog if (hasProperty(sPropValueMax, xNewProps)) { OSL_ENSURE(aEffectiveMax.getValueType().getTypeClass() == TypeClass_DOUBLE, @@ -1147,25 +1147,25 @@ try // die Effective-Properties sollten immer void oder string oder double sein .... if (hasProperty(sPropDefaultDate, xNewProps) && !bIsString) - { // (einen ::rtl::OUString in ein Datum zu konvertieren muss nicht immer klappen, denn das ganze kann ja an + { // (einen ::rtl::OUString in ein Datum zu konvertieren muss nicht immer klappen, denn das ganze kann ja an // eine Textspalte gebunden gewesen sein, aber mit einem double koennen wir was anfangen) Date aDate = DBTypeConversion::toDate(getDouble(aEffectiveDefault)); xNewProps->setPropertyValue(sPropDefaultDate, makeAny(aDate)); } if (hasProperty(sPropDefaultTime, xNewProps) && !bIsString) - { // voellig analog mit Zeit + { // voellig analog mit Zeit Time aTime = DBTypeConversion::toTime(getDouble(aEffectiveDefault)); xNewProps->setPropertyValue(sPropDefaultTime, makeAny(aTime)); } if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), xNewProps) && !bIsString) - { // hier koennen wir einfach das double durchreichen + { // hier koennen wir einfach das double durchreichen xNewProps->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), aEffectiveDefault); } if (hasProperty(sPropDefaultText, xNewProps) && bIsString) - { // und hier den ::rtl::OUString + { // und hier den ::rtl::OUString xNewProps->setPropertyValue(sPropDefaultText, aEffectiveDefault); } @@ -1222,7 +1222,7 @@ try // ... und zum FormatsSupplier hinzufuegen (wenn noetig) sal_Int32 nKey = xFormats->queryKey(sNewFormat, _rLocale, sal_False); if (nKey == (sal_Int32)-1) - { // noch nicht vorhanden in meinem Formatter ... + { // noch nicht vorhanden in meinem Formatter ... nKey = xFormats->addNew(sNewFormat, _rLocale); } @@ -1314,7 +1314,7 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) try { Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxFactory, sal_True ); - if ( xConn.is() ) // implies _rxRowSet.is() + if ( xConn.is() ) // implies _rxRowSet.is() { // build the statement the row set is based on (can't use the ActiveCommand property of the set // as this reflects the status after the last execute, not the currently set properties) @@ -1427,20 +1427,20 @@ namespace { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); Reference< XPropertySetInfo > xInfo = _xTable->getPropertySetInfo(); - if ( xInfo.is() - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) ) + if ( xInfo.is() + && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) ) { - + ::rtl::OUString aCatalog; ::rtl::OUString aSchema; ::rtl::OUString aTable; - if ( xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) ) + if ( xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) + && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) ) { - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= _out_rCatalog; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= _out_rSchema; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= _out_rCatalog; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= _out_rSchema; } - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= _out_rName; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= _out_rName; } else OSL_ENSURE( false, "::dbtools::lcl_getTableNameComponents: this is no table object!" ); @@ -1655,7 +1655,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, return bSuccessfullyReRouted; } // ------------------------------------------------------------------------- -sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, +sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) ) { sal_Bool bSuccessfullyReRouted = sal_True; @@ -1754,7 +1754,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, //.................................................................. namespace { - class OParameterWrapper : public ::cppu::WeakImplHelper1< XIndexAccess > + class OParameterWrapper : public ::cppu::WeakImplHelper1< XIndexAccess > { ::std::bit_vector m_aSet; Reference<XIndexAccess> m_xSource; @@ -1833,7 +1833,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, Reference<XPropertySet> xParam(xParamsAsIndicies->getByIndex(i),UNO_QUERY); ::rtl::OUString sName; xParam->getPropertyValue(PROPERTY_NAME) >>= sName; - + TParameterPositions::iterator aFind = aParameterNames.find(sName); if ( aFind != aParameterNames.end() ) aNewParameterSet[i] = true; @@ -1889,7 +1889,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, ::std::vector<sal_Int32>::iterator aIterPos = aFind->second.begin(); ::std::vector<sal_Int32>::iterator aEndPos = aFind->second.end(); for(;aIterPos != aEndPos;++aIterPos) - { + { if ( _aParametersSet.empty() || !_aParametersSet[(*aIterPos)-1] ) { _xParameters->setObjectWithInfo(*aIterPos, pFinalValues->Value, nParamType, nScale); @@ -2084,7 +2084,7 @@ void getBoleanComparisonPredicate( const ::rtl::OUString& _rExpression, const sa } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... //......................................................................... @@ -2124,8 +2124,8 @@ void release(oslInterlockedCount& _refCount, _xInterface = xParent; } -// // destroy the object if xHoldAlive decrement the refcount to 0 -// m_pDerivedImplementation->WEAK::release(); +// // destroy the object if xHoldAlive decrement the refcount to 0 +// m_pDerivedImplementation->WEAK::release(); } } else @@ -2139,7 +2139,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) } // ------------------------------------------------------------------------- - OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) @@ -2148,7 +2148,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) return find(__first,__last,sName,_rVal,_rCase); } // ------------------------------------------------------------------------- - OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) @@ -2157,7 +2157,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) return find(__first,__last,sRealName,_rVal,_rCase); } // ------------------------------------------------------------------------- - OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rProp, const ::rtl::OUString& _rVal, diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 7c9db2d4a024..01d6aade8096 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,9 +79,9 @@ namespace dbtools ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString sTypeName; - sal_Int32 nDataType = 0; - sal_Int32 nPrecision = 0; - sal_Int32 nScale = 0; + sal_Int32 nDataType = 0; + sal_Int32 nPrecision = 0; + sal_Int32 nScale = 0; const ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString(); ::rtl::OUStringBuffer aSql = ::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))); @@ -90,11 +90,11 @@ namespace dbtools nDataType = nPrecision = nScale = 0; sal_Bool bIsAutoIncrement = sal_False; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE)) >>= nDataType; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bIsAutoIncrement; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE)) >>= nDataType; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bIsAutoIncrement; // check if the user enter a specific string to create autoincrement values ::rtl::OUString sAutoIncrementValue; @@ -171,7 +171,7 @@ namespace dbtools ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); if ( aDefault.getLength() ) { - aSql.append(::rtl::OUString::createFromAscii(" DEFAULT ")); + aSql.append(::rtl::OUString::createFromAscii(" DEFAULT ")); aSql.append(sPreFix); aSql.append(aDefault); aSql.append(sPostFix); @@ -195,15 +195,15 @@ namespace dbtools ::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern) { - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); + ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData(); ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= sCatalog; - descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; - descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; + descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= sCatalog; + descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; + descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); if ( !sComposedName.getLength() ) @@ -216,7 +216,7 @@ namespace dbtools Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY); Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY); // check if there are columns - if(!xColumns.is() || !xColumns->getCount()) + if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); Reference< XPropertySet > xColProp; @@ -238,7 +238,7 @@ namespace { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); static const ::rtl::OUString sComma(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))); - + const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString()); ::rtl::OUString sSql = ::rtl::OUString::createFromAscii(" ("); Reference< XPropertySet > xColProp; @@ -278,7 +278,7 @@ namespace if ( (xKeys->getByIndex(i) >>= xColProp) && xColProp.is() ) { - sal_Int32 nKeyType = ::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); + sal_Int32 nKeyType = ::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); if ( nKeyType == KeyType::PRIMARY ) { @@ -291,7 +291,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); + const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); aSql.append(::rtl::OUString::createFromAscii(" PRIMARY KEY ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } @@ -302,13 +302,13 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); + const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); aSql.append(::rtl::OUString::createFromAscii(" UNIQUE ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::FOREIGN) { - sal_Int32 nDeleteRule = getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DELETERULE))); + sal_Int32 nDeleteRule = getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DELETERULE))); xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY); xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY); @@ -319,12 +319,12 @@ namespace ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); ::dbtools::qualifiedNameComponents(xMetaData, sRefTable, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); - + if ( !sComposedName.getLength() ) ::dbtools::throwFunctionSequenceException(_xConnection); @@ -365,7 +365,7 @@ namespace } // ----------------------------------------------------------------------------- -::rtl::OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor, +::rtl::OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor, const Reference< XConnection>& _xConnection, ISQLStatementHelper* _pHelper, const ::rtl::OUString& _sCreatePattern) @@ -383,7 +383,7 @@ namespace } return aSql; } -namespace +namespace { Reference<XPropertySet> lcl_createSDBCXColumn(const Reference<XNameAccess>& _xPrimaryKeyColumns, const Reference<XConnection>& _xConnection, @@ -410,17 +410,17 @@ namespace { if ( aMixCompare(xRow->getString(4),_rName) ) { - sal_Int32 nField5 = xRow->getInt(5); + sal_Int32 nField5 = xRow->getInt(5); ::rtl::OUString aField6 = xRow->getString(6); - sal_Int32 nField7 = xRow->getInt(7) - , nField9 = xRow->getInt(9) - , nField11= xRow->getInt(11); + sal_Int32 nField7 = xRow->getInt(7) + , nField9 = xRow->getInt(9) + , nField11= xRow->getInt(11); ::rtl::OUString sField12 = xRow->getString(12), sField13 = xRow->getString(13); ::comphelper::disposeComponent(xRow); sal_Bool bAutoIncrement = _bIsAutoIncrement - ,bIsCurrency = _bIsCurrency; + ,bIsCurrency = _bIsCurrency; if ( _bQueryForInfo ) { const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); @@ -433,15 +433,15 @@ namespace ColumnInformationMap::iterator aIter = aInfo.begin(); if ( aIter != aInfo.end() ) { - bAutoIncrement = aIter->second.first.first; - bIsCurrency = aIter->second.first.second; + bAutoIncrement = aIter->second.first.first; + bIsCurrency = aIter->second.first.second; if ( DataType::OTHER == nField5 ) - nField5 = aIter->second.second; + nField5 = aIter->second.second; } } else if ( DataType::OTHER == nField5 ) nField5 = _nDataType; - + if ( nField11 != ColumnValue::NO_NULLS ) { try @@ -450,7 +450,7 @@ namespace { if ( _xPrimaryKeyColumns->hasByName(_rName) ) nField11 = ColumnValue::NO_NULLS; - + } else { @@ -529,9 +529,9 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable aCatalog = _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)); ::rtl::OUString aSchema, aTable; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(_xTable); xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); @@ -648,7 +648,7 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection( _rxFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager") ), UNO_QUERY_THROW ); Reference< XDataDefinitionSupplier > xSupp( xManager->getDriverByURL( _rsUrl ), UNO_QUERY ); - + if ( xSupp.is() ) { xTablesSup = xSupp->getDataDefinitionByConnection( _xConnection ); @@ -681,15 +681,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, if ( xCurrentRow.is() ) { ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName(); - static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); - static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); - static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); - static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); - static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); - static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); - static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); + static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); + static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); + static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); + static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); + static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); + static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); + static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE"); - static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); + static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); // after creation the set is positioned before the first record, per definitionem #ifdef DBG_UTIL Reference< XResultSetMetaDataSupplier > xSup(xPrivileges,UNO_QUERY); @@ -712,15 +712,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, { #ifdef DBG_UTIL ::rtl::OUString sCat, sSchema, sName, sGrantor, sGrantable; - sCat = xCurrentRow->getString(1); - sSchema = xCurrentRow->getString(2); - sName = xCurrentRow->getString(3); - sGrantor = xCurrentRow->getString(4); + sCat = xCurrentRow->getString(1); + sSchema = xCurrentRow->getString(2); + sName = xCurrentRow->getString(3); + sGrantor = xCurrentRow->getString(4); #endif - sGrantee = xCurrentRow->getString(5); - sPrivilege = xCurrentRow->getString(6); + sGrantee = xCurrentRow->getString(5); + sPrivilege = xCurrentRow->getString(6); #ifdef DBG_UTIL - sGrantable = xCurrentRow->getString(7); + sGrantable = xCurrentRow->getString(7); #endif if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee)) @@ -753,14 +753,14 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, static ::rtl::OUString sNotSupportedState = ::rtl::OUString::createFromAscii("IM001"); // some drivers don't support any privileges so we assume that we are allowed to do all we want :-) if(e.SQLState == sNotSupportedState) - nPrivileges |= Privilege::DROP | - Privilege::REFERENCE | - Privilege::ALTER | - Privilege::CREATE | - Privilege::READ | - Privilege::DELETE | - Privilege::UPDATE | - Privilege::INSERT | + nPrivileges |= Privilege::DROP | + Privilege::REFERENCE | + Privilege::ALTER | + Privilege::CREATE | + Privilege::READ | + Privilege::DELETE | + Privilege::UPDATE | + Privilege::INSERT | Privilege::SELECT; else OSL_ENSURE(0,"Could not collect the privileges !"); @@ -813,7 +813,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc try { Reference< XModel > xModel = lcl_getXModel( _rxComponent ); - + if ( xModel.is() ) { Sequence< PropertyValue > aArgs = xModel->getArgs(); @@ -844,7 +844,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc } catch(Exception&) { - // not intereseted in + // not intereseted in } return bIsEmbedded; } @@ -881,7 +881,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc "$string$", _rSource, "$charset$", lcl_getEncodingName( _eEncoding ) ); - + throw SQLException( sMessage, NULL, @@ -970,7 +970,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 8c3153a8b974..9a01ecf275dd 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 9764287da3e1..a01581cbd32b 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -228,7 +228,7 @@ namespace dbtools //= FormattedColumnValue //==================================================================== //-------------------------------------------------------------------- - FormattedColumnValue::FormattedColumnValue( const ::comphelper::ComponentContext& i_rContext, + FormattedColumnValue::FormattedColumnValue( const ::comphelper::ComponentContext& i_rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& i_rColumn ) :m_pData( new FormattedColumnValue_Data ) { diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 0153586b84ab..01c604da2c84 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -403,7 +403,7 @@ namespace dbtools { if ( sAdditionalFilter.getLength() ) sAdditionalFilter.append(s_sAnd); - + sAdditionalFilter.appendAscii("( ",((sal_Int32)(sizeof("( ")-1))); sAdditionalFilter.append(*aComponent); sAdditionalFilter.appendAscii(" )",((sal_Int32)(sizeof(" )")-1))); @@ -558,7 +558,7 @@ namespace dbtools try { - // the master and detail field( name)s of the + // the master and detail field( name)s of the const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray(); const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray(); @@ -623,7 +623,7 @@ namespace dbtools { OSL_ENSURE( sal_False, ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " ) - += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) ) + += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) ) += ::rtl::OString( " could not be filled!" ) ); } } @@ -822,7 +822,7 @@ namespace dbtools if ( !xParent.is() ) return false; - // the columns supplier: either from a composer, or directly from the + // the columns supplier: either from a composer, or directly from the Reference< XColumnsSupplier > xParentColSupp; if ( _bFromComposer ) { @@ -837,7 +837,7 @@ namespace dbtools else xParentColSupp = xParentColSupp.query( xParent ); - // get the columns of the parent + // get the columns of the parent if ( xParentColSupp.is() ) _out_rxParentColumns = xParentColSupp->getColumns(); } @@ -931,7 +931,7 @@ namespace dbtools ::rtl::OUString sParamColumnRealName; xInnerParameter->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME) ) >>= sParamColumnRealName; if ( xColumns->hasByName( sParamColumnRealName ) ) - { // our own columns have a column which's name equals the real name of the param column + { // our own columns have a column which's name equals the real name of the param column // -> transfer the value property xColumns->getByName( sParamColumnRealName ) >>= xDetailField; if ( xDetailField.is() ) diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index b652f2662cf9..f75733493542 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index e4ee4716d036..57f3d07678f2 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,20 +142,20 @@ namespace dbtools { OSQLParseNode* pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, _rStatement, m_xFormatter, _rxField ); if ( !pReturn ) - { // is it a text field ? + { // is it a text field ? sal_Int32 nType = DataType::OTHER; _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= nType; - if ( ( DataType::CHAR == nType ) - || ( DataType::VARCHAR == nType ) - || ( DataType::LONGVARCHAR == nType ) - || ( DataType::CLOB == nType ) + if ( ( DataType::CHAR == nType ) + || ( DataType::VARCHAR == nType ) + || ( DataType::LONGVARCHAR == nType ) + || ( DataType::CLOB == nType ) ) - { // yes -> force a quoted text and try again + { // yes -> force a quoted text and try again ::rtl::OUString sQuoted( _rStatement ); - if ( sQuoted.getLength() - && ( (sQuoted.getStr()[0] != '\'') - || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) + if ( sQuoted.getLength() + && ( (sQuoted.getStr()[0] != '\'') + || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) ) ) { @@ -183,12 +183,12 @@ namespace dbtools // * a column formatted with an english number format // => the output is german (as we use the system locale for this), i.e. "3,4" // => the input does not recognize the german text, as predicateTree uses the number format - // of the column to determine the main locale - the locale on the context is only a fallback - if ( ( DataType::FLOAT == nType ) - || ( DataType::REAL == nType ) - || ( DataType::DOUBLE == nType ) - || ( DataType::NUMERIC == nType ) - || ( DataType::DECIMAL == nType ) + // of the column to determine the main locale - the locale on the context is only a fallback + if ( ( DataType::FLOAT == nType ) + || ( DataType::REAL == nType ) + || ( DataType::DOUBLE == nType ) + || ( DataType::NUMERIC == nType ) + || ( DataType::DECIMAL == nType ) ) { const IParseContext& rParseContext = m_aParser.getContext(); @@ -232,12 +232,12 @@ namespace dbtools sal_Bool bDecDiffers = ( nCtxDecSep != nFmtDecSep ); sal_Bool bFmtDiffers = ( nCtxThdSep != nFmtThdSep ); if ( bDecDiffers || bFmtDiffers ) - { // okay, at least one differs + { // okay, at least one differs // "translate" the value into the "format locale" ::rtl::OUString sTranslated( _rStatement ); const sal_Unicode nIntermediate( '_' ); - sTranslated = sTranslated.replace( nCtxDecSep, nIntermediate ); - sTranslated = sTranslated.replace( nCtxThdSep, nFmtThdSep ); + sTranslated = sTranslated.replace( nCtxDecSep, nIntermediate ); + sTranslated = sTranslated.replace( nCtxThdSep, nFmtThdSep ); sTranslated = sTranslated.replace( nIntermediate, nFmtDecSep ); pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, sTranslated, m_xFormatter, _rxField ); @@ -300,9 +300,9 @@ namespace dbtools // '-characters to the text. If we would give this to predicateTree this would add // two additional '-characters which we don't want. So check the field format. // FS - 06.01.00 - 71532 - sal_Bool bValidQuotedText = ( sValue.getLength() >= 2 ) - && ( sValue.getStr()[0] == '\'' ) - && ( sValue.getStr()[ sValue.getLength() - 1 ] == '\'' ); + sal_Bool bValidQuotedText = ( sValue.getLength() >= 2 ) + && ( sValue.getStr()[0] == '\'' ) + && ( sValue.getStr()[ sValue.getLength() - 1 ] == '\'' ); // again : as normalizePredicateString always did a conversion on the value text, // bValidQuotedText == sal_True implies that we have a text field, as no other field // values will be formatted with the quote characters @@ -335,8 +335,8 @@ namespace dbtools { if ( !_bForStatementUse ) { - if ( ( pOdbcSpec->count() >= 2 ) - && ( SQL_NODE_STRING == pOdbcSpec->getChild(1)->getNodeType() ) + if ( ( pOdbcSpec->count() >= 2 ) + && ( SQL_NODE_STRING == pOdbcSpec->getChild(1)->getNodeType() ) ) { @@ -357,7 +357,7 @@ namespace dbtools } else { - if ( pParseNode->count() >= 3 ) + if ( pParseNode->count() >= 3 ) { OSQLParseNode* pValueNode = pParseNode->getChild(2); OSL_ENSURE( pValueNode, "OPredicateInputController::getPredicateValue: invalid node child!" ); @@ -386,7 +386,7 @@ namespace dbtools return sReturn; } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx index 09f7328be01f..ed591162e9b6 100644 --- a/connectivity/source/commontools/propertyids.cxx +++ b/connectivity/source/commontools/propertyids.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,76 +33,76 @@ namespace dbtools { - const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } - const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } - const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } - const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } - const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } - const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } - const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } - const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } - const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } - const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } - - const sal_Char* getPROPERTY_NAME() { return "Name"; } - const sal_Char* getPROPERTY_TYPE() { return "Type"; } - const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } - const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } - const sal_Char* getPROPERTY_SCALE() { return "Scale"; } - const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } - const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } - const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } - const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } - const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } - - const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } - const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } - const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } - const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } - const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } - const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } - const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } - const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } - const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } - const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } - const sal_Char* getPROPERTY_COMMAND() { return "Command"; } - const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } - const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } - const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } - - const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } - const sal_Char* getPROPERTY_AGGREGATEFUNCTION() { return "AggregateFunction"; } - const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } - const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } - const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } - const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } - const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } - - const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } - const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } - - const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } - const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } - const sal_Char* getPROPERTY_ID_HAVINGCLAUSE() { return "HavingClause"; } - const sal_Char* getPROPERTY_ID_ISSIGNED() { return "IsSigned"; } - const sal_Char* getPROPERTY_ID_ISSEARCHABLE() { return "IsSearchable"; } - - const sal_Char* getPROPERTY_ID_APPLYFILTER() { return "ApplyFilter"; } - const sal_Char* getPROPERTY_ID_FILTER() { return "Filter"; } - const sal_Char* getPROPERTY_ID_MASTERFIELDS() { return "MasterFields"; } - const sal_Char* getPROPERTY_ID_DETAILFIELDS() { return "DetailFields"; } - const sal_Char* getPROPERTY_ID_FIELDTYPE() { return "FieldType"; } - const sal_Char* getPROPERTY_ID_VALUE() { return "Value"; } - const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION() { return "ActiveConnection"; } - const sal_Char* getPROPERTY_ID_LABEL() { return "Label"; } + const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } + const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } + const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } + const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } + const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } + const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } + const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } + const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } + const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } + const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } + + const sal_Char* getPROPERTY_NAME() { return "Name"; } + const sal_Char* getPROPERTY_TYPE() { return "Type"; } + const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } + const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } + const sal_Char* getPROPERTY_SCALE() { return "Scale"; } + const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } + const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } + const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } + const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } + const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } + + const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } + const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } + const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } + const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } + const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } + const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } + const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } + const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } + const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } + const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } + const sal_Char* getPROPERTY_COMMAND() { return "Command"; } + const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } + const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } + const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } + + const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } + const sal_Char* getPROPERTY_AGGREGATEFUNCTION() { return "AggregateFunction"; } + const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } + const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } + const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } + const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } + const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } + + const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } + const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } + + const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } + const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } + const sal_Char* getPROPERTY_ID_HAVINGCLAUSE() { return "HavingClause"; } + const sal_Char* getPROPERTY_ID_ISSIGNED() { return "IsSigned"; } + const sal_Char* getPROPERTY_ID_ISSEARCHABLE() { return "IsSearchable"; } + + const sal_Char* getPROPERTY_ID_APPLYFILTER() { return "ApplyFilter"; } + const sal_Char* getPROPERTY_ID_FILTER() { return "Filter"; } + const sal_Char* getPROPERTY_ID_MASTERFIELDS() { return "MasterFields"; } + const sal_Char* getPROPERTY_ID_DETAILFIELDS() { return "DetailFields"; } + const sal_Char* getPROPERTY_ID_FIELDTYPE() { return "FieldType"; } + const sal_Char* getPROPERTY_ID_VALUE() { return "Value"; } + const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION() { return "ActiveConnection"; } + const sal_Char* getPROPERTY_ID_LABEL() { return "Label"; } //============================================================ //= error messages //============================================================ - const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } - const sal_Char* getSTR_DELIMITER() { return "/"; } - + const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } + const sal_Char* getSTR_DELIMITER() { return "/"; } + OPropertyMap::~OPropertyMap() { @@ -128,68 +128,68 @@ namespace dbtools rtl_uString* pStr = NULL; switch(_nIndex) { - case PROPERTY_ID_QUERYTIMEOUT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_QUERYTIMEOUT() ); break; } - case PROPERTY_ID_MAXFIELDSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXFIELDSIZE() ); break; } - case PROPERTY_ID_MAXROWS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXROWS() ); break; } - case PROPERTY_ID_CURSORNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CURSORNAME() ); break; } - case PROPERTY_ID_RESULTSETCONCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETCONCURRENCY() ); break; } - case PROPERTY_ID_RESULTSETTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETTYPE() ); break; } - case PROPERTY_ID_FETCHDIRECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHDIRECTION() ); break; } - case PROPERTY_ID_FETCHSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHSIZE() ); break; } - case PROPERTY_ID_ESCAPEPROCESSING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ESCAPEPROCESSING() ); break; } - case PROPERTY_ID_USEBOOKMARKS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_USEBOOKMARKS() ); break; } - // Column - case PROPERTY_ID_NAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_NAME() ); break; } - case PROPERTY_ID_TYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPE() ); break; } - case PROPERTY_ID_TYPENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPENAME() ); break; } - case PROPERTY_ID_PRECISION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRECISION() ); break; } - case PROPERTY_ID_SCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCALE() ); break; } - case PROPERTY_ID_ISNULLABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISNULLABLE() ); break; } - case PROPERTY_ID_ISAUTOINCREMENT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISAUTOINCREMENT() ); break; } - case PROPERTY_ID_ISROWVERSION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISROWVERSION() ); break; } - case PROPERTY_ID_DESCRIPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DESCRIPTION() ); break; } - case PROPERTY_ID_DEFAULTVALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DEFAULTVALUE() ); break; } - - case PROPERTY_ID_REFERENCEDTABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REFERENCEDTABLE() ); break; } - case PROPERTY_ID_UPDATERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_UPDATERULE() ); break; } - case PROPERTY_ID_DELETERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DELETERULE() ); break; } - case PROPERTY_ID_CATALOG: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOG() ); break; } - case PROPERTY_ID_ISUNIQUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISUNIQUE() ); break; } - case PROPERTY_ID_ISPRIMARYKEYINDEX: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISPRIMARYKEYINDEX() ); break; } - case PROPERTY_ID_ISCLUSTERED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCLUSTERED() ); break; } - case PROPERTY_ID_ISASCENDING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISASCENDING() ); break; } - case PROPERTY_ID_SCHEMANAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCHEMANAME() ); break; } - case PROPERTY_ID_CATALOGNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOGNAME() ); break; } - - case PROPERTY_ID_COMMAND: { rtl_uString_newFromAscii(&pStr,getPROPERTY_COMMAND() ); break; } - case PROPERTY_ID_CHECKOPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CHECKOPTION() ); break; } - case PROPERTY_ID_PASSWORD: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PASSWORD() ); break; } - case PROPERTY_ID_RELATEDCOLUMN: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RELATEDCOLUMN() ); break; } - - case PROPERTY_ID_FUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FUNCTION() ); break; } - case PROPERTY_ID_AGGREGATEFUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AGGREGATEFUNCTION() ); break; } - case PROPERTY_ID_TABLENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TABLENAME() ); break; } - case PROPERTY_ID_REALNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REALNAME() ); break; } - case PROPERTY_ID_DBASEPRECISIONCHANGED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED()); break; } - case PROPERTY_ID_ISCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCURRENCY() ); break; } - case PROPERTY_ID_ISBOOKMARKABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISBOOKMARKABLE() ); break; } - case PROPERTY_ID_HY010: { rtl_uString_newFromAscii(&pStr,getSQLSTATE_SEQUENCE() ); break; } - case PROPERTY_ID_DELIMITER: { rtl_uString_newFromAscii(&pStr,getSTR_DELIMITER() ); break; } - case PROPERTY_ID_FORMATKEY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FORMATKEY() ); break; } - case PROPERTY_ID_LOCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_LOCALE() ); break; } - case PROPERTY_ID_AUTOINCREMENTCREATION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()); break; } - case PROPERTY_ID_PRIVILEGES: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRIVILEGES() ); break; } - case PROPERTY_ID_HAVINGCLAUSE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE() ); break; } - case PROPERTY_ID_ISSIGNED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED() ); break; } - case PROPERTY_ID_ISSEARCHABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE() ); break; } - case PROPERTY_ID_LABEL: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_LABEL() ); break; } - case PROPERTY_ID_APPLYFILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER() ); break; } - case PROPERTY_ID_FILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER() ); break; } - case PROPERTY_ID_MASTERFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS() ); break; } - case PROPERTY_ID_DETAILFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_DETAILFIELDS() ); break; } - case PROPERTY_ID_FIELDTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FIELDTYPE() ); break; } - case PROPERTY_ID_VALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_VALUE() ); break; } - case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; } + case PROPERTY_ID_QUERYTIMEOUT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_QUERYTIMEOUT() ); break; } + case PROPERTY_ID_MAXFIELDSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXFIELDSIZE() ); break; } + case PROPERTY_ID_MAXROWS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXROWS() ); break; } + case PROPERTY_ID_CURSORNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CURSORNAME() ); break; } + case PROPERTY_ID_RESULTSETCONCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETCONCURRENCY() ); break; } + case PROPERTY_ID_RESULTSETTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETTYPE() ); break; } + case PROPERTY_ID_FETCHDIRECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHDIRECTION() ); break; } + case PROPERTY_ID_FETCHSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHSIZE() ); break; } + case PROPERTY_ID_ESCAPEPROCESSING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ESCAPEPROCESSING() ); break; } + case PROPERTY_ID_USEBOOKMARKS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_USEBOOKMARKS() ); break; } + // Column + case PROPERTY_ID_NAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_NAME() ); break; } + case PROPERTY_ID_TYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPE() ); break; } + case PROPERTY_ID_TYPENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPENAME() ); break; } + case PROPERTY_ID_PRECISION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRECISION() ); break; } + case PROPERTY_ID_SCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCALE() ); break; } + case PROPERTY_ID_ISNULLABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISNULLABLE() ); break; } + case PROPERTY_ID_ISAUTOINCREMENT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISAUTOINCREMENT() ); break; } + case PROPERTY_ID_ISROWVERSION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISROWVERSION() ); break; } + case PROPERTY_ID_DESCRIPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DESCRIPTION() ); break; } + case PROPERTY_ID_DEFAULTVALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DEFAULTVALUE() ); break; } + + case PROPERTY_ID_REFERENCEDTABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REFERENCEDTABLE() ); break; } + case PROPERTY_ID_UPDATERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_UPDATERULE() ); break; } + case PROPERTY_ID_DELETERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DELETERULE() ); break; } + case PROPERTY_ID_CATALOG: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOG() ); break; } + case PROPERTY_ID_ISUNIQUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISUNIQUE() ); break; } + case PROPERTY_ID_ISPRIMARYKEYINDEX: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISPRIMARYKEYINDEX() ); break; } + case PROPERTY_ID_ISCLUSTERED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCLUSTERED() ); break; } + case PROPERTY_ID_ISASCENDING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISASCENDING() ); break; } + case PROPERTY_ID_SCHEMANAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCHEMANAME() ); break; } + case PROPERTY_ID_CATALOGNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOGNAME() ); break; } + + case PROPERTY_ID_COMMAND: { rtl_uString_newFromAscii(&pStr,getPROPERTY_COMMAND() ); break; } + case PROPERTY_ID_CHECKOPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CHECKOPTION() ); break; } + case PROPERTY_ID_PASSWORD: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PASSWORD() ); break; } + case PROPERTY_ID_RELATEDCOLUMN: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RELATEDCOLUMN() ); break; } + + case PROPERTY_ID_FUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FUNCTION() ); break; } + case PROPERTY_ID_AGGREGATEFUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AGGREGATEFUNCTION() ); break; } + case PROPERTY_ID_TABLENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TABLENAME() ); break; } + case PROPERTY_ID_REALNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REALNAME() ); break; } + case PROPERTY_ID_DBASEPRECISIONCHANGED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED()); break; } + case PROPERTY_ID_ISCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCURRENCY() ); break; } + case PROPERTY_ID_ISBOOKMARKABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISBOOKMARKABLE() ); break; } + case PROPERTY_ID_HY010: { rtl_uString_newFromAscii(&pStr,getSQLSTATE_SEQUENCE() ); break; } + case PROPERTY_ID_DELIMITER: { rtl_uString_newFromAscii(&pStr,getSTR_DELIMITER() ); break; } + case PROPERTY_ID_FORMATKEY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FORMATKEY() ); break; } + case PROPERTY_ID_LOCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_LOCALE() ); break; } + case PROPERTY_ID_AUTOINCREMENTCREATION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()); break; } + case PROPERTY_ID_PRIVILEGES: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRIVILEGES() ); break; } + case PROPERTY_ID_HAVINGCLAUSE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE() ); break; } + case PROPERTY_ID_ISSIGNED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED() ); break; } + case PROPERTY_ID_ISSEARCHABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE() ); break; } + case PROPERTY_ID_LABEL: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_LABEL() ); break; } + case PROPERTY_ID_APPLYFILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER() ); break; } + case PROPERTY_ID_FILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER() ); break; } + case PROPERTY_ID_MASTERFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS() ); break; } + case PROPERTY_ID_DETAILFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_DETAILFIELDS() ); break; } + case PROPERTY_ID_FIELDTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FIELDTYPE() ); break; } + case PROPERTY_ID_VALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_VALUE() ); break; } + case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; } } m_aPropertyMap[_nIndex] = pStr; return pStr; diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 59abac1d1016..11cf19a82323 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 3fd2b763554b..4122a67597dc 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx index f0ed7b0aa7b3..407f08596d66 100644 --- a/connectivity/source/commontools/warningscontainer.cxx +++ b/connectivity/source/commontools/warningscontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |