diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 17:59:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 06:54:35 -0600 |
| commit | ac9212feedb828064c5cf5cbb0bde8f02cc93d65 (patch) | |
| tree | e429c2bbcdfe7a98c2d55433e752bfecac3d5d00 /connectivity/source/inc | |
| parent | 2a33953f6eb5da62042ea3731ef9d61666d5556f (diff) | |
Remove visual noise from connectivity
Conflicts:
connectivity/source/inc/odbc/OConnection.hxx
Change-Id: I5ca98359e18cf1b27bf53037dde211774d798626
Reviewed-on: https://gerrit.libreoffice.org/8245
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/source/inc')
82 files changed, 258 insertions, 262 deletions
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 4636e62cda22..acb1ef00833f 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -30,9 +30,9 @@ namespace connectivity { - //************************************************************** + //************ Class: ODatabaseMetaDataResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index 47abe3f1ab34..fc75fbc04d2d 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.hxx @@ -61,9 +61,9 @@ namespace connectivity virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); }; -// ================================== + } // connectivity -// ================================== + #endif diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index be13d467b496..63a99f32c422 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -26,10 +26,10 @@ #include <vector> #include "connectivity/dbtoolsdllapi.hxx" -// ------------------------------------------------------------------------- + namespace connectivity { -// ------------------------------------------------------------------------- + struct OOO_DLLPUBLIC_DBTOOLS RowEquation { sal_Int32 nOperation; @@ -136,9 +136,9 @@ private: FunctionParser& operator=( const FunctionParser& ); }; -// ------------------------------------------------------------------------- + } // namespace connectivity -// ------------------------------------------------------------------------- + #endif /* CONNECTIVITY_ROWFUNCTIONPARSER_HXX_INCLUDED */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index edd8b97822b4..e74b93cc2e55 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.hxx @@ -29,9 +29,9 @@ namespace connectivity { namespace ado { - //************************************************************** + //************ Class: java.sql.CallableStatement - //************************************************************** + class OCallableStatement : public OPreparedStatement, public ::com::sun::star::sdbc::XRow, diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 71d6c92621ca..fe5a703f8ac1 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -54,9 +54,9 @@ namespace connectivity friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; protected: - //==================================================================== + // Data attributes - //==================================================================== + OTypeInfoMap m_aTypeInfo; // vector containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. @@ -114,7 +114,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); - // + WpADOConnection* getConnection() { return m_pAdoConnection; } void setCatalog(const ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier>& _xCat) { m_xCatalog = _xCat; } void setCatalog(OCatalog* _pCatalog) { m_pCatalog = _pCatalog; } diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index 759cdf4bd7ff..f06e0975b40f 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -29,9 +29,9 @@ namespace connectivity { class WpADOConnection; class OConnection; - //************************************************************** + //************ Class: ODatabaseMetaData - //************************************************************** + class ODatabaseMetaData : public ODatabaseMetaDataBase { diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index d40e73fd3ed3..c4f51768a7a4 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -195,7 +195,7 @@ namespace connectivity void setCrossReferenceMap(); void setTypeInfoMap(sal_Bool _bJetEngine); }; - // ------------------------------------------------------------------------- + inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) { sal_Int32 map = column; diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index 5519bea4fc4a..1a3a78ae21ca 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -31,9 +31,9 @@ namespace connectivity { namespace ado { - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index fe07c59a5edc..ccdd22f7a308 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -48,9 +48,9 @@ namespace connectivity const OUString& _sDefaultName, sal_Int32& _nParameterCount); protected: - //==================================================================== + // Data attributes - //==================================================================== + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; const OTypeInfoMap& m_aTypeInfo; ADOParameters* m_pParameters; diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index 4f12c24ef115..1de17fab8cda 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx @@ -32,9 +32,9 @@ namespace connectivity namespace ado { - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 1e92886227d0..30112d562c7d 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -46,9 +46,9 @@ namespace connectivity ::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; - //************************************************************** + //************ Class: java.sql.Statement - //************************************************************** + class OStatement_Base : public comphelper::OBaseMutex, public OStatement_BASE, public ::cppu::OPropertySetHelper, diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index f1d252664b38..ee303cf1a7b8 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -68,7 +68,7 @@ namespace connectivity // XAlterTable virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // + sal_Bool create() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); WpADOTable getImpl() const { return m_aTable;} diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index 8efe993fca13..459d07fecc40 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -94,10 +94,10 @@ namespace connectivity OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x); OLEVariant& operator=(const OLEVariant& varSrc); // Assign a const VARIANT& (::VariantCopy handles everything) - // + OLEVariant& operator=(const tagVARIANT& varSrc); // Assign a const VARIANT* (::VariantCopy handles everything) - // + OLEVariant& operator=(const VARIANT* pSrc); void setByte(sal_uInt8 n) ; void setInt16(sal_Int16 n) ; diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index c51dfc6ae2db..12fcbe775d6f 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -55,8 +55,7 @@ namespace connectivity operator IDispatch*(); }; - ////////////////////////////////////////////////////////////////////////// - // + // Template class WpOLEBase<class T> // ================================== // @@ -68,7 +67,7 @@ namespace connectivity // // In order to do efficient pass-by-value, this class (as all derived classes) // is a thin wrapper class, avoiding virtual methods and inlining. - //------------------------------------------------------------------------ + template<class T> class WpOLEBase : public WpBase { protected: @@ -112,8 +111,6 @@ namespace connectivity }; - ////////////////////////////////////////////////////////////////////////// - // // Template class WpOLECollection<class Ts, class T, class WrapT> // =============================================================== // @@ -127,8 +124,7 @@ namespace connectivity // This wrapper class does not expose an interface T, however, // it exposes an object of the class WrapT. This must allow a construction // by T, preferably it is derived from WpOLEBase<T>. - // - //------------------------------------------------------------------------ + template<class Ts, class T, class WrapT> class WpOLECollection : public WpOLEBase<Ts> { public: @@ -141,7 +137,7 @@ namespace connectivity inline WpOLECollection& operator=(const WpOLECollection& rhs) {WpOLEBase<Ts>::operator=(rhs); return *this;}; - ////////////////////////////////////////////////////////////////////// + inline void Refresh(){pInterface->Refresh();} @@ -215,7 +211,7 @@ namespace connectivity WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLECollection<Ts, T, WrapT>(rhs) {} inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) {WpOLEBase<Ts>::operator=(rhs); return *this;}; - ////////////////////////////////////////////////////////////////////// + inline sal_Bool Append(const WrapT& aWrapT) { diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 3dad87dd2282..c313a044b3da 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -46,7 +46,7 @@ namespace connectivity typedef WpOLEAppendCollection< ADOFields, ADOField, WpADOField> WpADOFields; typedef WpOLECollection< ADOProperties, ADOProperty, WpADOProperty> WpADOProperties; - //------------------------------------------------------------------------ + class WpADOConnection : public WpOLEBase<ADOConnection> { friend class WpADOCommand; @@ -59,7 +59,7 @@ namespace connectivity WpADOConnection& operator=(const WpADOConnection& rhs) {WpOLEBase<ADOConnection>::operator=(rhs); return *this;} - ////////////////////////////////////////////////////////////////////// + WpADOProperties get_Properties() const; @@ -138,7 +138,7 @@ namespace connectivity ADORecordset* getTypeInfo(DataTypeEnum _eType = adEmpty ); }; - //------------------------------------------------------------------------ + class WpADOCommand : public WpOLEBase<ADOCommand> { public: @@ -153,7 +153,7 @@ namespace connectivity { WpOLEBase<ADOCommand>::operator=(rhs); return *this;} - ////////////////////////////////////////////////////////////////////// + sal_Bool putref_ActiveConnection( WpADOConnection *pCon); @@ -177,7 +177,7 @@ namespace connectivity sal_Bool put_Name(const OUString& _Name); sal_Bool Cancel(); }; - //------------------------------------------------------------------------ + class WpADOError : public WpOLEBase<ADOError> { public: @@ -191,7 +191,7 @@ namespace connectivity WpADOError& operator=(const WpADOError& rhs) {WpOLEBase<ADOError>::operator=(rhs); return *this;} - ////////////////////////////////////////////////////////////////////// + OUString GetDescription() const; OUString GetSource() const ; @@ -202,7 +202,7 @@ namespace connectivity - //------------------------------------------------------------------------ + class WpADOField : public WpOLEBase<ADOField> { // friend class WpADOFields; @@ -215,7 +215,7 @@ namespace connectivity WpADOField& operator=(const WpADOField& rhs) {WpOLEBase<ADOField>::operator=(rhs); return *this;} - ////////////////////////////////////////////////////////////////////// + WpADOProperties get_Properties(); sal_Int32 GetActualSize() const ; @@ -252,7 +252,7 @@ namespace connectivity - //------------------------------------------------------------------------ + class WpADOProperty: public WpOLEBase<ADOProperty> { public: @@ -262,7 +262,7 @@ namespace connectivity WpADOProperty(const WpADOProperty& rhs) : WpOLEBase<ADOProperty>(rhs) {} WpADOProperty& operator=(const WpADOProperty& rhs) {WpOLEBase<ADOProperty>::operator=(rhs); return *this;} - ////////////////////////////////////////////////////////////////////// + OLEVariant GetValue() const; void GetValue(OLEVariant &aValVar) const; @@ -292,7 +292,7 @@ namespace connectivity // if(pInterface && get_State() == adStateOpen) // Close(); } - ////////////////////////////////////////////////////////////////////// + void Create(); sal_Bool Open( /* [optional][in] */ VARIANT Source, @@ -339,7 +339,7 @@ namespace connectivity sal_Bool UpdateBatch(AffectEnum AffectRecords); }; - //------------------------------------------------------------------------ + class WpADOParameter:public WpOLEBase<ADOParameter> { public: @@ -349,7 +349,7 @@ namespace connectivity WpADOParameter(const WpADOParameter& rhs):WpOLEBase<ADOParameter>(rhs){} WpADOParameter& operator=(const WpADOParameter& rhs) {WpOLEBase<ADOParameter>::operator=(rhs); return *this;} - ////////////////////////////////////////////////////////////////////// + OUString GetName() const ; DataTypeEnum GetADOType() const ; diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx index 3d1b33b493a4..475ea65ef4d2 100644 --- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx +++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx @@ -26,9 +26,9 @@ namespace connectivity { namespace calc { - //************************************************************** + //************ Class: java.sql.DatabaseMetaDataDate - //************************************************************** + class OCalcDatabaseMetaData : public file::ODatabaseMetaData { diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx index bc3a47c5095e..72d4b13c774f 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx @@ -26,9 +26,9 @@ namespace connectivity { namespace dbase { - //************************************************************** + //************ Class: java.sql.DatabaseMetaDataDate - //************************************************************** + class ODbaseDatabaseMetaData : public file::ODatabaseMetaData { diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index aa2d3f0b510a..bdad1d0cd2db 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -49,9 +49,9 @@ namespace connectivity friend class OIndexIterator; public: - //================================================================== + // Header struct - stays in memory - //================================================================== + struct NDXHeader { sal_uInt32 db_rootpage; /* Rootpage position */ diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index 31f5809f618d..ac9e1e5eb6fd 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.hxx @@ -28,9 +28,9 @@ namespace connectivity { namespace dbase { - //================================================================== + // IndexIterator - //================================================================== + class OIndexIterator { protected: diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index a6b0086c01b5..e824239af966 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -37,9 +37,9 @@ namespace connectivity class ONDXNode; class ODbaseIndex; - //================================================================== + // Index Key - //================================================================== + typedef file::OOperand ONDXKey_BASE; class ONDXKey : public ONDXKey_BASE { @@ -83,9 +83,9 @@ namespace connectivity - //================================================================== + // Index Page Pointer - //================================================================== + SV_DECL_REF(ONDXPage) // Base class - because we need to store additional information @@ -108,9 +108,9 @@ namespace connectivity sal_Bool HasPage() const {return nPagePos != 0;} // sal_Bool Is() const { return isValid(); } }; - //================================================================== + // Index Page - //================================================================== + class ONDXPage : public SvRefBase { friend class ODbaseIndex; @@ -217,9 +217,9 @@ namespace connectivity typedef ::std::vector<ONDXPage*> ONDXPageList; - //================================================================== + // Index Node - //================================================================== + class ONDXNode { friend class ONDXPage; @@ -247,9 +247,9 @@ namespace connectivity void Write(SvStream &rStream, const ONDXPage& rPage) const; void Read(SvStream &rStream, ODbaseIndex&); }; - //================================================================== + // inline implementation - //================================================================== + // inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec) // : ONDXKey_BASE(eType) // , nRecord(nRec),xValue(rVal) diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 7d302f781519..5602a6011bea 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -48,9 +48,9 @@ namespace connectivity friend class connectivity::OSubComponent<OConnection, connectivity::OMetaConnection>; protected: - //==================================================================== + // Data attributes - //==================================================================== + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx index e3491da8cfa6..d6aff605ac9c 100644 --- a/connectivity/source/inc/file/FDatabaseMetaData.hxx +++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx @@ -28,9 +28,9 @@ namespace connectivity { namespace file { - //************************************************************** + //************ Class: ODatabaseMetaData - //************************************************************** + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE ODatabaseMetaData : public ODatabaseMetaDataBase diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index 0db2d15bae7e..b85def2483be 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -42,9 +42,9 @@ namespace connectivity { protected: - //==================================================================== + // Data attributes - //==================================================================== + OUString m_aSql; OValueRefRow m_aParameterRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 5d730a82ee13..4bff314d1071 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -306,7 +306,7 @@ namespace connectivity virtual sal_Bool deletedVisible() const; virtual sal_Bool isRowDeleted() const; }; - // ------------------------------------------------------------------------- + inline sal_Int32 OResultSet::mapColumn(sal_Int32 column) { sal_Int32 map = column; diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index c9db785e0482..5fad804ceed5 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -31,9 +31,9 @@ namespace connectivity namespace file { class OFileTable; - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OOO_DLLPUBLIC_FILE OResultSetMetaData : diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 669d6256cefd..655593c47409 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -51,9 +51,9 @@ namespace connectivity ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable> OStatement_BASE; - //************************************************************** + //************ Class: java.sql.Statement - //************************************************************** + class OOO_DLLPUBLIC_FILE OStatement_Base : public comphelper::OBaseMutex, public OStatement_BASE, diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx index 154131e99387..77c7b7a7c474 100644 --- a/connectivity/source/inc/file/quotedstring.hxx +++ b/connectivity/source/inc/file/quotedstring.hxx @@ -25,10 +25,10 @@ namespace connectivity { - //================================================================== + // Derived from String, overriding GetToken/GetTokenCount methods // Especially true for the flat file format: Strings can be quoted - //================================================================== + class OOO_DLLPUBLIC_FILE QuotedTokenizedString { OUString m_sString; diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx index 6d06d11b54be..95a91097b83d 100644 --- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx +++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx @@ -26,9 +26,9 @@ namespace connectivity { namespace flat { - //************************************************************** + //************ Class: java.sql.DatabaseMetaDataDate - //************************************************************** + class OFlatDatabaseMetaData : public file::ODatabaseMetaData { diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 5d3611924ac0..b592a8ae9873 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -43,10 +43,10 @@ namespace connectivity ~IMethodGuardAccess() {} }; - //========================================================================== + //= OHsqlConnection - wraps all methods to the real connection from the driver //= but when disposed it doesn't dispose the real connection - //========================================================================== + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XFlushable , ::com::sun::star::sdb::application::XTableUIProvider > OHsqlConnection_BASE; @@ -127,9 +127,9 @@ namespace connectivity impl_getTextTableIcon_nothrow(); }; - //========================================================================== + //= OHsqlConnection - //========================================================================== + class MethodGuard : public ::osl::MutexGuard { private: diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 05dd7264872d..92e570f3497a 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -30,10 +30,10 @@ #include <comphelper/broadcasthelper.hxx> #include "connectivity/CommonTools.hxx" -//........................................................................ + namespace connectivity { -//........................................................................ + namespace hsqldb { @@ -128,9 +128,9 @@ namespace connectivity }; } -//........................................................................ + } // namespace connectivity -//........................................................................ + #endif // CONNECTIVITY_HSQLDB_DRIVER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index 112cba701d83..197ef9f6ee02 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -31,10 +31,10 @@ #include <com/sun/star/io/XSeekable.hpp> #include <boost/shared_ptr.hpp> #include <jni.h> -//........................................................................ + namespace connectivity { -//........................................................................ + namespace hsqldb { class StreamHelper @@ -76,13 +76,13 @@ namespace connectivity static OUString removeOldURLPrefix(const OUString& _sURL); static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env); }; - //........................................................................ + } // namespace hsqldb - //........................................................................ -//........................................................................ + + } // namespace connectivity -//........................................................................ + #endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx index f243b60247cc..77a6a4af8052 100644 --- a/connectivity/source/inc/hsqldb/HTools.hxx +++ b/connectivity/source/inc/hsqldb/HTools.hxx @@ -22,14 +22,14 @@ #include <rtl/ustrbuf.hxx> -//........................................................................ + namespace connectivity { namespace hsqldb { -//........................................................................ - //==================================================================== + + //= HTools - //==================================================================== + class HTools { public: @@ -47,9 +47,9 @@ namespace connectivity { namespace hsqldb ); }; -//........................................................................ + } } // namespace connectivity::hsqldb -//........................................................................ + #endif // CONNECTIVITY_HTOOLS_HXX diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 8cfe209916f6..3752a128f99f 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -27,14 +27,14 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> -//........................................................................ + namespace connectivity { namespace hsqldb { -//........................................................................ - //==================================================================== + + //= HView - //==================================================================== + typedef ::connectivity::sdbcx::OView HView_Base; typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView > HView_IBASE; class HView :public HView_Base @@ -80,9 +80,9 @@ namespace connectivity { namespace hsqldb using HView_Base::getFastPropertyValue; }; -//........................................................................ + } } // namespace connectivity::hsqldb -//........................................................................ + #endif // CONNECTIVITY_HVIEW_HXX diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index 4aa61e9a5d0a..4f6bb57745e0 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -27,14 +27,14 @@ namespace comphelper class ResourceBasedEventLogger; } -//........................................................................ + namespace connectivity { namespace jdbc { -//........................................................................ - //==================================================================== + + //= ContextClassLoaderScope - //==================================================================== + /** */ class ContextClassLoaderScope @@ -85,9 +85,9 @@ namespace connectivity { namespace jdbc }; -//........................................................................ + } } // namespace connectivity::jdbc -//........................................................................ + #endif // CONNECTIVITY_CONTEXTCLASSLOADER_HXX diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 49bd698185dc..4d9ccd47ad7a 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -25,14 +25,14 @@ #include <jvmaccess/virtualmachine.hxx> -//........................................................................ + namespace connectivity { namespace jdbc { -//........................................................................ - //==================================================================== + + //= GlobalRef - //==================================================================== + /** helper class to hold a local ref to a JNI object */ template< typename T > @@ -104,9 +104,9 @@ namespace connectivity { namespace jdbc }; -//........................................................................ + } } // namespace connectivity::jdbc -//........................................................................ + #endif // CONNECTIVITY_GLOBALREF_HXX diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index 668b70944ef6..a060193ea5ae 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.hxx @@ -22,14 +22,14 @@ #include <jvmaccess/virtualmachine.hxx> -//........................................................................ + namespace connectivity { namespace jdbc { -//........................................................................ - //==================================================================== + + //= LocalRef - //==================================================================== + /** helper class to hold a local ref to a JNI object Note that this class never actually calls NewLocalRef. It is assumed that all objects @@ -88,9 +88,9 @@ namespace connectivity { namespace jdbc T m_object; }; -//........................................................................ + } } // namespace connectivity::jdbc -//........................................................................ + #endif // CONNECTIVITY_LOCALREF_HXX diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx index f8d92805b651..e79f9c584254 100644 --- a/connectivity/source/inc/java/io/InputStream.hxx +++ b/connectivity/source/inc/java/io/InputStream.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.io.InputStream - //************************************************************** + class java_io_InputStream : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> { diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx index 5182a8c406b6..a3836d1fb8a1 100644 --- a/connectivity/source/inc/java/io/Reader.hxx +++ b/connectivity/source/inc/java/io/Reader.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.io.InputStream - //************************************************************** + class java_io_Reader : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> { diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx index 028a4f21d246..1353ab36c501 100644 --- a/connectivity/source/inc/java/lang/Boolean.hxx +++ b/connectivity/source/inc/java/lang/Boolean.hxx @@ -20,9 +20,9 @@ #define _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ #include "java/lang/Object.hxx" -//************************************************************** + //************ Class: java.lang.Boolean -//************************************************************** + namespace connectivity { class java_lang_Boolean : public java_lang_Object diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx index 136fc2a29543..96622f8ae7b0 100644 --- a/connectivity/source/inc/java/lang/Class.hxx +++ b/connectivity/source/inc/java/lang/Class.hxx @@ -18,9 +18,9 @@ */ #ifndef _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ #define _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ -//************************************************************** + //************ Class: java.lang.Class -//************************************************************** + #include "java/lang/Object.hxx" namespace connectivity diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx index 227c984d4d4b..8bc5191234fb 100644 --- a/connectivity/source/inc/java/lang/Exception.hxx +++ b/connectivity/source/inc/java/lang/Exception.hxx @@ -24,9 +24,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.lang.Exception - //************************************************************** + class java_lang_Exception : public java_lang_Throwable{ protected: // statis Data for the class diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index c7298c8b51d6..5fba9d11b24d 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -29,7 +29,7 @@ #include <functional> #include <boost/shared_ptr.hpp> -//===================================================================== + #ifdef HAVE_64BIT_POINTERS #error "no 64 bit pointer" @@ -64,8 +64,8 @@ namespace connectivity return *pEnv; } }; - //===================================================================== - //===================================================================== + + class java_lang_Object { // operator= and the copy ctor are forbidden diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx index 483af2beba10..7c1da9fa865f 100644 --- a/connectivity/source/inc/java/lang/Throwable.hxx +++ b/connectivity/source/inc/java/lang/Throwable.hxx @@ -23,9 +23,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.lang.Throwable - //************************************************************** + class java_lang_Throwable : public java_lang_Object { protected: diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx index 3a8484e71cb9..045fab6a7c8b 100644 --- a/connectivity/source/inc/java/math/BigDecimal.hxx +++ b/connectivity/source/inc/java/math/BigDecimal.hxx @@ -20,9 +20,9 @@ #define _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ #include "java/lang/Object.hxx" -//************************************************************** + //************ Class: java.lang.Boolean -//************************************************************** + namespace connectivity { class java_math_BigDecimal : public java_lang_Object diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index b55c94f60bc4..e469fbb4d2da 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.SQLWarning - //************************************************************** + class java_sql_Array : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XArray> { diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx index 47441dafbf7b..2bba436f5377 100644 --- a/connectivity/source/inc/java/sql/Blob.hxx +++ b/connectivity/source/inc/java/sql/Blob.hxx @@ -27,9 +27,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.SQLWarning - //************************************************************** + class java_sql_Blob : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob> { diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx index afc23eb207f8..e4fbd6982e46 100644 --- a/connectivity/source/inc/java/sql/CallableStatement.hxx +++ b/connectivity/source/inc/java/sql/CallableStatement.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.CallableStatement - //************************************************************** + class java_sql_CallableStatement : public java_sql_PreparedStatement, public ::com::sun::star::sdbc::XRow, diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index 9779ffcd298b..89a748c3a867 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.hxx @@ -27,9 +27,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.SQLWarning - //************************************************************** + class java_sql_Clob : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob> { diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index 49c835bde32a..34dcdac461b0 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx @@ -34,19 +34,19 @@ namespace com { namespace sun { namespace star { namespace util struct DateTime; } } } } -//........................................................................ + namespace comphelper { namespace log { namespace convert { -//........................................................................ + // helpers for logging more data types than are defined in comphelper/logging.hxx OUString convertLogArgToString( const ::com::sun::star::util::Date& _rDate ); OUString convertLogArgToString( const ::com::sun::star::util::Time& _rTime ); OUString convertLogArgToString( const ::com::sun::star::util::DateTime& _rDateTime ); -//........................................................................ + } } } -//........................................................................ + #include <comphelper/logging.hxx> @@ -55,13 +55,13 @@ namespace connectivity namespace LogLevel = ::com::sun::star::logging::LogLevel; } -//........................................................................ + namespace connectivity { namespace java { namespace sql { -//........................................................................ - //==================================================================== + + //= ConnectionLog - //==================================================================== + typedef ::comphelper::ResourceBasedEventLogger ConnectionLog_Base; class ConnectionLog : public ConnectionLog_Base { @@ -125,9 +125,9 @@ namespace connectivity { namespace java { namespace sql { } }; -//........................................................................ + } } } // namespace connectivity::java::sql -//........................................................................ + #endif // CONNECTIVITY_CONNECTIONLOG_HXX diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx index e137a20837f3..12c272b57148 100644 --- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx +++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx @@ -27,9 +27,9 @@ namespace connectivity { class java_sql_Connection; - //************************************************************** + //************ Class: java.sql.DatabaseMetaDataDate - //************************************************************** + class java_sql_DatabaseMetaData : public ODatabaseMetaDataBase, public java_lang_Object diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx index 0080bf273e66..25d191f02c7a 100644 --- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx +++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx @@ -26,9 +26,9 @@ namespace connectivity { -//************************************************************** + //************ Class: java.sql.DriverPropertyInfo -//************************************************************** + class java_sql_DriverPropertyInfo : public java_lang_Object { protected: diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index 2f82bcc85da6..a578460c6419 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -49,9 +49,9 @@ namespace connectivity class java_sql_Connection; - //************************************************************** + //************ Class: java.sql.Statement - //************************************************************** + class java_sql_Statement_Base : public comphelper::OBaseMutex, public java_sql_Statement_BASE, public java_lang_Object, diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 1e13f288e1c7..a742c87d71c6 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -28,9 +28,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.PreparedStatement - //************************************************************** + class java_sql_PreparedStatement : public OStatement_BASE2, public ::com::sun::star::sdbc::XPreparedStatement, diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index 10572feb4850..931ca6bc350f 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.Ref - //************************************************************** + class java_sql_Ref : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef> { diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index 439e4d6831a5..19fe1363b91d 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.ResultSetMetaData - //************************************************************** + class java_sql_Connection; class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>, public java_lang_Object diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx index 217556cda071..7d0d52cea984 100644 --- a/connectivity/source/inc/java/sql/SQLException.hxx +++ b/connectivity/source/inc/java/sql/SQLException.hxx @@ -25,9 +25,9 @@ namespace connectivity { namespace starsdbc = ::com::sun::star::sdbc; - //************************************************************** + //************ Class: java.sql.SQLException - //************************************************************** + class java_sql_SQLException_BASE; class java_sql_SQLException : public starsdbc::SQLException { diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx index 3c158e7007d8..bd7d13de9f85 100644 --- a/connectivity/source/inc/java/sql/SQLWarning.hxx +++ b/connectivity/source/inc/java/sql/SQLWarning.hxx @@ -26,9 +26,9 @@ namespace connectivity { // namespace starsdbc = ::com::sun::star::sdbc; // namespace ::com::sun::star::uno = ::com::sun::star::uno; - //************************************************************** + //************ Class: java.sql.SQLWarning - //************************************************************** + class java_sql_SQLWarning_BASE : public java_sql_SQLException_BASE { protected: diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index 6c84c4f3104e..563b06b52cf1 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.sql.Date - //************************************************************** + class java_sql_Date : public java_util_Date { @@ -47,9 +47,9 @@ namespace connectivity }; - //************************************************************** + //************ Class: java.sql.Time - //************************************************************** + class java_sql_Time : public java_util_Date { @@ -66,9 +66,9 @@ namespace connectivity static jclass st_getMyClass(); }; - //************************************************************** + //************ Class: java.sql.Timestamp - //************************************************************** + class java_sql_Timestamp : public java_util_Date { protected: diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx index 687876c7fda3..3411042ee3f6 100644 --- a/connectivity/source/inc/java/util/Date.hxx +++ b/connectivity/source/inc/java/util/Date.hxx @@ -26,9 +26,9 @@ namespace connectivity { - //************************************************************** + //************ Class: java.util.Date - //************************************************************** + class java_util_Date : public java_lang_Object { diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index fa2bab4060cf..2e453bda12b5 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -32,10 +32,10 @@ #include <comphelper/broadcasthelper.hxx> #include "connectivity/CommonTools.hxx" -//........................................................................ + namespace connectivity { -//........................................................................ + class OMetaConnection; @@ -107,9 +107,9 @@ namespace connectivity }; } -//........................................................................ + } // namespace connectivity -//........................................................................ + #endif // CONNECTIVITY_MYSQL_DRIVER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index d39ba1497f1f..1c59b3f1210b 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -43,11 +43,11 @@ namespace connectivity { free(binaryData); } - //-------------------------------------------------------------------- + // allocBindDataBuffer // Allocates and returns a new bind data buffer of the specified // length - //-------------------------------------------------------------------- + void* allocBindDataBuffer (sal_Int32 bufLen) { // Reset the input stream and sequence, we are doing a new bind @@ -60,28 +60,28 @@ namespace connectivity return binaryData; } - //-------------------------------------------------------------------- + // getBindDataBuffer // Returns the data buffer to be used when binding to a parameter - //-------------------------------------------------------------------- + void* getBindDataBuffer () { return binaryData; } - //-------------------------------------------------------------------- + // getBindLengthBuffer // Returns the length buffer to be used when binding to a parameter - //-------------------------------------------------------------------- + SQLLEN* getBindLengthBuffer () { return ¶mLength; } - //-------------------------------------------------------------------- + // setInputStream // Sets the input stream for the bound parameter - //-------------------------------------------------------------------- + void setInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& inputStream, sal_Int32 len) { @@ -94,58 +94,58 @@ namespace connectivity aSequence = _aSequence; } - //-------------------------------------------------------------------- + // getInputStream // Gets the input stream for the bound parameter - //-------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream () { return paramInputStream; } - //-------------------------------------------------------------------- + // getInputStreamLen // Gets the input stream length for the bound parameter - //-------------------------------------------------------------------- + sal_Int32 getInputStreamLen () { return paramInputStreamLen; } - //-------------------------------------------------------------------- + // setSqlType // Sets the Java sql type used to register an OUT parameter - //-------------------------------------------------------------------- + void setSqlType(sal_Int32 type) { sqlType = type; } - //-------------------------------------------------------------------- + // getSqlType // Gets the Java sql type used to register an OUT parameter - //-------------------------------------------------------------------- + sal_Int32 getSqlType () { return sqlType; } - //-------------------------------------------------------------------- + // setOutputParameter // Sets the flag indicating if this is an OUTPUT parameter - //-------------------------------------------------------------------- + void setOutputParameter (sal_Bool output) { outputParameter = output; } - //-------------------------------------------------------------------- + // isOutputParameter // Gets the OUTPUT parameter flag - //-------------------------------------------------------------------- + sal_Bool isOutputParameter () { @@ -153,9 +153,9 @@ namespace connectivity } protected: - //==================================================================== + // Data attributes - //==================================================================== + void *binaryData; // Storage area to be used // when binding the parameter diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 448544511494..78339021a9be 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -51,9 +51,9 @@ namespace connectivity friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; protected: - //==================================================================== + // Data attributes - //==================================================================== + ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements TTypeInfoVector m_aTypeInfo; // vector containing an entry // for each row returned by @@ -123,7 +123,7 @@ namespace connectivity // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - // + SQLHANDLE getConnection() { return m_aConnectionHandle; } // should we use the catalog on filebased databases diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index d3d267cab173..a7b3bcc3eb43 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx @@ -28,9 +28,9 @@ namespace connectivity { namespace odbc { - //************************************************************** + //************ Class: ODatabaseMetaData - //************************************************************** + class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData : public ODatabaseMetaDataBase diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index 0af1d26470b3..8d18930c915d 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//-------------------------------------------------------------------------- + #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_ #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_ @@ -50,7 +50,7 @@ #endif -//-------------------------------------------------------------------------- + #ifdef UNX @@ -77,7 +77,7 @@ #endif // UNX -//-------------------------------------------------------------------------- + #ifndef SQL_WCHAR #define SQL_WCHAR (-8) diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index fefa811216e2..d18a572c46c0 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -60,9 +60,9 @@ namespace connectivity }; ::std::vector< Parameter> m_aParameters; - //==================================================================== + // Data attributes - //==================================================================== + SQLSMALLINT numParams; // Number of parameter markers for the prepared statement OBoundParam* boundParams; diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index 17da0aecd6e1..1f660406b58f 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -31,9 +31,9 @@ namespace connectivity { namespace odbc { - //************************************************************** + //************ Class: ResultSetMetaData - //************************************************************** + typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData : diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 4df493184317..5b844cdb32b1 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -52,9 +52,9 @@ namespace connectivity ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; class OResultSet; - //************************************************************** + //************ Class: java.sql.Statement - //************************************************************** + class OOO_DLLPUBLIC_ODBCBASE OStatement_Base : public comphelper::OBaseMutex, public OStatement_BASE, @@ -109,11 +109,11 @@ namespace connectivity sal_Bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException); - //-------------------------------------------------------------------- + // getResultSet // getResultSet returns the current result as a ResultSet. It // returns NULL if the current result is not a ResultSet. - //-------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getResultSet (sal_Bool checkCount) throw( ::com::sun::star::sdbc::SQLException); /** creates the driver specific resultset (factory) diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index 015e5f2a13ec..780a6eafdb2a 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -228,7 +228,7 @@ namespace connectivity { OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue); } - //----------------------------------------------------------------------------- + } diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index 150cb3f01341..8ca6f4ab59ec 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -62,16 +62,16 @@ namespace connectivity } -//------------------------------------------------------------------------------ + #define DECL_PROP1IMPL(varname, type) \ pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)), -//------------------------------------------------------------------------------ + #define DECL_PROP0(varname, type) \ DECL_PROP1IMPL(varname, type) 0) -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP1IMPL(varname) \ pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(), -//------------------------------------------------------------------------------ + #define DECL_BOOL_PROP0(varname) \ DECL_BOOL_PROP1IMPL(varname) 0) diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc index cae52c31980a..0e8c69ee5441 100644 --- a/connectivity/source/inc/resource/ado_res.hrc +++ b/connectivity/source/inc/resource/ado_res.hrc @@ -23,9 +23,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the ado driver's resource strings -// ============================================================================ + #define STR_INVALID_COLUMN_DESCRIPTOR_ERROR ( STR_ADO_BASE + 1 ) #define STR_INVALID_GROUP_DESCRIPTOR_ERROR ( STR_ADO_BASE + 2 ) #define STR_INVALID_INDEX_DESCRIPTOR_ERROR ( STR_ADO_BASE + 3 ) diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc index 7ec01df03c60..0984584bb689 100644 --- a/connectivity/source/inc/resource/calc_res.hrc +++ b/connectivity/source/inc/resource/calc_res.hrc @@ -23,9 +23,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the calc driver's resource strings -// ============================================================================ + #define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE + 0 ) diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc index 5d9ce54e5816..891a47abc0bb 100644 --- a/connectivity/source/inc/resource/common_res.hrc +++ b/connectivity/source/inc/resource/common_res.hrc @@ -22,9 +22,9 @@ #include "resource/conn_shared_res.hrc" -// ============================================================================ + // = common strings -// ============================================================================ + #define STR_STRING_LENGTH_EXCEEDED ( STR_COMMON_BASE + 1 ) #define STR_CANNOT_CONVERT_STRING ( STR_COMMON_BASE + 2 ) diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc index 3b8fe21e9cae..f136389b35e9 100644 --- a/connectivity/source/inc/resource/conn_shared_res.hrc +++ b/connectivity/source/inc/resource/conn_shared_res.hrc @@ -20,7 +20,7 @@ #ifndef CONNECTIVITY_SHARED_RES_HRC #define CONNECTIVITY_SHARED_RES_HRC -// ============================================================================ + // = normal resource ids, per driver // Mozilla driver resource ids @@ -54,7 +54,7 @@ // hsqldb driver resource ids #define STR_HSQLDB_BASE 1750 -// ============================================================================ + // = resource ids for log messages #define STR_LOG_MESSAGE_BASE 10000 diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc index 54e4b7370655..b9d80342a63c 100644 --- a/connectivity/source/inc/resource/dbase_res.hrc +++ b/connectivity/source/inc/resource/dbase_res.hrc @@ -23,9 +23,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the calc driver's resource strings -// ============================================================================ + #define STR_COULD_NOT_DELETE_INDEX ( STR_DBASE_BASE + 0 ) #define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE ( STR_DBASE_BASE + 1 ) diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc index 10b2638fe2f3..b4dcdf373f1b 100644 --- a/connectivity/source/inc/resource/evoab2_res.hrc +++ b/connectivity/source/inc/resource/evoab2_res.hrc @@ -23,9 +23,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the calc driver's resource strings -// ============================================================================ + #define STR_CANNOT_OPEN_BOOK ( STR_EVOAB2_BASE + 0 ) #define STR_SORT_BY_COL_ONLY ( STR_EVOAB2_BASE + 1 ) diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc index 38f27fb13780..054e3157606f 100644 --- a/connectivity/source/inc/resource/file_res.hrc +++ b/connectivity/source/inc/resource/file_res.hrc @@ -22,9 +22,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the file driver's resource strings -// ============================================================================ + #define STR_QUERY_COMPLEX_COUNT ( STR_FILE_BASE + 0 ) #define STR_QUERY_INVALID_BETWEEN ( STR_FILE_BASE + 1 ) diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc index 0ae55112278f..cd9da8f5ccfa 100644 --- a/connectivity/source/inc/resource/hsqldb_res.hrc +++ b/connectivity/source/inc/resource/hsqldb_res.hrc @@ -23,9 +23,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the hsqldb driver's resource strings -// ============================================================================ + #define STR_NO_STORAGE ( STR_HSQLDB_BASE + 0 ) #define STR_INVALID_FILE_URL ( STR_HSQLDB_BASE + 1 ) diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc index d6551884a960..f33081c71d07 100644 --- a/connectivity/source/inc/resource/kab_res.hrc +++ b/connectivity/source/inc/resource/kab_res.hrc @@ -22,9 +22,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the kab driver's resource strings -// ============================================================================ + #define STR_NO_KDE_INST ( STR_KAB_BASE + 0 ) #define STR_KDE_VERSION_TOO_OLD ( STR_KAB_BASE + 1 ) diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc index 6959a08bd69c..f407039a59be 100644 --- a/connectivity/source/inc/resource/macab_res.hrc +++ b/connectivity/source/inc/resource/macab_res.hrc @@ -22,9 +22,9 @@ #include "resource/conn_shared_res.hrc" #include "resource/common_res.hrc" -// ============================================================================ + // = the macab driver's resource strings -// ============================================================================ + #define STR_NO_TABLE ( STR_MACAB_BASE + 0 ) #define STR_NO_MAC_OS_FOUND ( STR_MACAB_BASE + 1 ) diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc index 84f68b58a991..5278c77322d9 100644 --- a/connectivity/source/inc/resource/mork_res.hrc +++ b/connectivity/source/inc/resource/mork_res.hrc @@ -22,9 +22,9 @@ #include "resource/conn_shared_res.hrc" -// ============================================================================ + // = the mozab driver's resource strings -// ============================================================================ + #define STR_MOZILLA_ADDRESSBOOKS ( STR_MORK_BASE + 0 ) #define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MORK_BASE + 1 ) diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc index 334f18508982..fb36c6356b7c 100644 --- a/connectivity/source/inc/resource/mozab_res.hrc +++ b/connectivity/source/inc/resource/mozab_res.hrc @@ -22,9 +22,9 @@ #include "resource/conn_shared_res.hrc" -// ============================================================================ + // = the mozab driver's resource strings -// ============================================================================ + #define STR_MOZILLA_ADDRESSBOOKS ( STR_MOZAB_BASE + 0 ) #define STR_THUNDERBIRD_ADDRESSBOOKS ( STR_MOZAB_BASE + 1 ) diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index 089788c524ea..0d41ebcfdc4e 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -24,15 +24,15 @@ #include <list> #include "connectivity/dbtoolsdllapi.hxx" -//........................................................................ + namespace connectivity { -//........................................................................ + typedef sal_uInt16 ResourceId; - //==================================================================== + //= SharedResources - //==================================================================== + /** helper class for accessing resources shared by different libraries in the connectivity module */ @@ -145,9 +145,9 @@ namespace connectivity const ::std::list< ::std::pair<const sal_Char* , OUString > > _aStringToSubstitutes) const; }; -//........................................................................ + } // namespace connectivity -//........................................................................ + #endif // CONNECTIVITY_SHAREDRESOURCES_HXX |