diff options
Diffstat (limited to 'connectivity/source/drivers')
103 files changed, 354 insertions, 360 deletions
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 1823251f88e9..0d8846f802f2 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -34,9 +34,9 @@ IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement m_pParameters->get_Item(OLEVariant(sal_Int32(columnIndex-1)),&pParam); \ if(pParam) \ pParam->get_Value(&m_aValue); -//************************************************************** + //************ Class: java.sql.CallableStatement -//************************************************************** + OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql ) : OPreparedStatement( _pConnection, _TypeInfo, sql ) { diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index cebb4a38cc5a..af91f6fe7af6 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -188,7 +188,7 @@ OLEVariant::OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) OSL_UNUSED(rs); } } -// + OLEVariant& OLEVariant::operator=(const OLEVariant& varSrc) { HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(static_cast<const VARIANT*>(&varSrc))); @@ -197,7 +197,7 @@ OLEVariant& OLEVariant::operator=(const OLEVariant& varSrc) return *this; } // Assign a const VARIANT& (::VariantCopy handles everything) -// + OLEVariant& OLEVariant::operator=(const tagVARIANT& varSrc) { HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(&varSrc)); @@ -208,7 +208,7 @@ OLEVariant& OLEVariant::operator=(const tagVARIANT& varSrc) } // Assign a const VARIANT* (::VariantCopy handles everything) -// + OLEVariant& OLEVariant::operator=(const VARIANT* pSrc) { HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(pSrc)); @@ -415,9 +415,9 @@ OLEVariant::operator OUString() const void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) { - // + // If pDest is NULL, convert type in place - // + if (pSrc == NULL) pSrc = this; diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx index 00ca2e78095d..f64995820935 100644 --- a/connectivity/source/drivers/dbase/DIndexIter.cxx +++ b/connectivity/source/drivers/dbase/DIndexIter.cxx @@ -24,9 +24,9 @@ using namespace ::com::sun::star::sdb; using namespace connectivity; using namespace connectivity::dbase; using namespace connectivity::file; -//================================================================== + // OIndexIterator -//================================================================== + OIndexIterator::~OIndexIterator() { diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 04d5fedbc1c6..a81732561586 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -65,9 +65,9 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) } -//================================================================== + // index page -//================================================================== + ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent) :nPagePos(nPos) ,bModified(sal_False) @@ -647,9 +647,9 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage) } } } -//================================================================== + // ONDXNode -//================================================================== + void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) @@ -727,9 +727,9 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent) return aChild; } -//================================================================== + // ONDXKey -//================================================================== + sal_Bool ONDXKey::IsText(sal_Int32 eType) { @@ -797,9 +797,9 @@ SvStream& connectivity::dbase::WriteONDXPagePtr(SvStream &rStream, const ONDXPag return rStream; } -//================================================================== + // ONDXPagePtr -//================================================================== + ONDXPagePtr::ONDXPagePtr(const ONDXPagePtr& rRef) :ONDXPageRef(rRef) diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 017393191057..90ff744e4f07 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -29,9 +29,9 @@ namespace connectivity { namespace evoab { - //************************************************************** + //************ Class: OEvoabDatabaseMetaData - //************************************************************** + typedef struct{ gboolean bIsSplittedValue; GParamSpec *pField; diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index df8aece04a2a..beadbc880d82 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -58,9 +58,9 @@ namespace connectivity }; ::std::vector< Parameter> m_aParameters; - //==================================================================== + // Data attributes - //==================================================================== + // our SQL statement OUString m_sSqlStatement; diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 9e1e75238faa..d50b6bfb177f 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -29,9 +29,9 @@ namespace connectivity { namespace evoab { - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OEvoabResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index c2001a14a65b..7c3458b3d2c2 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -598,9 +598,9 @@ Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } -// ============================================================================= + // = OStatement -// ============================================================================= + IMPLEMENT_SERVICE_INFO( OStatement, "com.sun.star.comp.sdbcx.evoab.OStatement", "com.sun.star.sdbc.Statement" ); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 0ad25399091f..5339e4dcbf15 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -130,10 +130,10 @@ namespace connectivity } }; - //************************************************************** + //************ Class: OCommonStatement // is a base class for the normal statement and for the prepared statement - //************************************************************** + class OCommonStatement; typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase; diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 18cc3df0ba37..59d4c47374a7 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1026,7 +1026,7 @@ sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::Move" ); //IgnoreDeletedRows: -// + sal_Int32 nTempPos = m_nRowPos; if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 9ba315fb72dd..7845d26d120b 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -748,9 +748,9 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::parseParamterElem" ); // do nothing here } -// ============================================================================= + } // namespace file -// ============================================================================= + }// namespace connectivity diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 9ce2d509a166..f20afff5427b 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -189,7 +189,7 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS m_aValue.setBound(true); } -///////////////////////////////////////////////////////////////////////////////////////// + // Implementation of the operators diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index d48adc806dbb..7931e6a69223 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -546,7 +546,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr return pOperand; } -//////////////////////////////////////////////////////////////////////////////////////// + sal_Bool OPredicateInterpreter::evaluate(OCodeList& rCodeList) { static sal_Bool bResult; diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx index 84b4f9fbe8c3..6a955b3dcaab 100644 --- a/connectivity/source/drivers/file/quotedstring.cxx +++ b/connectivity/source/drivers/file/quotedstring.cxx @@ -22,9 +22,9 @@ namespace connectivity { - //================================================================== + //= QuotedTokenizedString - //================================================================== + sal_Int32 QuotedTokenizedString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) const { diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index 2c0cc4b00e12..1d80ea048be6 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -29,9 +29,9 @@ namespace connectivity { namespace firebird { - //************************************************************** + //************ Class: ODatabaseMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 65bacd7439b9..883ff7b3fcd6 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -40,11 +40,11 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); -//*************************************************************************************** -// + + // The required C-Api must be provided! // It contains of 3 special functions that have to be exported. -// + void REGISTER_PROVIDER( diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index 4c78272312ca..795449afe1e0 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -107,7 +107,7 @@ namespace connectivity template<class TYPE> ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex; - //------------------------------------------------------------------ + template <class TYPE> OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper() { @@ -115,7 +115,7 @@ namespace connectivity ++s_nRefCount; } - //------------------------------------------------------------------ + template <class TYPE> ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYPE>::getArrayHelper() { diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index e8fe000a7feb..6d95714654e4 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -83,9 +83,9 @@ namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode; namespace connectivity { namespace hsqldb { - // ============================================================================= + // = FlushListeners - // ============================================================================= + typedef ::comphelper::OListenerContainerBase< XFlushListener, EventObject > FlushListeners_Base; class FlushListeners : public FlushListeners_Base { @@ -106,9 +106,9 @@ namespace connectivity { namespace hsqldb return true; // continue notifying the other listeners, if any } - // ============================================================================= + // = OHsqlConnection - // ============================================================================= + void SAL_CALL OHsqlConnection::disposing(void) { diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 24327c59fd76..6c79e7419228 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -59,10 +59,10 @@ #include <boost/scoped_ptr.hpp> -//........................................................................ + namespace connectivity { -//........................................................................ + using namespace hsqldb; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -86,9 +86,9 @@ namespace connectivity - //==================================================================== + //= ODriverDelegator - //==================================================================== + ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext) : ODriverDelegator_BASE(m_aMutex) @@ -689,7 +689,7 @@ namespace connectivity namespace { - //.............................................................. + const sal_Char* lcl_getCollationForLocale( const OUString& _rLocaleString, bool _bAcceptCountryMismatch = false ) { static const sal_Char* pTranslations[] = @@ -824,17 +824,17 @@ namespace connectivity return "Latin1_General"; } - //.............................................................. + OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext ) { OUString sLocaleString = "en-US"; try { - //......................................................... + Reference< XMultiServiceFactory > xConfigProvider( com::sun::star::configuration::theDefaultProvider::get( _rxContext ) ); - //......................................................... + // arguments for creating the config access Sequence< Any > aArguments(2); // the path to the node to open @@ -848,7 +848,7 @@ namespace connectivity makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE ); - //......................................................... + // create the access Reference< XPropertySet > xNode( xConfigProvider->createInstanceWithArguments( @@ -857,7 +857,7 @@ namespace connectivity UNO_QUERY ); OSL_ENSURE( xNode.is(), "lcl_getSystemLocale: invalid access returned (should throw an exception instead)!" ); - //......................................................... + // ask for the system locale setting if ( xNode.is() ) xNode->getPropertyValue("ooSetupSystemLocale") >>= sLocaleString; @@ -900,8 +900,8 @@ namespace connectivity -//........................................................................ + } // namespace connectivity -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index d992a35f2bb8..c42d8b461f2b 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -28,13 +28,13 @@ #include <o3tl/compat_functional.hxx> -//........................................................................ + namespace connectivity { -//........................................................................ + namespace hsqldb { - //........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::embed; @@ -339,12 +339,12 @@ namespace connectivity OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } - //........................................................................ + } // namespace hsqldb - //........................................................................ -//........................................................................ + + } // namespace connectivity -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 6b0c367d19a2..a821d70501eb 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx @@ -21,10 +21,10 @@ #include "HTerminateListener.hxx" #include "hsqldb/HDriver.hxx" -//........................................................................ + namespace connectivity { -//........................................................................ + using namespace hsqldb; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -50,8 +50,8 @@ throw( RuntimeException, std::exception ) m_pDriver->shutdownConnections(); } -//........................................................................ + } // namespace connectivity -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index 3c4da5efb915..dba0c42ae8c8 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -22,10 +22,10 @@ #include <cppuhelper/compbase1.hxx> #include <com/sun/star/frame/XTerminateListener.hpp> -//........................................................................ + namespace connectivity { -//........................................................................ + namespace hsqldb { @@ -50,9 +50,9 @@ namespace connectivity throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; } -//........................................................................ + } // namespace connectivity -//........................................................................ + #endif // CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx index 2ea7be02e2ea..af568aafeca2 100644 --- a/connectivity/source/drivers/hsqldb/HTools.cxx +++ b/connectivity/source/drivers/hsqldb/HTools.cxx @@ -19,12 +19,12 @@ #include "hsqldb/HTools.hxx" -//........................................................................ + namespace connectivity { namespace hsqldb { - //==================================================================== + //= HTools - //==================================================================== + void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog, const OUString _rSchema, const OUString _rName, bool _bShortForm ) @@ -49,8 +49,8 @@ namespace connectivity { namespace hsqldb _inout_rBuffer.appendAscii( "'" ); } -//........................................................................ + } } // namespace connectivity::hsqldb -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 2bd26fcb232a..15cec42de916 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -34,10 +34,10 @@ #include <tools/diagnose_ex.h> #include <unotools/sharedunocomponent.hxx> -//........................................................................ + namespace connectivity { namespace hsqldb { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; @@ -55,9 +55,9 @@ namespace connectivity { namespace hsqldb using ::com::sun::star::lang::DisposedException; using ::com::sun::star::sdbc::XRow; - //==================================================================== + //= HView - //==================================================================== + HView::HView( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive, const OUString& _rSchemaName, const OUString& _rName ) @@ -194,8 +194,8 @@ namespace connectivity { namespace hsqldb return sCommand; } -//........................................................................ + } } // namespace connectivity::hsqldb -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 1f127c95f38e..5ca1c21aad2b 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -272,7 +272,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp // Casting bytesRead to an int is okay, since the user can // only pass in an integer length to read, so the bytesRead // must <= len. - // + if (nBytesRead <= 0) { #ifdef HSQLDB_DBG aOpLog.logReturn( (jint)-1 ); diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 2c54c4ee88ca..8fccdef8d4f9 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -22,9 +22,9 @@ #include "java/sql/ResultSet.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.sql.Array -//************************************************************** + jclass java_sql_Array::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index 2a5a96a7f416..5795053165f7 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -25,9 +25,9 @@ #include <string.h> using namespace connectivity; -//************************************************************** + //************ Class: java.sql.Blob -//************************************************************** + jclass java_sql_Blob::theClass = 0; java_sql_Blob::java_sql_Blob( JNIEnv * pEnv, jobject myObj ) diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx index 25c40367b460..ef82e3416616 100644 --- a/connectivity/source/drivers/jdbc/Boolean.cxx +++ b/connectivity/source/drivers/jdbc/Boolean.cxx @@ -19,9 +19,9 @@ #include "java/lang/Boolean.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.lang.Boolean -//************************************************************** + jclass java_lang_Boolean::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 762f2929d500..a39bab042593 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -40,9 +40,9 @@ using namespace ::com::sun::star::lang; IMPLEMENT_SERVICE_INFO(java_sql_CallableStatement,"com.sun.star.sdbcx.ACallableStatement","com.sun.star.sdbc.CallableStatement"); -//************************************************************** + //************ Class: java.sql.CallableStatement -//************************************************************** + java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql ) : java_sql_PreparedStatement( pEnv, _rCon, sql ) { diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx index 5d03bd3448da..0a2753b36a7f 100644 --- a/connectivity/source/drivers/jdbc/Class.cxx +++ b/connectivity/source/drivers/jdbc/Class.cxx @@ -22,9 +22,9 @@ #include <rtl/ustring.hxx> using namespace connectivity; -//************************************************************** + //************ Class: java.lang.Class -//************************************************************** + jclass java_lang_Class::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index 7bdcc27fb0c3..279dac3b1c33 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -23,9 +23,9 @@ #include <connectivity/dbexception.hxx> using namespace connectivity; -//************************************************************** + //************ Class: java.sql.Clob -//************************************************************** + jclass java_sql_Clob::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index c8574f2e87e7..e8eddc4e87dc 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -26,9 +26,9 @@ #include <stdio.h> -//........................................................................ + namespace connectivity { namespace java { namespace sql { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -43,9 +43,9 @@ namespace connectivity { namespace java { namespace sql { } } - //==================================================================== + //= ConnectionLog - //==================================================================== + ConnectionLog::ConnectionLog( const ::comphelper::ResourceBasedEventLogger& _rDriverLog ) :ConnectionLog_Base( _rDriverLog ) @@ -67,14 +67,14 @@ namespace connectivity { namespace java { namespace sql { { } -//........................................................................ + } } } // namespace connectivity::java::sql -//........................................................................ -//........................................................................ + + namespace comphelper { namespace log { namespace convert { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; @@ -113,8 +113,8 @@ namespace comphelper { namespace log { namespace convert return OUString::createFromAscii( buffer ); } -//........................................................................ + } } } // comphelper::log::convert -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx index f92c541b67fe..3562f6649a5a 100644 --- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx +++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx @@ -20,19 +20,19 @@ #include "java/ContextClassLoader.hxx" #include "java/lang/Object.hxx" -//........................................................................ + namespace connectivity { namespace jdbc { -//........................................................................ + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::connectivity::java_lang_Object; - //==================================================================== + //= ContextClassLoaderScope - //==================================================================== + ContextClassLoaderScope::ContextClassLoaderScope( JNIEnv& environment, const GlobalRef< jobject >& newClassLoader, const ::comphelper::ResourceBasedEventLogger& _rLoggerForErrors, const Reference< XInterface >& _rxErrorContext ) @@ -111,8 +111,8 @@ namespace connectivity { namespace jdbc } } } -//........................................................................ + } } // namespace connectivity::jdbc -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 6c094ab9433c..48dde51a76c2 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -39,9 +39,9 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//************************************************************** + //************ Class: java.sql.DatabaseMetaData -//************************************************************** + jclass java_sql_DatabaseMetaData::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx index ec3f45fc6344..748597a7566f 100644 --- a/connectivity/source/drivers/jdbc/Date.cxx +++ b/connectivity/source/drivers/jdbc/Date.cxx @@ -21,9 +21,9 @@ #include "java/tools.hxx" #include "connectivity/dbconversion.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.util.Date -//************************************************************** + jclass java_util_Date::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index 956cad32fb82..aee35fdb0ef4 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//************************************************************** + //************ Class: java.sql.Driver -//************************************************************** + jclass java_sql_DriverPropertyInfo::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx index 6f6275699d83..15999a1a45cd 100644 --- a/connectivity/source/drivers/jdbc/Exception.cxx +++ b/connectivity/source/drivers/jdbc/Exception.cxx @@ -19,9 +19,9 @@ #include "java/lang/Exception.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.lang.Exception -//************************************************************** + jclass java_lang_Exception::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index e1991c56928c..c6588650aca9 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -30,9 +30,9 @@ using namespace connectivity; #define THROW_WHERE "" #endif -//************************************************************** + //************ Class: java.io.InputStream -//************************************************************** + jclass java_io_InputStream::theClass = 0; java_io_InputStream::java_io_InputStream( JNIEnv * pEnv, jobject myObj ) diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx index 67ab1772ae6f..4b7bc76c59f4 100644 --- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx +++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx @@ -21,9 +21,9 @@ #include "java/tools.hxx" #include "resource/jdbc_log.hrc" using namespace connectivity; -//************************************************************** + //************ Class: java.lang.Boolean -//************************************************************** + jclass java_math_BigDecimal::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index e4ff859485e0..2b7c3dd9f063 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -252,9 +252,9 @@ bool loadClass( IMPLEMENT_SERVICE_INFO(java_sql_Connection,"com.sun.star.sdbcx.JConnection","com.sun.star.sdbc.Connection"); -//************************************************************** + //************ Class: java.sql.Connection -//************************************************************** + jclass java_sql_Connection::theClass = 0; java_sql_Connection::java_sql_Connection( const java_sql_Driver& _rDriver ) diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 958cd36f560e..3f94d4bb7948 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -51,9 +51,9 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//************************************************************** + //************ Class: java.sql.Statement -//************************************************************** + jclass java_sql_Statement_Base::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index b821ff5e7a81..d9e97d52a003 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -43,9 +43,9 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//************************************************************** + //************ Class: java.sql.PreparedStatement -//************************************************************** + IMPLEMENT_SERVICE_INFO(java_sql_PreparedStatement,"com.sun.star.sdbcx.JPreparedStatement","com.sun.star.sdbc.PreparedStatement"); java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql ) diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 3ae15ff50c39..3d07a72f25e3 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -21,9 +21,9 @@ #include <string.h> using namespace connectivity; -//************************************************************** + //************ Class: java.io.Reader -//************************************************************** + jclass java_io_Reader::theClass = 0; java_io_Reader::java_io_Reader( JNIEnv * pEnv, jobject myObj ) diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index 0c75d931db69..b6cad44e1b18 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -20,9 +20,9 @@ #include "java/sql/Ref.hxx" #include "java/tools.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.sql.Ref -//************************************************************** + jclass java_sql_Ref::theClass = 0; java_sql_Ref::java_sql_Ref( JNIEnv * pEnv, jobject myObj ) diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index b4acd4c54d5e..a23d11b99541 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -58,9 +58,9 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; IMPLEMENT_SERVICE_INFO(java_sql_ResultSet,"com.sun.star.sdbcx.JResultSet","com.sun.star.sdbc.ResultSet"); -//************************************************************** + //************ Class: java.sql.ResultSet -//************************************************************** + jclass java_sql_ResultSet::theClass = 0; java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt) diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index 48a8f0d8f699..24155d7dccce 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -28,9 +28,9 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//************************************************************** + //************ Class: java.sql.ResultSetMetaData -//************************************************************** + jclass java_sql_ResultSetMetaData::theClass = 0; java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ) diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx index c8857ab2beef..765afb2dee4e 100644 --- a/connectivity/source/drivers/jdbc/SQLException.cxx +++ b/connectivity/source/drivers/jdbc/SQLException.cxx @@ -26,9 +26,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//************************************************************** + //************ Class: java.sql.SQLException -//************************************************************** + java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const Reference< XInterface> & _rContext) : starsdbc::SQLException( _rException.getMessage(), _rContext, diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx index c48b4eb62852..68cb63a39924 100644 --- a/connectivity/source/drivers/jdbc/SQLWarning.cxx +++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx @@ -19,9 +19,9 @@ #include "java/sql/SQLWarning.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.sql.SQLWarning -//************************************************************** + jclass java_sql_SQLWarning_BASE::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx index 477ab07036c2..f8c1368e9cc7 100644 --- a/connectivity/source/drivers/jdbc/String.cxx +++ b/connectivity/source/drivers/jdbc/String.cxx @@ -20,9 +20,9 @@ #include "java/lang/String.hxx" #include "java/tools.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.lang.String -//************************************************************** + jclass java_lang_String::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx index 6143ff7ec343..fa3395ac9d3f 100644 --- a/connectivity/source/drivers/jdbc/Throwable.cxx +++ b/connectivity/source/drivers/jdbc/Throwable.cxx @@ -20,9 +20,9 @@ #include "java/lang/Throwable.hxx" #include "java/tools.hxx" using namespace connectivity; -//************************************************************** + //************ Class: java.lang.Throwable -//************************************************************** + jclass java_lang_Throwable::theClass = 0; diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 20d257714514..4fedd1e1bc1b 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -24,9 +24,9 @@ using namespace ::comphelper; using namespace connectivity; -//************************************************************** + //************ Class: java.sql.Date -//************************************************************** + jclass java_sql_Date::theClass = 0; java_sql_Date::java_sql_Date( const ::com::sun::star::util::Date& _rOut ) : java_util_Date( NULL, (jobject)NULL ) @@ -75,9 +75,9 @@ java_sql_Date::operator ::com::sun::star::util::Date() return ::dbtools::DBTypeConversion::toDate(toString()); } -//************************************************************** + //************ Class: java.sql.Time -//************************************************************** + jclass java_sql_Time::theClass = 0; @@ -126,9 +126,9 @@ java_sql_Time::operator ::com::sun::star::util::Time() { return ::dbtools::DBTypeConversion::toTime(toString()); } -//************************************************************** + //************ Class: java.sql.Timestamp -//************************************************************** + jclass java_sql_Timestamp::theClass = 0; diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index f379a4051fb7..7631008b88c1 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -60,9 +60,9 @@ namespace connectivity friend class OSubComponent<KabConnection, KabConnection_BASE>; protected: - //==================================================================== + // Data attributes - //==================================================================== + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx index 411bae233d21..337b0a1ebaa5 100644 --- a/connectivity/source/drivers/kab/KDEInit.cxx +++ b/connectivity/source/drivers/kab/KDEInit.cxx @@ -27,9 +27,9 @@ namespace connectivity { namespace kab { - // =============================================================== + // = KDEInit - // =============================================================== + class KDEInit { private: @@ -94,7 +94,7 @@ namespace connectivity } } -// ======================================================================= + namespace { double normalizeVersion( unsigned int major, unsigned int minor ) diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 10fbd9389088..470ed073be64 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -28,9 +28,9 @@ namespace connectivity { namespace kab { - //************************************************************** + //************ Class: KabDatabaseMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> KabDatabaseMetaData_BASE; diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 5b48222e1874..a4ef7cae3363 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -42,9 +42,9 @@ using namespace com::sun::star::sdb; using namespace com::sun::star::frame; using namespace connectivity::kab; -// ======================================================================= + // = KabImplModule -// ======================================================================= + KabImplModule::KabImplModule( const Reference< XComponentContext >& _rxContext ) :m_xContext(_rxContext) @@ -91,7 +91,7 @@ namespace _rFunction = NULL; if ( _rModule ) { - // + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) ); @@ -299,9 +299,9 @@ void KabImplModule::shutdown() impl_unloadModule(); } -// ======================================================================= + // = KabDriver -// ======================================================================= + KabDriver::KabDriver( const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) : KDriver_BASE(m_aMutex), diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index 095aa11ca8c8..a633d920c0a2 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -41,9 +41,9 @@ namespace connectivity typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; - // =============================================================== + // = KabImplModule - // =============================================================== + class KabImplModule { private: @@ -139,9 +139,9 @@ namespace connectivity bool impl_doAllowNewKDEVersion(); }; - // =============================================================== + // = KabDriver - // =============================================================== + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XTerminateListener > KDriver_BASE; diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index a0e872d7988a..7d453d36ace5 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -39,10 +39,10 @@ namespace connectivity ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE; - //************************************************************** + // Class KabCommonStatement // is a base class for the normal statement and for the prepared statement - //************************************************************** + class KabCommonStatement : public comphelper::OBaseMutex, public KabCommonStatement_BASE, public ::cppu::OPropertySetHelper, @@ -139,9 +139,9 @@ namespace connectivity ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; - //************************************************************** + // Class KabStatement - //************************************************************** + typedef ::cppu::ImplInheritanceHelper1< KabCommonStatement, ::com::sun::star::lang::XServiceInfo > KabStatement_BASE; diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index b9a60fb0e1a3..bc7e2aa44b3c 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -28,7 +28,7 @@ namespace connectivity { namespace kab { -// ----------------------------------------------------------------------------- + class KabCondition { public: @@ -37,7 +37,7 @@ class KabCondition virtual sal_Bool isAlwaysFalse() const = 0; virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const = 0; }; -// ----------------------------------------------------------------------------- + class KabConditionConstant : public KabCondition { protected: @@ -49,7 +49,7 @@ class KabConditionConstant : public KabCondition virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionColumn : public KabCondition { protected: @@ -63,7 +63,7 @@ class KabConditionColumn : public KabCondition virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; }; -// ----------------------------------------------------------------------------- + class KabConditionNull : public KabConditionColumn { public: @@ -71,7 +71,7 @@ class KabConditionNull : public KabConditionColumn const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionNotNull : public KabConditionColumn { public: @@ -79,7 +79,7 @@ class KabConditionNotNull : public KabConditionColumn const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionCompare : public KabConditionColumn { protected: @@ -90,7 +90,7 @@ class KabConditionCompare : public KabConditionColumn const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); }; -// ----------------------------------------------------------------------------- + class KabConditionEqual : public KabConditionCompare { public: @@ -99,7 +99,7 @@ class KabConditionEqual : public KabConditionCompare const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionDifferent : public KabConditionCompare { public: @@ -108,7 +108,7 @@ class KabConditionDifferent : public KabConditionCompare const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionSimilar : public KabConditionCompare { public: @@ -117,7 +117,7 @@ class KabConditionSimilar : public KabConditionCompare const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionBoolean : public KabCondition { protected: @@ -127,7 +127,7 @@ class KabConditionBoolean : public KabCondition KabConditionBoolean(KabCondition *pLeft, KabCondition *pRight); virtual ~KabConditionBoolean(); }; -// ----------------------------------------------------------------------------- + class KabConditionOr : public KabConditionBoolean { public: @@ -136,7 +136,7 @@ class KabConditionOr : public KabConditionBoolean virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool eval(const ::KABC::Addressee &aAddressee) const; }; -// ----------------------------------------------------------------------------- + class KabConditionAnd : public KabConditionBoolean { public: @@ -145,7 +145,7 @@ class KabConditionAnd : public KabConditionBoolean virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool eval(const ::KABC::Addressee &addressee) const; }; -// ----------------------------------------------------------------------------- + } } diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 853628625845..9c0f8e5024f4 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -56,9 +56,9 @@ namespace connectivity friend class OSubComponent<MacabConnection, MacabConnection_BASE>; protected: - //==================================================================== + // Data attributes - //==================================================================== + MacabAddressBook* m_pAddressBook; // the address book MacabDriver* m_pDriver; // pointer to the owning driver object ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 20b75f1da632..3af626f01ce8 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -28,9 +28,9 @@ namespace connectivity { namespace macab { - //************************************************************** + //************ Class: MacabDatabaseMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE; diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 7a23ae394129..08f4b51ff08e 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -38,9 +38,9 @@ using namespace com::sun::star::sdb; using namespace com::sun::star::frame; using namespace connectivity::macab; -// ======================================================================= + // = MacabImplModule -// ======================================================================= + MacabImplModule::MacabImplModule() :m_bAttemptedLoadModule(false) @@ -64,7 +64,7 @@ namespace _rFunction = NULL; if ( _rModule ) { - // + const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName ); _rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) ); @@ -167,9 +167,9 @@ void MacabImplModule::shutdown() impl_unloadModule(); } -// ======================================================================= + // = MacabDriver -// ======================================================================= + MacabDriver::MacabDriver( const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) : MacabDriver_BASE(m_aMutex), diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 124cf38852ec..bae72130c46a 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -43,9 +43,9 @@ namespace connectivity typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; - // =============================================================== + // = MacabImplModule - // =============================================================== + class MacabImplModule { private: @@ -109,9 +109,9 @@ namespace connectivity }; - // =============================================================== + // = MacabDriver - // =============================================================== + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XTerminateListener > MacabDriver_BASE; diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 415b4264b005..9e16eb447f14 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -40,10 +40,10 @@ namespace connectivity ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable> MacabCommonStatement_BASE; - //************************************************************** + // Class MacabCommonStatement // is a base class for the normal statement and for the prepared statement - //************************************************************** + class MacabCommonStatement : public comphelper::OBaseMutex, public MacabCommonStatement_BASE, public ::cppu::OPropertySetHelper, @@ -145,9 +145,9 @@ namespace connectivity inline MacabConnection* getOwnConnection() const { return m_pConnection; } }; - //************************************************************** + // Class MacabStatement - //************************************************************** + typedef ::cppu::ImplInheritanceHelper1< MacabCommonStatement, ::com::sun::star::lang::XServiceInfo > MacabStatement_BASE; diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 76acf95056d0..269b0f681968 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -30,7 +30,7 @@ namespace connectivity { namespace macab { -// ----------------------------------------------------------------------------- + class MacabCondition { public: @@ -39,7 +39,7 @@ class MacabCondition virtual sal_Bool isAlwaysFalse() const = 0; virtual sal_Bool eval(const MacabRecord *aRecord) const = 0; }; -// ----------------------------------------------------------------------------- + class MacabConditionConstant : public MacabCondition { protected: @@ -51,7 +51,7 @@ class MacabConditionConstant : public MacabCondition virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionColumn : public MacabCondition { protected: @@ -64,7 +64,7 @@ class MacabConditionColumn : public MacabCondition virtual sal_Bool isAlwaysTrue() const; virtual sal_Bool isAlwaysFalse() const; }; -// ----------------------------------------------------------------------------- + class MacabConditionNull : public MacabConditionColumn { public: @@ -73,7 +73,7 @@ class MacabConditionNull : public MacabConditionColumn const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionNotNull : public MacabConditionColumn { public: @@ -82,7 +82,7 @@ class MacabConditionNotNull : public MacabConditionColumn const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionCompare : public MacabConditionColumn { protected: @@ -94,7 +94,7 @@ class MacabConditionCompare : public MacabConditionColumn const OUString &sColumnName, const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); }; -// ----------------------------------------------------------------------------- + class MacabConditionEqual : public MacabConditionCompare { public: @@ -104,7 +104,7 @@ class MacabConditionEqual : public MacabConditionCompare const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionDifferent : public MacabConditionCompare { public: @@ -114,7 +114,7 @@ class MacabConditionDifferent : public MacabConditionCompare const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionSimilar : public MacabConditionCompare { public: @@ -124,7 +124,7 @@ class MacabConditionSimilar : public MacabConditionCompare const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionBoolean : public MacabCondition { protected: @@ -134,7 +134,7 @@ class MacabConditionBoolean : public MacabCondition MacabConditionBoolean(MacabCondition *pLeft, MacabCondition *pRight); virtual ~MacabConditionBoolean(); }; -// ----------------------------------------------------------------------------- + class MacabConditionOr : public MacabConditionBoolean { public: @@ -143,7 +143,7 @@ class MacabConditionOr : public MacabConditionBoolean virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + class MacabConditionAnd : public MacabConditionBoolean { public: @@ -152,7 +152,7 @@ class MacabConditionAnd : public MacabConditionBoolean virtual sal_Bool isAlwaysFalse() const; virtual sal_Bool eval(const MacabRecord *aRecord) const; }; -// ----------------------------------------------------------------------------- + } } diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index 5b151575351d..0e30606b430d 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -33,7 +33,7 @@ namespace connectivity { namespace macab { - // ------------------------------------------------------------------------- + inline OUString CFStringToOUString(const CFStringRef sOrig) { /* Copied all-but directly from code by Florian Heckl in @@ -60,7 +60,7 @@ namespace connectivity return OUString(unichars); } - // ------------------------------------------------------------------------- + inline CFStringRef OUStringToCFString(const OUString& aString) { /* Copied directly from code by Florian Heckl in @@ -73,7 +73,7 @@ namespace connectivity return ref; } - // ------------------------------------------------------------------------- + inline com::sun::star::util::DateTime CFDateToDateTime(const CFDateRef _cfDate) { /* Carbon can give us the time since 2001 of any CFDateRef, @@ -96,7 +96,7 @@ namespace connectivity return nRet; } - // ------------------------------------------------------------------------- + inline OUString fixLabel(const OUString _originalLabel) { /* Get the length, and make sure that there is actually a string @@ -110,7 +110,7 @@ namespace connectivity return _originalLabel; } - // ------------------------------------------------------------------------- + inline sal_Int32 ABTypeToDataType(const ABPropertyType _abType) { sal_Int32 dataType; diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index a083d20910e8..e914f301e908 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -81,9 +81,9 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& SAL_INFO("connectivity.mork", "=> OConnection::construct()" ); // open file setURL(url); - // + // Skip 'sdbc:mozab: part of URL - // + sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 32b4a457857e..5cdb28dc1ec8 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -41,9 +41,9 @@ namespace connectivity friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; protected: - //==================================================================== + // Data attributes - //==================================================================== + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; MorkDriver* m_pDriver; // Pointer to the owning // driver object diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 4916f0bd56a1..094a9a2165e7 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -851,7 +851,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE OUString("TABLE"), OUString("VIEW") // Currently we only support a 'TABLE' and 'VIEW' nothing more complex - // + // OUString("SYSTEM TABLE"), // OUString("GLOBAL TEMPORARY"), // OUString("LOCAL TEMPORARY"), diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 77ccd9bde825..90ff82ef11c4 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -28,9 +28,9 @@ namespace connectivity namespace mork { class MDatabaseMetaDataHelper; - //************************************************************** + //************ Class: ODatabaseMetaData - //************************************************************** + class ODatabaseMetaData : public ODatabaseMetaDataBase { diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index 2faa92402c4e..eed91ab2ad03 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -30,7 +30,7 @@ namespace connectivity MDatabaseMetaDataHelper(); ~MDatabaseMetaDataHelper(); - // + sal_Bool getTableStrings( OConnection* _pCon, ::std::vector< OUString >& _rStrings); diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 859f6e598677..a9ee71078d16 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -90,7 +90,7 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url) { SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" ); // Skip 'sdbc:mozab: part of URL - // + sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); OUString aAddrbookURI(url.copy(nLen+1)); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 5f3bb904da06..5945fded2f07 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -56,9 +56,9 @@ namespace connectivity }; ::std::vector< Parameter> m_aParameters; - //==================================================================== + // Data attributes - //==================================================================== + sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement OUString m_sSqlStatement; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d361852deb5b..65e49300e978 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -348,9 +348,9 @@ sal_Bool OResultSet::pushCard(sal_uInt32 /*cardNumber*/) throw(SQLException, Run { if ( (m_aRow->get())[i].isBound() ) { - // + // Everything in the addressbook is a string! - // + if ( !m_aQuery.setRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this ); @@ -392,9 +392,9 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( { if ( (m_aRow->get())[i].isBound() ) { - // + // Everything in the addressbook is a string! - // + if ( !m_aQueryHelper.getRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwSQLException( m_aQueryHelper.getError(), *this ); @@ -1398,7 +1398,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, // the getXXX methods are 1-based ... sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column - // ... + #if OSL_DEBUG_LEVEL > 0 OSL_TRACE("Set Col Mapping: %d -> %d", nSelectColumnPos, nTableColumnPos ); #endif @@ -1431,9 +1431,9 @@ sal_Bool OResultSet::isCount() const } -// + // Check for valid row in m_aQuery -// + sal_Bool OResultSet::validRow( sal_uInt32 nRow) { sal_Int32 nNumberOfRecords = m_aQueryHelper.getResultCount(); diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index 612e09f6acfa..35d464ca7c21 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -30,9 +30,9 @@ namespace connectivity { namespace mork { - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index c19567130e05..814c80c173c4 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -50,10 +50,10 @@ namespace connectivity ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE; - //************************************************************** + //************ Class: OCommonStatement // is a base class for the normal statement and for the prepared statement - //************************************************************** + class OCommonStatement; typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE; @@ -115,9 +115,9 @@ namespace connectivity virtual ~OCommonStatement(); protected: - // + // Driver Internal Methods - // + enum StatementType { eSelect, eCreateTable }; /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index 789e569eb191..b44c3e8a7323 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -83,32 +83,26 @@ public: MorkParser( int defaultScope = 0x80 ); - /// /// Open and parse mork file bool open( const std::string &path ); - /// /// Return error status MorkErrors error(); - /// /// Returns all tables of specified scope MorkTableMap *getTables( int tableScope ); - /// /// Rerturns all rows under specified scope MorkRowMap *getRows( int rowScope, RowScopeMap *table ); - /// /// Return value of specified value oid std::string &getValue( int oid ); - /// /// Return value of specified column oid std::string &getColumn( int oid ); diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index 18aa6ca90020..2a28ef569a95 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -98,7 +98,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su { try { - //............................................................. + Reference< XNameAccess > xAliasesNode; xDriverNode->getPropertyValue("ColumnAliases") >>= xAliasesNode; OSL_ENSURE( xAliasesNode.is(), "OColumnAlias::setAlias: missing the aliases node!" ); @@ -108,7 +108,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su if ( xAliasesNode.is() ) aProgrammaticNames = xAliasesNode->getElementNames(); - //............................................................. + // travel through all the set elements const OUString* pProgrammaticNames = aProgrammaticNames.getConstArray(); const OUString* pProgrammaticNamesEnd = pProgrammaticNames + aProgrammaticNames.getLength(); @@ -124,7 +124,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su sAssignedAlias = *pProgrammaticNames; OString sAsciiProgrammaticName( OUStringToOString( *pProgrammaticNames, RTL_TEXTENCODING_ASCII_US ) ); - //............................................................. + #if OSL_DEBUG_LEVEL > 0 bool bFound = false; #endif diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 53083fb4893b..1f765df09566 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -//......................................................................... + namespace connectivity { namespace mozab @@ -40,7 +40,7 @@ namespace connectivity Reference< XPropertySet > xNode; try { - //============================================================= + // create the config provider Reference< XMultiServiceFactory > xConfigProvider( com::sun::star::configuration::theDefaultProvider::get( @@ -49,7 +49,7 @@ namespace connectivity OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" ); sCompleteNodePath += OConnection::getDriverImplementationName(); - //========================================================= + // arguments for creating the config access Sequence< Any > aArguments(2); // the path to the node to open @@ -67,7 +67,7 @@ namespace connectivity PropertyState_DIRECT_VALUE ); - //========================================================= + // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( OUString("com.sun.star.configuration.ConfigurationAccess" ), @@ -172,7 +172,7 @@ namespace connectivity } } -//......................................................................... + extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 708438f67612..75e2353aff1e 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -64,9 +64,9 @@ using namespace com::sun::star::sdbcx; namespace connectivity { namespace mozab { -// ===================================================================== + // = ConnectionImplData -// ===================================================================== + struct ConnectionImplData { ::boost::shared_ptr< ::comphelper::OfficeResourceBundle > pResourceBundle; @@ -144,9 +144,9 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& OSL_TRACE("IN OConnection::construct()" ); // open file setURL(url); - // + // Skip 'sdbc:mozab: part of URL - // + sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); OSL_ENSURE( url.copy( 0, nLen ) == "sdbc:address", "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index b9fe754779ff..f50468db18b9 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -95,9 +95,9 @@ namespace connectivity friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; protected: - //==================================================================== + // Data attributes - //==================================================================== + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation MozabDriver* m_pDriver; // Pointer to the owning @@ -163,7 +163,7 @@ namespace connectivity // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // + MozabDriver* getDriver() const { return m_pDriver;} // Added to enable me to use SQLInterpreter which requires an diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 5d56c82b2242..fbefd5dadc9b 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -26,9 +26,9 @@ namespace connectivity { namespace mozab { - //************************************************************** + //************ Class: ODatabaseMetaData - //************************************************************** + class ODatabaseMetaData : public ODatabaseMetaDataBase { diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index a30fae3b3d88..38c5d3eee4eb 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -208,7 +208,7 @@ sal_Int32 SAL_CALL MozabDriver::getMinorVersion( ) throw(RuntimeException) EDriverType MozabDriver::impl_classifyURL( const OUString& url ) { // Skip 'sdbc:mozab: part of URL - // + sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); OUString aAddrbookURI(url.copy(nLen+1)); diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 4c6de31cef42..27322d37a276 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -56,9 +56,9 @@ namespace connectivity }; ::std::vector< Parameter> m_aParameters; - //==================================================================== + // Data attributes - //==================================================================== + sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement OUString m_sSqlStatement; diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 49c9ff05f76e..ebe599a83f43 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -341,9 +341,9 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime { if ( (m_aRow->get())[i].isBound() ) { - // + // Everything in the addressbook is a string! - // + if ( !m_aQuery.setRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this ); @@ -383,9 +383,9 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( { if ( (m_aRow->get())[i].isBound() ) { - // + // Everything in the addressbook is a string! - // + if ( !m_aQuery.getRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this ); @@ -1399,7 +1399,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, // the getXXX methods are 1-based ... sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column - // ... + #if OSL_DEBUG_LEVEL > 0 OSL_TRACE("Set Col Mapping: %d -> %d", nSelectColumnPos, nTableColumnPos ); #endif @@ -1432,9 +1432,9 @@ sal_Bool OResultSet::isCount() const } -// + // Check for valid row in m_aQuery -// + sal_Bool OResultSet::validRow( sal_uInt32 nRow ) { sal_Int32 nNumberOfRecords = m_aQuery.getRealRowCount(); diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx index 9b227f5f6319..18a50c547c11 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx @@ -30,9 +30,9 @@ namespace connectivity { namespace mozab { - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 0e91ac29bec0..a89a0588e6e2 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -50,10 +50,10 @@ namespace connectivity ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE; - //************************************************************** + //************ Class: OCommonStatement // is a base class for the normal statement and for the prepared statement - //************************************************************** + class OCommonStatement; typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE; @@ -115,9 +115,9 @@ namespace connectivity virtual ~OCommonStatement(); protected: - // + // Driver Internal Methods - // + enum StatementType { eSelect, eCreateTable }; /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 3bfca5a367d0..ee64f6c7e388 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -144,7 +144,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) // Create the Event Queue for the UI thread... - // + // If an event queue already exists for the thread, then // CreateThreadEventQueue(...) will fail... // CreateThread0ueue(...) will fail... diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index 6248f7c8da92..f2fd8ed9e552 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -264,7 +264,7 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) } -// + // // Do the profile switch gDirServiceProvider->SetProfileDir(profileDir); mCurrentProfileName.Assign(aCurrentProfile); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx index b3e52c622087..1b251e0f9aa7 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx @@ -42,9 +42,9 @@ nsIAtom* nsProfileDirServiceProvider::sApp_PreferencesFile50; nsIAtom* nsProfileDirServiceProvider::sApp_UserProfileDirectory50; -//***************************************************************************** + // nsProfileDirServiceProvider::nsProfileDirServiceProvider -//***************************************************************************** + nsProfileDirServiceProvider::nsProfileDirServiceProvider() { @@ -143,9 +143,9 @@ nsProfileDirServiceProvider::GetFile(const char *prop, PRBool *persistent, nsIFi return rv; } -//***************************************************************************** + // Protected methods -//***************************************************************************** + nsresult nsProfileDirServiceProvider::Initialize() @@ -208,9 +208,9 @@ nsProfileDirServiceProvider::UndefineFileLocations() return NS_OK; } -//***************************************************************************** + // Global creation function -//***************************************************************************** + nsresult NS_NewProfileDirServiceProvider(nsProfileDirServiceProvider** aProvider) { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx index 79bf6e68b842..3a31c290d060 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx @@ -23,10 +23,10 @@ // Forward Declarations class nsIAtom; -// -------------------------------------------------------------------------------------- + // nsProfileDirServiceProvider - The nsIDirectoryServiceProvider implementation used for // profile-relative file locations. -// -------------------------------------------------------------------------------------- + class nsProfileDirServiceProvider: public nsIDirectoryServiceProvider { @@ -61,7 +61,7 @@ protected: }; -// -------------------------------------------------------------------------------------- + /** * Global method to create an instance of nsProfileDirServiceProvider diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index e71d28ba965a..04b25a247ad6 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -183,9 +183,9 @@ static nsresult insertPABDescription() } return rv; } -// + // nsAbDirectoryDataSource -// + #define NS_RDF_CONTRACTID "@mozilla.org/rdf" #define NS_RDF_DATASOURCE_CONTRACTID NS_RDF_CONTRACTID "/datasource;1" #define NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_RDF_DATASOURCE_CONTRACTID "?name=" diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 4aa86de5bf92..fc690313fbb9 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx @@ -47,7 +47,7 @@ namespace connectivity MDatabaseMetaDataHelper(); ~MDatabaseMetaDataHelper(); - // + sal_Bool getTableStrings( OConnection* _pCon, ::std::vector< OUString >& _rStrings, ::std::vector< OUString >& _rTypes); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 1324d7822a97..9c346b00ddc4 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -31,13 +31,13 @@ #include <boost/unordered_map.hpp> -//........................................................................ + namespace connectivity { namespace mozab { -//........................................................................ - //==================================================================== + + //= helper - //==================================================================== + namespace { typedef NS_STDCALL_FUNCPROTO(nsresult, CardPropertyGetter, nsIAbCard, GetFirstName, (PRUnichar**)); @@ -131,16 +131,16 @@ namespace connectivity { namespace mozab { } } - //==================================================================== + //= AttributeMap_Data - //==================================================================== + struct AttributeMap_Data { }; - //==================================================================== + //= MLdapAttributeMap - //==================================================================== + MLdapAttributeMap::MLdapAttributeMap() :m_pData( new AttributeMap_Data ) @@ -436,8 +436,8 @@ namespace connectivity { namespace mozab { } } -//........................................................................ + } } // namespace connectivity::mozab -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx index 8a34d6c9efaf..1ed096ea06e1 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx @@ -24,16 +24,16 @@ #include <memory> -//........................................................................ + namespace connectivity { namespace mozab { -//........................................................................ + struct AttributeMap_Data; class MQueryHelperResultEntry; - //==================================================================== + //= class MLdapAttributeMap - //==================================================================== + /** implements the nsIAbLDAPAttributeMap interface Somewhere between Mozilla 1.7.5 and SeaMonkey 1.1.12, the LDAP address book @@ -61,9 +61,9 @@ namespace connectivity { namespace mozab { ::std::auto_ptr< AttributeMap_Data > m_pData; }; -//........................................................................ + } } // namespace connectivity::mozab -//........................................................................ + #endif // CONNECTIVITY_MLDAPATTRIBUTEMAP_HXX diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx index 9073f4546c38..b5ab0f756b89 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx @@ -19,9 +19,9 @@ #ifndef _CONNECTIVITY_MAB_NS_INCLUDE_HXX_ #define _CONNECTIVITY_MAB_NS_INCLUDE_HXX_ -// + // Only include Mozilla include files once and using this file... -// + // moved this here and in first position due to "long l;" unxsoli4 warning #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 2395bd0009b0..9a03fcea28af 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -53,7 +53,7 @@ using namespace connectivity; // Used to store an nsIAbDirectoryQuery member without the need to use Mozilla // types in the MQuery.hxx file. -// + namespace connectivity { namespace mozab { struct MQueryDirectory { @@ -86,7 +86,7 @@ MQuery::~MQuery() // MQueryHelper is reference counted, so we need to decrement the // count here. - // + if ( m_aQueryDirectory->contextId != -1 && m_aQueryDirectory->directoryQuery != NULL ) m_aQueryDirectory->directoryQuery->StopQuery(m_aQueryDirectory->contextId); @@ -109,7 +109,7 @@ void MQuery::construct() m_aQueryDirectory = new MQueryDirectory(); // MQueryHelper is reference counted, so we need to add to the // count here to prevent accidental deletion else where... - // + m_aQueryHelper = new MQueryHelper(); NS_IF_ADDREF( m_aQueryHelper); } @@ -564,11 +564,11 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) } -// -// + + // If the query executed is being done asynchronously then this may return // -1 as the count, ie. it's undetermined. -// + sal_Int32 MQuery::getRowCount() { @@ -576,21 +576,21 @@ MQuery::getRowCount() } -// -// + + // As opposed to getRowCount() this returns the actual number of rows fetched // so far (if is an async query) -// + sal_uInt32 MQuery::getRealRowCount() { return( m_aQueryHelper->getRealCount() ); } -// + // If the query executed is being done asynchronously then this may be // false -// + sal_Bool MQuery::queryComplete( void ) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 0e9264a39fad..a2ea1ea7c28f 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -34,9 +34,9 @@ using namespace connectivity::mozab; NS_IMPL_THREADSAFE_ISUPPORTS1(connectivity::mozab::MQueryHelper,nsIAbDirectoryQueryResultListener) -// + // class MQueryHelperResultEntry -// + MQueryHelperResultEntry::MQueryHelperResultEntry() @@ -83,9 +83,9 @@ void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rVa { m_Fields[ key ] = rValue; } -// + // class MQueryHelper -// + MQueryHelper::MQueryHelper() :m_nIndex( 0 ) ,m_bHasMore( sal_True ) diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 0caa68e49981..e60208700d54 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -31,10 +31,10 @@ #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" -//........................................................................ + namespace connectivity { -//........................................................................ + using namespace mysql; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdbc; @@ -60,9 +60,9 @@ namespace connectivity } } - //==================================================================== + //= ODriverDelegator - //==================================================================== + ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext) : ODriverDelegator_BASE(m_aMutex) @@ -491,8 +491,8 @@ namespace connectivity return getSupportedServiceNames_Static(); } -//........................................................................ + } // namespace connectivity -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 5cdc80760433..7a604db27e2a 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -678,9 +678,9 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc } -//==================================================================== + // methods -//==================================================================== + // initBoundParam diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx index 8b28624ce207..e48d164734b6 100644 --- a/connectivity/source/drivers/postgresql/pq_allocator.hxx +++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx @@ -43,7 +43,7 @@ out. */ -//###################################################### + // This is no general purpose STL allocator but one // necessary to use STL for some implementation but // avoid linking sal against the STLPort library!!! @@ -67,49 +67,49 @@ public: typedef ::std::size_t size_type; typedef ::std::ptrdiff_t difference_type; - //----------------------------------------- + template<class U> struct rebind { typedef Allocator<U> other; }; - //----------------------------------------- + pointer address (reference value) const { return &value; } - //----------------------------------------- + const_pointer address (const_reference value) const { return &value; } - //----------------------------------------- + Allocator() SAL_THROW(()) {} - //----------------------------------------- + template<class U> Allocator (const Allocator<U>&) SAL_THROW(()) {} - //----------------------------------------- + Allocator(const Allocator&) SAL_THROW(()) {} - //----------------------------------------- + ~Allocator() SAL_THROW(()) {} - //----------------------------------------- + size_type max_size() const SAL_THROW(()) { return size_type(-1)/sizeof(T); } - //----------------------------------------- + /* Normally the code for allocate should throw a std::bad_alloc exception if the requested memory could not be allocated: @@ -136,13 +136,13 @@ public: rtl_allocateMemory(sal_uInt32(n * sizeof(T)))); } - //----------------------------------------- + void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type) { rtl_freeMemory(p); } - //----------------------------------------- + void construct (pointer p, const T& value) { new ((void*)p)T(value); @@ -151,13 +151,13 @@ public: // LEM: GNU libstdc++ vectors expect this one to exist, // at least if one intends to create vectors by giving // only a size and no initialising value. - //----------------------------------------- + void construct (pointer p) { new ((void*)p)T; } - //----------------------------------------- + void destroy (pointer p) { p->~T(); @@ -167,7 +167,7 @@ public: } }; -//###################################################### + // Custom STL allocators must be stateless (see // references above) that's why the operators below // return always true or false diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 6b6911bd35f4..46a6865eccae 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -102,7 +102,7 @@ namespace pq_sdbc_driver { -// ______________________________________________________________________________ + // Helper class for statement lifetime management class ClosableReference : public cppu::WeakImplHelper1< com::sun::star::uno::XReference > { diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 305f51828146..7fb8bdd07c14 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -79,9 +79,9 @@ struct ConnectionSettings; -//-------------------------------------------------- + // Logging API -//-------------------------------------------------- + namespace LogLevel { // when you add a loglevel, extend the log function ! @@ -94,7 +94,7 @@ static const sal_Int32 DATA = 4; bool isLog( ConnectionSettings *settings, int loglevel ); void log( ConnectionSettings *settings, sal_Int32 level, const OUString &logString ); void log( ConnectionSettings *settings, sal_Int32 level, const char *str ); -//-------------------------------------------------- + class Tables; class Views; @@ -128,7 +128,7 @@ struct ConnectionSettings sal_Int32 loglevel; }; -//-------------------------------------------------- + typedef cppu::WeakComponentImplHelper6< com::sun::star::sdbc::XConnection, com::sun::star::sdbc::XWarningsSupplier, diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 0f3dde69e484..e17dde6e36b2 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1786,7 +1786,7 @@ static void columnMetaData2DatabaseTypeDescription( { Sequence< Any > row( 6 ); row[0] <<= m_pSettings->catalog; - row[1] <<= xRow->getString(1); // + row[1] <<= xRow->getString(1); row[2] <<= xRow->getString(2); OUString array = xRow->getString(3); row[4] <<= xRow->getString(5); // the relid @@ -2299,7 +2299,7 @@ static void pgTypeInfo2ResultSet( row[NULLABLE] <<= OUString::number(nullable); row[CASE_SENSITIVE] <<= OUString::number(1); row[SEARCHABLE] <<= OUString::number( calcSearchable( dataType ) ); - row[UNSIGNED_ATTRIBUTE] <<= OUString("0"); // + row[UNSIGNED_ATTRIBUTE] <<= OUString("0"); if( com::sun::star::sdbc::DataType::INTEGER == dataType || com::sun::star::sdbc::DataType::BIGINT == dataType ) row[AUTO_INCREMENT] <<= OUString("1"); // TODO |