diff options
Diffstat (limited to 'connectivity/source/inc')
221 files changed, 2017 insertions, 2017 deletions
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index 0284c70fab89..ff48a26c560c 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,19 +36,19 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OAutoRetrievingBase { ::rtl::OUString m_sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values - sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values + sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values protected: OAutoRetrievingBase() : m_bAutoRetrievingEnabled(sal_False) {} virtual ~OAutoRetrievingBase(){} - inline void enableAutoRetrievingEnabled(sal_Bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } - inline void setAutoRetrievingStatement(const ::rtl::OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } + inline void enableAutoRetrievingEnabled(sal_Bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } + inline void setAutoRetrievingStatement(const ::rtl::OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } public: - inline sal_Bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } - inline const ::rtl::OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } + inline sal_Bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } + inline const ::rtl::OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } /** transform the statement to query for auto generated values - @param _sInsertStatement + @param _sInsertStatement The "INSERT" statement, is used to query for column and table names @return The transformed generated statement. diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index c51468c0ff4d..1d495aee63ec 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,14 +62,14 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo, ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; - // typedef ORefVector<ORowSetValue> ORow; - // typedef ORefVector<ORow> ORows; + // typedef ORefVector<ORowSetValue> ORow; + // typedef ORefVector<ORow> ORows; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + public ODatabaseMetaDataResultSet_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { public: @@ -115,28 +115,28 @@ namespace connectivity }; private: - ORowSetValue m_aEmptyValue; + ORowSetValue m_aEmptyValue; ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sal_Int32 m_nColPos; + sal_Int32 m_nColPos; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; void construct(); void checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); void setType(MetaDataResultSetType _eType); protected: - ORows m_aRows; - ORows::iterator m_aRowsIter; - sal_Bool m_bBOF; + ORows m_aRows; + ORows::iterator m_aRowsIter; + sal_Bool m_bBOF; sal_Bool m_bEOF; virtual const ORowSetValue& getValue(sal_Int32 columnIndex); - + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper @@ -145,8 +145,8 @@ namespace connectivity virtual ~ODatabaseMetaDataResultSet(); public: - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); /// default construction ODatabaseMetaDataResultSet(); @@ -156,7 +156,7 @@ namespace connectivity void setRows(const ORows& _rRows); // XServiceInfo - + static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); @@ -245,8 +245,8 @@ namespace connectivity void setBestRowIdentifierMap(); void setVersionColumnsMap(); public: - // some methods to get already defined ORowSetValues - // this increase the reuse of ORowSetValues + // some methods to get already defined ORowSetValues + // this increase the reuse of ORowSetValues /// return an empty ORowSetValueDecorator static ORowSetValueDecoratorRef getEmptyValue(); /// return an ORowSetValueDecorator with 0 as value diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 6f2a318e6e1c..06be3a5521c3 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,19 +46,19 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { - TIntVector m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; + TIntVector m_vMapping; // when not every column is needed + ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - sal_Int32 m_nColCount; + sal_Int32 m_nColCount; protected: virtual ~ODatabaseMetaDataResultSetMetaData(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ) - : m_nColCount(0) + : m_nColCount(0) { } /// Avoid ambigous cast error from the compiler. diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index baa54737f482..a03750d90855 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,45 +45,45 @@ namespace connectivity ::rtl::OUString m_ColumnTypeName; ::rtl::OUString m_ColumnServiceName; - sal_Int32 m_Nullable; - sal_Int32 m_ColumnDisplaySize; - sal_Int32 m_Precision; - sal_Int32 m_Scale; - sal_Int32 m_ColumnType; - - sal_Bool m_AutoIncrement; - sal_Bool m_CaseSensitive; - sal_Bool m_Searchable; - sal_Bool m_Currency; - sal_Bool m_Signed; - sal_Bool m_ReadOnly; - sal_Bool m_Writable; - sal_Bool m_DefinitelyWritable; + sal_Int32 m_Nullable; + sal_Int32 m_ColumnDisplaySize; + sal_Int32 m_Precision; + sal_Int32 m_Scale; + sal_Int32 m_ColumnType; + + sal_Bool m_AutoIncrement; + sal_Bool m_CaseSensitive; + sal_Bool m_Searchable; + sal_Bool m_Currency; + sal_Bool m_Signed; + sal_Bool m_ReadOnly; + sal_Bool m_Writable; + sal_Bool m_DefinitelyWritable; public: OColumn() {} OColumn(const ::rtl::OUString &_aTableName, const ::rtl::OUString &_aColumnName, - sal_Int32 _aNullable=0, - sal_Int32 _aColumnDisplaySize=0, - sal_Int32 _aPrecision=0, - sal_Int32 _aScale=0, - sal_Int32 _aColumnType=0, - - sal_Bool _aAutoIncrement=sal_False, - sal_Bool _aCaseSensitive=sal_False, - sal_Bool _aSearchable=sal_True, - sal_Bool _aCurrency=sal_False, - sal_Bool _aSigned=sal_False, - sal_Bool _aReadOnly=sal_True, - sal_Bool _aWritable=sal_False, - sal_Bool _aDefinitelyWritable=sal_False, + sal_Int32 _aNullable=0, + sal_Int32 _aColumnDisplaySize=0, + sal_Int32 _aPrecision=0, + sal_Int32 _aScale=0, + sal_Int32 _aColumnType=0, + + sal_Bool _aAutoIncrement=sal_False, + sal_Bool _aCaseSensitive=sal_False, + sal_Bool _aSearchable=sal_True, + sal_Bool _aCurrency=sal_False, + sal_Bool _aSigned=sal_False, + sal_Bool _aReadOnly=sal_True, + sal_Bool _aWritable=sal_False, + sal_Bool _aDefinitelyWritable=sal_False, const ::rtl::OUString &_aColumnLabel = ::rtl::OUString(), const ::rtl::OUString &_aColumnTypeName = ::rtl::OUString(), const ::rtl::OUString &_aColumnServiceName = ::rtl::OUString()) - : m_TableName(_aTableName), + : m_TableName(_aTableName), m_ColumnName(_aColumnName), m_ColumnLabel(_aColumnLabel), m_ColumnTypeName(_aColumnTypeName), @@ -117,28 +117,28 @@ namespace connectivity inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) { } - sal_Bool isAutoIncrement() const { return m_AutoIncrement; } - sal_Bool isCaseSensitive() const { return m_CaseSensitive; } - sal_Bool isSearchable() const { return m_Searchable; } - sal_Bool isCurrency() const { return m_Currency; } - sal_Bool isSigned() const { return m_Signed; } - sal_Bool isReadOnly() const { return m_ReadOnly; } - sal_Bool isWritable() const { return m_Writable; } - sal_Bool isDefinitelyWritable() const { return m_DefinitelyWritable; } - - sal_Int32 isNullable() const { return m_Nullable; } - sal_Int32 getColumnDisplaySize() const { return m_ColumnDisplaySize; } - sal_Int32 getPrecision() const { return m_Precision; } - sal_Int32 getScale() const { return m_Scale; } - sal_Int32 getColumnType() const { return m_ColumnType; } - - const ::rtl::OUString& getColumnLabel() const { return m_ColumnLabel; } - const ::rtl::OUString& getColumnName() const { return m_ColumnName; } - const ::rtl::OUString& getSchemaName() const { return m_SchemaName; } - const ::rtl::OUString& getTableName() const { return m_TableName; } - const ::rtl::OUString& getCatalogName() const { return m_CatalogName; } - const ::rtl::OUString& getColumnTypeName() const { return m_ColumnTypeName; } - const ::rtl::OUString& getColumnServiceName() const { return m_ColumnServiceName; } + sal_Bool isAutoIncrement() const { return m_AutoIncrement; } + sal_Bool isCaseSensitive() const { return m_CaseSensitive; } + sal_Bool isSearchable() const { return m_Searchable; } + sal_Bool isCurrency() const { return m_Currency; } + sal_Bool isSigned() const { return m_Signed; } + sal_Bool isReadOnly() const { return m_ReadOnly; } + sal_Bool isWritable() const { return m_Writable; } + sal_Bool isDefinitelyWritable() const { return m_DefinitelyWritable; } + + sal_Int32 isNullable() const { return m_Nullable; } + sal_Int32 getColumnDisplaySize() const { return m_ColumnDisplaySize; } + sal_Int32 getPrecision() const { return m_Precision; } + sal_Int32 getScale() const { return m_Scale; } + sal_Int32 getColumnType() const { return m_ColumnType; } + + const ::rtl::OUString& getColumnLabel() const { return m_ColumnLabel; } + const ::rtl::OUString& getColumnName() const { return m_ColumnName; } + const ::rtl::OUString& getSchemaName() const { return m_SchemaName; } + const ::rtl::OUString& getTableName() const { return m_TableName; } + const ::rtl::OUString& getCatalogName() const { return m_CatalogName; } + const ::rtl::OUString& getColumnTypeName() const { return m_ColumnTypeName; } + const ::rtl::OUString& getColumnServiceName() const { return m_ColumnServiceName; } }; } diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx index 8db7336b16d1..947f1e4b2d1d 100644 --- a/connectivity/source/inc/OSubComponent.hxx +++ b/connectivity/source/inc/OSubComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace connectivity protected: // the parent must support the tunnel implementation ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; - SELF* m_pDerivedImplementation; + SELF* m_pDerivedImplementation; public: OSubComponent( diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 13f0fd2975ce..5dc25cea1799 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,28 +37,28 @@ namespace connectivity { struct OTypeInfo { - ::rtl::OUString aTypeName; // Name des Types in der Datenbank - ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten - ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten - ::rtl::OUString aCreateParams; // Parameter zum Erstellen - ::rtl::OUString aLocalTypeName; + ::rtl::OUString aTypeName; // Name des Types in der Datenbank + ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten + ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten + ::rtl::OUString aCreateParams; // Parameter zum Erstellen + ::rtl::OUString aLocalTypeName; - sal_Int32 nPrecision; // Laenge des Types + sal_Int32 nPrecision; // Laenge des Types - sal_Int16 nMaximumScale; // Nachkommastellen - sal_Int16 nMinimumScale; // Min Nachkommastellen + sal_Int16 nMaximumScale; // Nachkommastellen + sal_Int16 nMinimumScale; // Min Nachkommastellen - sal_Int16 nType; // Datenbanktyp - sal_Int16 nSearchType; // kann nach dem Typen gesucht werden - sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 + sal_Int16 nType; // Datenbanktyp + sal_Int16 nSearchType; // kann nach dem Typen gesucht werden + sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 - sal_Bool bCurrency : 1, // Waehrung - bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld - bNullable : 1, // Kann das Feld NULL annehmen - bCaseSensitive : 1, // Ist der Type Casesensitive - bUnsigned : 1, // Ist der Type Unsigned - bEmpty_1 : 1, // for later use - bEmpty_2 : 1; + sal_Bool bCurrency : 1, // Waehrung + bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld + bNullable : 1, // Kann das Feld NULL annehmen + bCaseSensitive : 1, // Ist der Type Casesensitive + bUnsigned : 1, // Ist der Type Unsigned + bEmpty_1 : 1, // for later use + bEmpty_2 : 1; OTypeInfo() :nPrecision(0) diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index abfc1d107cb2..f62137a36d73 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace connectivity ParameterSubstitution( const ParameterSubstitution& ); ParameterSubstitution& operator=( const ParameterSubstitution& ); public: - + static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext); diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index f65539da3f77..bccad9ab06cc 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ namespace connectivity // ------------------------------------------------------------------------- struct OOO_DLLPUBLIC_DBTOOLS RowEquation { - sal_Int32 nOperation; - ORowSetValueDecoratorRef nPara[ 3 ]; + sal_Int32 nOperation; + ORowSetValueDecoratorRef nPara[ 3 ]; RowEquation() : - nOperation ( 0 ) + nOperation ( 0 ) { } }; @@ -101,10 +101,10 @@ class OOO_DLLPUBLIC_DBTOOLS FunctionParser public: /** Parse a string - + The following grammar is accepted by this method: <code> - + number_digit = '0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9' number = number number_digit | number_digit @@ -114,8 +114,8 @@ public: string_reference = 'a-z,A-Z,0-9' ' ' modifier_reference = '$' '0-9' ' ' - - basic_expression = + + basic_expression = number | string_reference | additive_expression equal_function additive_expression | @@ -123,7 +123,7 @@ public: ternary_function '(' additive_expression ',' additive_expression ', ' additive_expression ')' | '(' additive_expression ')' - </code> + </code> @param rFunction The string to parse @@ -136,7 +136,7 @@ public: static ExpressionNodeSharedPtr parseFunction( const ::rtl::OUString& _sFunction); private: - // disabled constructor/destructor, since this is + // disabled constructor/destructor, since this is // supposed to be a singleton FunctionParser(); diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index 92e974f508f8..d4efc561867c 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,30 +49,30 @@ namespace connectivity > OMetaConnection_BASE; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; - + class OOO_DLLPUBLIC_DBTOOLS OMetaConnection : public OMetaConnection_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aConnectionInfo; - connectivity::OWeakRefArray m_aStatements; // vector containing a list + connectivity::OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects // for this Connection - ::rtl::OUString m_sURL; - rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > + ::rtl::OUString m_sURL; + rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; SharedResources m_aResources; public: - + static ::dbtools::OPropertyMap& getPropMap(); OMetaConnection(); inline rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; } - inline ::rtl::OUString getURL() const { return m_sURL; } - inline void setURL(const ::rtl::OUString& _rsUrl) { m_sURL = _rsUrl; } + inline ::rtl::OUString getURL() const { return m_sURL; } + inline void setURL(const ::rtl::OUString& _rsUrl) { m_sURL = _rsUrl; } void throwGenericSQLException( sal_uInt16 _nErrorResourceId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext ); const SharedResources& getResources() const { return m_aResources;} @@ -83,7 +83,7 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); - //XUnoTunnel + //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); }; diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 7fb815d21f50..d6b0dae8b697 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace connectivity { typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase : - public comphelper::OBaseMutex, + public comphelper::OBaseMutex, public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData2, ::com::sun::star::lang::XEventListener> { @@ -75,8 +75,8 @@ namespace connectivity return _rCache.second; } protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xListenerHelper; // forward the calls from the connection to me + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xListenerHelper; // forward the calls from the connection to me virtual ~ODatabaseMetaDataBase(); @@ -96,12 +96,12 @@ namespace connectivity virtual sal_Int32 impl_getMaxStatements_throw( ) = 0; virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) = 0; virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ) = 0; - + public: ODatabaseMetaDataBase(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); - + // XDatabaseMetaData2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getConnectionInfo( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index b5fa33b5c493..4e9bb50586c7 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ namespace connectivity { } static OKeyValue* createKeyValue(sal_Int32 nVal); - // static OKeyValue* createEmptyKeyValue(); + // static OKeyValue* createEmptyKeyValue(); inline void pushKey(const ORowSetValueDecoratorRef& _aValueRef) { @@ -64,12 +64,12 @@ namespace connectivity } inline void setValue(sal_Int32 nVal) { m_nValue = nVal; } - ::rtl::OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + ::rtl::OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); } - double getKeyDouble(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + double getKeyDouble(::std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index a02fde92e412..23e47cf56565 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,9 +37,9 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OResultSetPrivileges : public ODatabaseMetaDataResultSet { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xTables; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; - sal_Bool m_bResetValues; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xTables; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; + sal_Bool m_bResetValues; protected: virtual const ORowSetValue& getValue(sal_Int32 columnIndex); public: diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx index 874b9d93d82b..8480dd9ab9f9 100644 --- a/connectivity/source/inc/TResultSetHelper.hxx +++ b/connectivity/source/inc/TResultSetHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity public: enum Movement { - NEXT = 0, + NEXT = 0, PRIOR, FIRST, LAST, diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index e07d24e3ae96..ef2f4e504b41 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OSkipDeletedSet { - ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position - IResultSetHelper* m_pHelper; // used for moving in the resultset + ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position + IResultSetHelper* m_pHelper; // used for moving in the resultset bool m_bDeletedVisible; - sal_Bool moveAbsolute(sal_Int32 _nOffset,sal_Bool _bRetrieveData); + sal_Bool moveAbsolute(sal_Int32 _nOffset,sal_Bool _bRetrieveData); public: OSkipDeletedSet(IResultSetHelper* _pHelper); ~OSkipDeletedSet(); @@ -63,42 +63,42 @@ namespace connectivity skipDeleted moves the resultset to the position defined by the parameters it garantees that the row isn't deleted @param - IResultSetHelper::Movement _eCursorPosition in which direction the resultset should be moved - sal_Int32 _nOffset the position relativ to the movement - sal_Bool _bRetrieveData is true when the current row should be filled which data + IResultSetHelper::Movement _eCursorPosition in which direction the resultset should be moved + sal_Int32 _nOffset the position relativ to the movement + sal_Bool _bRetrieveData is true when the current row should be filled which data @return true when the movement was successful otherwise false */ - sal_Bool skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData); + sal_Bool skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData); /** clear the map and the vector used in this class */ - void clear(); + void clear(); /** getMappedPosition returns the mapped position of a logical position @param - sal_Int32 _nBookmark the logical position + sal_Int32 _nBookmark the logical position @return the mapped position */ - sal_Int32 getMappedPosition(sal_Int32 _nBookmark) const; + sal_Int32 getMappedPosition(sal_Int32 _nBookmark) const; /** insertNewPosition adds a new position to the map @param - sal_Int32 _nPos the logical position + sal_Int32 _nPos the logical position */ - void insertNewPosition(sal_Int32 _nPos); + void insertNewPosition(sal_Int32 _nPos); /** deletePosition deletes this position from the map and decrement all following positions @param - sal_Int32 _nPos the logical position + sal_Int32 _nPos the logical position */ - void deletePosition(sal_Int32 _nPos); + void deletePosition(sal_Int32 _nPos); /** getLastPosition returns the last position @return the last position */ - inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); } + inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); } inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } }; } diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 21212bc90ce6..062946ac8dc6 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,19 +35,19 @@ namespace connectivity { typedef enum { - SQL_ORDERBYKEY_NONE, // do not sort - SQL_ORDERBYKEY_DOUBLE, // numeric key - SQL_ORDERBYKEY_STRING // String Key + SQL_ORDERBYKEY_NONE, // do not sort + SQL_ORDERBYKEY_DOUBLE, // numeric key + SQL_ORDERBYKEY_STRING // String Key } OKeyType; typedef enum { - SQL_ASC = 1, // ascending - SQL_DESC = -1 // otherwise + SQL_ASC = 1, // ascending + SQL_DESC = -1 // otherwise } TAscendingOrder; class OKeySet; - class OKeyValue; // simple class which holds a sal_Int32 and a ::std::vector<ORowSetValueDecoratorRef> + class OKeyValue; // simple class which holds a sal_Int32 and a ::std::vector<ORowSetValueDecoratorRef> /** The class OSortIndex can be used to implement a sorted index. @@ -56,18 +56,18 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSortIndex { public: - typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; - typedef ::std::vector<OKeyType> TKeyTypeVector; + typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; + typedef ::std::vector<OKeyType> TKeyTypeVector; private: - TIntValuePairVector m_aKeyValues; - TKeyTypeVector m_aKeyType; + TIntValuePairVector m_aKeyValues; + TKeyTypeVector m_aKeyType; ::std::vector<TAscendingOrder> m_aAscending; - sal_Bool m_bFrozen; + sal_Bool m_bFrozen; public: - OSortIndex( const ::std::vector<OKeyType>& _aKeyType, + OSortIndex( const ::std::vector<OKeyType>& _aKeyType, const ::std::vector<TAscendingOrder>& _aAscending); ~OSortIndex(); @@ -85,7 +85,7 @@ namespace connectivity /** AddKeyValue appends a new value. @param - pKeyValue the keyvalue to be appended + pKeyValue the keyvalue to be appended ATTENTION: when the sortindex is already frozen the parameter will be deleted */ void AddKeyValue(OKeyValue * pKeyValue); @@ -106,7 +106,7 @@ namespace connectivity // look at the name sal_Bool IsFrozen() const { return m_bFrozen; } // returns the current size of the keyvalues - sal_Int32 Count() const { return m_aKeyValues.size(); } + sal_Int32 Count() const { return m_aKeyValues.size(); } /** GetValue returns the value at position nPos (1..n) [sorted access]. It only allowed to call this method after the sortindex has been frozen. */ @@ -133,8 +133,8 @@ namespace connectivity : ORefVector<sal_Int32>(_nSize) , m_bFrozen(sal_False){} - sal_Bool isFrozen() const { return m_bFrozen; } - void setFrozen(sal_Bool _bFrozen=sal_True) { m_bFrozen = _bFrozen; } + sal_Bool isFrozen() const { return m_bFrozen; } + void setFrozen(sal_Bool _bFrozen=sal_True) { m_bFrozen = _bFrozen; } }; } #endif // CONNECTIVITY_TSORTINDEX_HXX diff --git a/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx index 2c2c33d03175..8ac78d4924f8 100644 --- a/connectivity/source/inc/UStringDescription_Impl.hxx +++ b/connectivity/source/inc/UStringDescription_Impl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,14 +29,14 @@ #ifndef CONNECTIVITY_USTRINGDESCRIPTION_IMPL_HXX #define CONNECTIVITY_USTRINGDESCRIPTION_IMPL_HXX -#define IMPLEMENT_CONSTASCII_USTRING(name) \ +#define IMPLEMENT_CONSTASCII_USTRING(name) \ UStringDescription name(connectivity::dbtools::get##name) UStringDescription::UStringDescription(PVFN _fCharFkt) -{ - pZeroTerminatedName = (*_fCharFkt)(); +{ + pZeroTerminatedName = (*_fCharFkt)(); nLength = 0; - const sal_Char* pIter = pZeroTerminatedName; + const sal_Char* pIter = pZeroTerminatedName; while((*pIter++) != '\0') ++nLength; } @@ -45,16 +45,16 @@ UStringDescription::~UStringDescription() { } -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURSORNAME ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHSIZE ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURSORNAME ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHSIZE ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS ); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPE); @@ -99,7 +99,7 @@ IMPLEMENT_CONSTASCII_USTRING(ERRORMSG_SEQUENCE); IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_SEQUENCE); IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL); //============================================================ -//= different +//= different //============================================================ IMPLEMENT_CONSTASCII_USTRING(STR_DELIMITER); diff --git a/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx index af411b825b5a..1480e078d412 100644 --- a/connectivity/source/inc/adabas/BCatalog.hxx +++ b/connectivity/source/inc/adabas/BCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,31 +41,31 @@ namespace connectivity class OAdabasConnection; class OAdabasCatalog : public connectivity::sdbcx::OCatalog { - OAdabasConnection* m_pConnection; // used to get the metadata - SQLHANDLE m_aConnectionHdl; // used for odbc specific stuff + OAdabasConnection* m_pConnection; // used to get the metadata + SQLHANDLE m_aConnectionHdl; // used for odbc specific stuff void fillVector(const ::rtl::OUString& _sQuery,TStringVector& _rVector); protected: /** builds the name which should be used to access the object later on in the collection. Will only be called in fillNames. - @param _xRow + @param _xRow The cuurent row from a call of XDatabaseMetaData::getTables. */ - virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OAdabasCatalog(SQLHANDLE _aConnectionHdl,OAdabasConnection* _pCon); - OAdabasConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + OAdabasConnection* getConnection() const { return m_pConnection; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + sdbcx::OCollection* getPrivateViews() const { return m_pViews; } static const ::rtl::OUString& getDot(); // correct the the column properties of float/real/double values diff --git a/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx index 34afc908dedd..a310e1a4f6d8 100644 --- a/connectivity/source/inc/adabas/BColumn.hxx +++ b/connectivity/source/inc/adabas/BColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ namespace connectivity OAdabasColumn(const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); }; } diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx index 40eadf3e9bf9..060569d839e2 100644 --- a/connectivity/source/inc/adabas/BColumns.hxx +++ b/connectivity/source/inc/adabas/BColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace connectivity class OColumns : public sdbcx::OCollection { protected: - OAdabasTable* m_pTable; + OAdabasTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -49,7 +49,7 @@ namespace connectivity virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); public: - OColumns( OAdabasTable* _pTable, + OColumns( OAdabasTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector) diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx index afa5cc300a72..5ecdde267f7c 100644 --- a/connectivity/source/inc/adabas/BConnection.hxx +++ b/connectivity/source/inc/adabas/BConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,13 +46,13 @@ namespace connectivity // we must use the name "OAdabasConnection" because of a compiler bug - class OAdabasConnection : public OConnection_BASE2 + class OAdabasConnection : public OConnection_BASE2 { ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; protected: - virtual SQLRETURN openConnectionWithAuth(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, const ::rtl::OUString& _uid,const ::rtl::OUString& _pwd); - virtual connectivity::odbc::OConnection* cloneConnection(); // creates a new connection + virtual SQLRETURN openConnectionWithAuth(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, const ::rtl::OUString& _uid,const ::rtl::OUString& _pwd); + virtual connectivity::odbc::OConnection* cloneConnection(); // creates a new connection public: virtual SQLRETURN Construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); @@ -63,11 +63,11 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - //XUnoTunnel + //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx index b60551069d4e..9c2ba7edfe79 100644 --- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx +++ b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx index 82cbc0594a31..0b06028b9eb0 100644 --- a/connectivity/source/inc/adabas/BDriver.hxx +++ b/connectivity/source/inc/adabas/BDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,28 +59,28 @@ namespace connectivity { typedef struct DatabaseStruct { - ::rtl::OUString sControlUser; - ::rtl::OUString sControlPassword; - ::rtl::OUString sSysUser; - ::rtl::OUString sSysPassword; - ::rtl::OUString sDomainPassword; + ::rtl::OUString sControlUser; + ::rtl::OUString sControlPassword; + ::rtl::OUString sSysUser; + ::rtl::OUString sSysPassword; + ::rtl::OUString sDomainPassword; ::rtl::OUString sCacheSize; ::rtl::OUString sBackupFile; ::rtl::OUString sDataDevName; ::rtl::OUString sSysDevSpace; ::rtl::OUString sTransLogName; ::rtl::OUString sDBName; - sal_Int32 nDataIncrement; // which size the database should grow - sal_Int32 nDataSize; - sal_Int32 nLogSize; - sal_Bool bShutDown; - sal_Bool bRestoreDatabase; + sal_Int32 nDataIncrement; // which size the database should grow + sal_Int32 nDataSize; + sal_Int32 nLogSize; + sal_Bool bShutDown; + sal_Bool bRestoreDatabase; DatabaseStruct() : nDataIncrement(0),nDataSize(0),nLogSize(0),bShutDown(sal_False),bRestoreDatabase(sal_False){ } } TDatabaseStruct; DECLARE_STL_USTRINGACCESS_MAP(TDatabaseStruct,TDatabaseMap); - TDatabaseMap m_aDatabaseMap; // contains all adabas databases with their flag to shut down or not + TDatabaseMap m_aDatabaseMap; // contains all adabas databases with their flag to shut down or not // environment vars ::rtl::OUString m_sDbWork; @@ -107,7 +107,7 @@ namespace connectivity void XUTIL(const ::rtl::OUString& _rParam, const ::rtl::OUString& _DBNAME, const ::rtl::OUString& _USRNAME, - const ::rtl::OUString& _USRPWD); + const ::rtl::OUString& _USRPWD); int X_STOP(const ::rtl::OUString& _DBNAME); int X_START(const ::rtl::OUString& _DBNAME); void createDb(const TDatabaseStruct& _aInfo); @@ -122,15 +122,15 @@ namespace connectivity void PutParam(const ::rtl::OUString& rDBNAME, const ::rtl::OUString& rWhat, const ::rtl::OUString& rHow); - void createNeededDirs( const ::rtl::OUString& _rDBName); + void createNeededDirs( const ::rtl::OUString& _rDBName); sal_Bool isKernelVersion(const char* _pVersion); - sal_Bool isVersion( const ::rtl::OUString& _rDBName, + sal_Bool isVersion( const ::rtl::OUString& _rDBName, const char* _pVersion); - void convertOldVersion( const ::rtl::OUString& _rDBName, + void convertOldVersion( const ::rtl::OUString& _rDBName, const TDatabaseStruct& _rDbInfo); - void installSystemTables( const TDatabaseStruct& _aInfo); + void installSystemTables( const TDatabaseStruct& _aInfo); protected: virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath); diff --git a/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx index 29a0486a7bc4..3f79fd745983 100644 --- a/connectivity/source/inc/adabas/BGroup.hxx +++ b/connectivity/source/inc/adabas/BGroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx index 7989aaa4cbfd..832613e7e8e6 100644 --- a/connectivity/source/inc/adabas/BGroups.hxx +++ b/connectivity/source/inc/adabas/BGroups.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace connectivity class OGroups : public sdbcx::OCollection { protected: - OAdabasConnection* m_pConnection; - connectivity::sdbcx::IRefreshableGroups* m_pParent; + OAdabasConnection* m_pConnection; + connectivity::sdbcx::IRefreshableGroups* m_pParent; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx index d089d0bd8d89..74e52681f16a 100644 --- a/connectivity/source/inc/adabas/BIndex.hxx +++ b/connectivity/source/inc/adabas/BIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,12 +39,12 @@ namespace connectivity class OAdabasTable; class OAdabasIndex : public sdbcx::OIndex { - OAdabasTable* m_pTable; + OAdabasTable* m_pTable; public: virtual void refreshColumns(); public: OAdabasIndex(OAdabasTable* _pTable); - OAdabasIndex( OAdabasTable* _pTable, + OAdabasIndex( OAdabasTable* _pTable, const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, diff --git a/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx index 9b515053ad31..45fa0146f28e 100644 --- a/connectivity/source/inc/adabas/BIndexColumn.hxx +++ b/connectivity/source/inc/adabas/BIndexColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,18 +38,18 @@ namespace connectivity class OIndexColumn : public OAdabasColumn { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; public: OIndexColumn(); - OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, + OIndexColumn( sal_Bool _IsAscending, + const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx index 80274d098dc7..8ed56e03d2b4 100644 --- a/connectivity/source/inc/adabas/BIndexColumns.hxx +++ b/connectivity/source/inc/adabas/BIndexColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace connectivity virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: - OIndexColumns( OAdabasIndex* _pIndex, + OIndexColumns( OAdabasIndex* _pIndex, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector) diff --git a/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx index 451e4ef05e90..be9a975d8798 100644 --- a/connectivity/source/inc/adabas/BIndexes.hxx +++ b/connectivity/source/inc/adabas/BIndexes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity { class OIndexes : public sdbcx::OCollection { - OAdabasTable* m_pTable; + OAdabasTable* m_pTable; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx index 1ba5f9372532..155186067bd1 100644 --- a/connectivity/source/inc/adabas/BKeys.hxx +++ b/connectivity/source/inc/adabas/BKeys.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx index c74bf3a3f0cd..cbe73c0bd973 100644 --- a/connectivity/source/inc/adabas/BPreparedStatement.hxx +++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,14 +35,14 @@ namespace connectivity { namespace adabas { - class OAdabasPreparedStatement : public ::connectivity::odbc::OPreparedStatement + class OAdabasPreparedStatement : public ::connectivity::odbc::OPreparedStatement { - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; protected: virtual odbc::OResultSet* createResulSet(); - virtual void setResultSetConcurrency(sal_Int32 _par0) ; - virtual void setResultSetType(sal_Int32 _par0) ; - virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; + virtual void setResultSetConcurrency(sal_Int32 _par0) ; + virtual void setResultSetType(sal_Int32 _par0) ; + virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; public: OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql); }; diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx index 95a9a41eea84..64f5932d9fc9 100644 --- a/connectivity/source/inc/adabas/BResultSet.hxx +++ b/connectivity/source/inc/adabas/BResultSet.hxx @@ -34,9 +34,9 @@ namespace connectivity { namespace adabas { - class OAdabasResultSet : public ::connectivity::odbc::OResultSet + class OAdabasResultSet : public ::connectivity::odbc::OResultSet { - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; public: OAdabasResultSet(SQLHANDLE _pStatementHandle,::connectivity::odbc::OStatement_Base* pStmt,const ::rtl::Reference<OSQLColumns>& _rSelectColumns) : ::connectivity::odbc::OResultSet( _pStatementHandle,pStmt) diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx index 3fe11e02743d..16a4cdeab6a1 100644 --- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx +++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,12 +40,12 @@ namespace connectivity //************************************************************** typedef odbc::OResultSetMetaData OAdabasResultSetMetaData_BASE; - class OAdabasResultSetMetaData : public OAdabasResultSetMetaData_BASE + class OAdabasResultSetMetaData : public OAdabasResultSetMetaData_BASE { - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::rtl::Reference<OSQLColumns>& _rSelectColumns); + OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::rtl::Reference<OSQLColumns>& _rSelectColumns); virtual ~OAdabasResultSetMetaData(); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx index 6f92bacc6fc9..67f7a954c26d 100644 --- a/connectivity/source/inc/adabas/BStatement.hxx +++ b/connectivity/source/inc/adabas/BStatement.hxx @@ -37,14 +37,14 @@ namespace connectivity { namespace adabas { - class OAdabasStatement : public ::connectivity::odbc::OStatement + class OAdabasStatement : public ::connectivity::odbc::OStatement { - OAdabasConnection* m_pOwnConnection; - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + OAdabasConnection* m_pOwnConnection; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; protected: virtual odbc::OResultSet* createResulSet(); virtual void setResultSetConcurrency(sal_Int32 _par0); - virtual void setResultSetType(sal_Int32 _par0) ; + virtual void setResultSetType(sal_Int32 _par0) ; virtual void setUsingBookmarks(sal_Bool _bUseBookmark); public: OAdabasStatement( OAdabasConnection* _pConnection) diff --git a/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx index 7dde9b69d2a9..520627b0806d 100644 --- a/connectivity/source/inc/adabas/BTable.hxx +++ b/connectivity/source/inc/adabas/BTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,27 +47,27 @@ namespace connectivity OAdabasConnection* m_pConnection; protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames); public: - OAdabasTable( sdbcx::OCollection* _pTables, + OAdabasTable( sdbcx::OCollection* _pTables, OAdabasConnection* _pConnection); - OAdabasTable( sdbcx::OCollection* _pTables, + OAdabasTable( sdbcx::OCollection* _pTables, OAdabasConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx index 98aae92abfd0..cd80f95e9cfc 100644 --- a/connectivity/source/inc/adabas/BTables.hxx +++ b/connectivity/source/inc/adabas/BTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity class OTables : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx index da336939f071..bff6c6b5f1ff 100644 --- a/connectivity/source/inc/adabas/BUser.hxx +++ b/connectivity/source/inc/adabas/BUser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx index df4915cf4fb2..9a6b7713024f 100644 --- a/connectivity/source/inc/adabas/BUsers.hxx +++ b/connectivity/source/inc/adabas/BUsers.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity class OUsers : public sdbcx::OCollection { OAdabasConnection* m_pConnection; - connectivity::sdbcx::IRefreshableUsers* m_pParent; + connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx index 751726eed72a..51df106960e8 100644 --- a/connectivity/source/inc/adabas/BViews.hxx +++ b/connectivity/source/inc/adabas/BViews.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; sal_Bool m_bInDrop; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index 00398698ea13..25e41f4bb770 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ namespace connectivity //************ Class: java.sql.CallableStatement //************************************************************** - class OCallableStatement : public OPreparedStatement, + class OCallableStatement : public OPreparedStatement, public ::com::sun::star::sdbc::XRow, public ::com::sun::star::sdbc::XOutParameters { - OLEVariant m_aValue; + OLEVariant m_aValue; public: DECLARE_SERVICE_INFO(); virtual ~OCallableStatement() {} ; diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx index 4ac4a7ef4394..7fb8f30f5fb7 100644 --- a/connectivity/source/inc/ado/ACatalog.hxx +++ b/connectivity/source/inc/ado/ACatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,22 +39,22 @@ namespace connectivity class OCatalog : public connectivity::sdbcx::OCatalog { - WpADOCatalog m_aCatalog; - OConnection* m_pConnection; + WpADOCatalog m_aCatalog; + OConnection* m_pConnection; public: virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon); ~OCatalog(); - OConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables; } - WpADOCatalog getCatalog() const { return m_aCatalog; } + OConnection* getConnection() const { return m_pConnection; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables; } + WpADOCatalog getCatalog() const { return m_aCatalog; } }; } } diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx index 485a151ca4a8..a31986512e75 100644 --- a/connectivity/source/inc/ado/ACollection.hxx +++ b/connectivity/source/inc/ado/ACollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,30 +40,30 @@ namespace connectivity { namespace ado { - namespace starcontainer = ::com::sun::star::container; - namespace starlang = ::com::sun::star::lang; - namespace staruno = ::com::sun::star::uno; - namespace starbeans = ::com::sun::star::beans; + namespace starcontainer = ::com::sun::star::container; + namespace starlang = ::com::sun::star::lang; + namespace staruno = ::com::sun::star::uno; + namespace starbeans = ::com::sun::star::beans; typedef ::cppu::WeakImplHelper3< starcontainer::XNameAccess, starcontainer::XIndexAccess, starlang::XServiceInfo> OCollectionBase; //************************************************************ - // OCollection + // OCollection //************************************************************ template <class T,class SimT,class OCl> class OCollection : public OCollectionBase { private: - OCollection( const OCollection& ); // never implemented - OCollection& operator=( const OCollection& ); // never implemented - - protected: - vector<OCl*> m_aElements; - ::cppu::OWeakObject& m_rParent; - ::osl::Mutex& m_rMutex; // mutex of the parent - T* m_pCollection; + OCollection( const OCollection& ); // never implemented + OCollection& operator=( const OCollection& ); // never implemented + protected: + vector<OCl*> m_aElements; + ::cppu::OWeakObject& m_rParent; + ::osl::Mutex& m_rMutex; // mutex of the parent + T* m_pCollection; + public: OCollection(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,T* _pCollection) @@ -90,7 +90,7 @@ namespace connectivity for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) if (pSupported->equals(_rServiceName)) return sal_True; - + return sal_False; } virtual staruno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(staruno::RuntimeException) @@ -115,13 +115,13 @@ namespace connectivity { return::getCppuType(static_cast< staruno::Reference< starbeans::XPropertySet>*>(NULL)); } - + virtual sal_Bool SAL_CALL hasElements( ) throw(staruno::RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); return getCount() > 0; } - + // starcontainer::XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(staruno::RuntimeException) { @@ -153,7 +153,7 @@ namespace connectivity virtual staruno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - + SimT* pCol = NULL; m_pCollection->get_Item(OLEVariant(aName),&pCol); if(!pCol) @@ -179,7 +179,7 @@ namespace connectivity SimT* pIdx = NULL; m_pCollection->get_Item(aVar,&pIdx); pIdx->AddRef(); - _bstr_t sBSTR; + _bstr_t sBSTR; pIdx->get_Name(&sBSTR); (*pStringArray) = (sal_Unicode*)sBSTR; pIdx->Release(); @@ -216,13 +216,13 @@ namespace connectivity class OGroup; class OUser; - typedef OCollection< ADOIndexes,ADOIndex,OIndex> OIndexes; - typedef OCollection< ADOKeys,ADOKey,OKey> OKeys; - typedef OCollection< ADOColumns,ADOColumn,OColumn> OColumns; - typedef OCollection< ADOTables,ADOTable,OTable> OTables; - typedef OCollection< ADOViews,ADOView,OView> OViews; - typedef OCollection< ADOGroups,ADOGroup,OGroup> OGroups; - typedef OCollection< ADOUsers,ADOUser,OUser> OUsers; + typedef OCollection< ADOIndexes,ADOIndex,OIndex> OIndexes; + typedef OCollection< ADOKeys,ADOKey,OKey> OKeys; + typedef OCollection< ADOColumns,ADOColumn,OColumn> OColumns; + typedef OCollection< ADOTables,ADOTable,OTable> OTables; + typedef OCollection< ADOViews,ADOView,OView> OViews; + typedef OCollection< ADOGroups,ADOGroup,OGroup> OGroups; + typedef OCollection< ADOUsers,ADOUser,OUser> OUsers; } } diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx index ce93f201aef1..62a2b101e88e 100644 --- a/connectivity/source/inc/ado/AColumn.hxx +++ b/connectivity/source/inc/ado/AColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ namespace connectivity typedef sdbcx::OColumn OColumn_ADO; class OAdoColumn : public OColumn_ADO { - WpADOColumn m_aColumn; - OConnection* m_pConnection; - ::rtl::OUString m_ReferencedColumn; - sal_Bool m_IsAscending; + WpADOColumn m_aColumn; + OConnection* m_pConnection; + ::rtl::OUString m_ReferencedColumn; + sal_Bool m_IsAscending; void fillPropertyValues(); protected: @@ -63,7 +63,7 @@ namespace connectivity virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - WpADOColumn getColumnImpl() const; + WpADOColumn getColumnImpl() const; }; } } diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index 6f8867ec0fb4..4486a572717c 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace connectivity class OColumns : public sdbcx::OCollection { protected: - WpADOColumns m_aCollection; - OConnection* m_pConnection; + WpADOColumns m_aCollection; + OConnection* m_pConnection; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -51,10 +51,10 @@ namespace connectivity virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); public: - OColumns( ::cppu::OWeakObject& _rParent, + OColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOColumns& _rCollection, + const WpADOColumns& _rCollection, sal_Bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 4be35ae52fff..aa170e87a2fb 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ namespace connectivity { struct OExtendedTypeInfo { - ::connectivity::OTypeInfo aSimpleType; // the general type info - DataTypeEnum eType; + ::connectivity::OTypeInfo aSimpleType; // the general type info + DataTypeEnum eType; inline ::rtl::OUString getDBName() const { return aSimpleType.aTypeName; } }; @@ -53,8 +53,8 @@ namespace connectivity class WpADOConnection; class ODriver; class OCatalog; - typedef ::std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; - typedef connectivity::OMetaConnection OConnection_BASE; + typedef ::std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; + typedef connectivity::OMetaConnection OConnection_BASE; class OConnection : public OConnection_BASE, @@ -66,24 +66,24 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - OTypeInfoMap m_aTypeInfo; // vector containing an entry + OTypeInfoMap m_aTypeInfo; // vector containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; - ODriver* m_pDriver; + ODriver* m_pDriver; private: - WpADOConnection* m_pAdoConnection; - OCatalog* m_pCatalog; - sal_Int32 m_nEngineType; - sal_Bool m_bClosed; - sal_Bool m_bAutocommit; + WpADOConnection* m_pAdoConnection; + OCatalog* m_pCatalog; + sal_Int32 m_nEngineType; + sal_Bool m_bClosed; + sal_Bool m_bAutocommit; protected: void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); public: OConnection(ODriver* _pDriver) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // OConnection(const SQLHANDLE _pConnectionHandle); + // OConnection(const SQLHANDLE _pConnectionHandle); ~OConnection(); void construct(const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); @@ -136,8 +136,8 @@ namespace connectivity return NULL; } - sal_Int32 getEngineType() const { return m_nEngineType; } - ODriver* getDriver() const { return m_pDriver; } + sal_Int32 getEngineType() const { return m_nEngineType; } + ODriver* getDriver() const { return m_pDriver; } static const OExtendedTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, DataTypeEnum _nType, diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index d2e6fe645f5d..2e8dab649f20 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaDataBase { - typedef struct _LiteralInfo + typedef struct _LiteralInfo { ::rtl::OUString pwszLiteralValue; - sal_uInt32 cchMaxLen; + sal_uInt32 cchMaxLen; sal_Bool fSupported; } LiteralInfo; - ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; - WpADOConnection* m_pADOConnection; - OConnection* m_pConnection; + ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; + WpADOConnection* m_pADOConnection; + OConnection* m_pConnection; void fillLiterals(); // get information out of rowset @@ -110,10 +110,10 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 4ac87c6ff7aa..fd0d4770736e 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,9 +50,9 @@ namespace connectivity { class ODatabaseMetaDataResultSetMetaData; /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, @@ -60,42 +60,42 @@ namespace connectivity ::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; - class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, + public ODatabaseMetaDataResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::map<sal_Int32, TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; + ::std::map<sal_Int32, TInt2IntMap > m_aValueRange; + ::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; - ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> > m_aStrValueRange; - ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> >::iterator m_aStrValueRangeIter; + ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> > m_aStrValueRange; + ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> >::iterator m_aStrValueRangeIter; - ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> > m_aIntValueRange; - ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> >::iterator m_aIntValueRangeIter; + ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> > m_aIntValueRange; + ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> >::iterator m_aIntValueRangeIter; - ADORecordset* m_pRecordSet; + ADORecordset* m_pRecordSet; ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - OLEVariant m_aValue; - sal_Int32 m_nRowPos; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; - sal_Bool m_bOnFirstAfterOpen; + OLEVariant m_aValue; + sal_Int32 m_nRowPos; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; + sal_Bool m_bOnFirstAfterOpen; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - inline sal_Int32 mapColumn (sal_Int32 column); + inline sal_Int32 mapColumn (sal_Int32 column); void checkRecordSet() throw(::com::sun::star::sdbc::SQLException); OLEVariant getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -206,9 +206,9 @@ namespace connectivity void setTypeInfoMap(sal_Bool _bJetEngine); }; // ------------------------------------------------------------------------- - inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) + inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) { - sal_Int32 map = column; + sal_Int32 map = column; if (!m_aColMapping.empty()) { diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index fadbde55724e..0f43f47826dc 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,20 +47,20 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { friend class ODatabaseMetaDataResultSet; const ::std::vector<sal_Int32> &m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; + ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - ADORecordset* m_pRecordSet; - sal_Int32 m_nColCount; + ADORecordset* m_pRecordSet; + sal_Int32 m_nColCount; private: - ODatabaseMetaDataResultSetMetaData( const ODatabaseMetaDataResultSetMetaData& ); // never implemented - ODatabaseMetaDataResultSetMetaData& operator=( const ODatabaseMetaDataResultSetMetaData& ); // never implemented + ODatabaseMetaDataResultSetMetaData( const ODatabaseMetaDataResultSetMetaData& ); // never implemented + ODatabaseMetaDataResultSetMetaData& operator=( const ODatabaseMetaDataResultSetMetaData& ); // never implemented protected: void setColumnPrivilegesMap(); @@ -76,7 +76,7 @@ namespace connectivity public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ADORecordset* _pRecordSet ,ODatabaseMetaDataResultSet* _pRes) - : m_pRecordSet(_pRecordSet),m_vMapping(_pRes->getColumnMapping()), + : m_pRecordSet(_pRecordSet),m_vMapping(_pRes->getColumnMapping()), m_nColCount(m_vMapping.size()-1) { if(m_pRecordSet) diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 1efc9580ba35..c8ff6e06da61 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,9 +48,9 @@ namespace connectivity > ODriver_BASE; class ODriver : public ODriver_BASE { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; // vector containing a list + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx index 7efe1650a89f..82401b55ef2e 100644 --- a/connectivity/source/inc/ado/AGroup.hxx +++ b/connectivity/source/inc/ado/AGroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,14 +39,14 @@ namespace connectivity typedef sdbcx::OGroup OGroup_ADO; class OCatalog; - class OAdoGroup : public OGroup_ADO + class OAdoGroup : public OGroup_ADO { - WpADOGroup m_aGroup; - OCatalog* m_pCatalog; + WpADOGroup m_aGroup; + OCatalog* m_pCatalog; - sal_Int32 MapRight(RightsEnum _eNum); - RightsEnum Map2Right(sal_Int32 _eNum); - ObjectTypeEnum MapObjectType(sal_Int32 _ObjType); + sal_Int32 MapRight(RightsEnum _eNum); + RightsEnum Map2Right(sal_Int32 _eNum); + ObjectTypeEnum MapObjectType(sal_Int32 _ObjType); protected: virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue,sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index 13808a8e0607..b204a7115c57 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ namespace connectivity class OAdabasConnection; class OGroups : public sdbcx::OCollection { - WpADOGroups m_aCollection; - OCatalog* m_pCatalog; + WpADOGroups m_aCollection; + OCatalog* m_pCatalog; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); @@ -57,7 +57,7 @@ namespace connectivity OGroups(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOGroups& _rCollection,sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) + const WpADOGroups& _rCollection,sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) { diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx index e21d05b990ba..77a994d739bd 100644 --- a/connectivity/source/inc/ado/AIndex.hxx +++ b/connectivity/source/inc/ado/AIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,10 +40,10 @@ namespace connectivity typedef sdbcx::OIndex OIndex_ADO; class OConnection; - class OAdoIndex : public OIndex_ADO + class OAdoIndex : public OIndex_ADO { - WpADOIndex m_aIndex; - OConnection* m_pConnection; + WpADOIndex m_aIndex; + OConnection* m_pConnection; protected: void fillPropertyValues(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); @@ -52,13 +52,13 @@ namespace connectivity public: virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - OAdoIndex(sal_Bool _bCase, OConnection* _pConnection,ADOIndex* _pIndex); - OAdoIndex(sal_Bool _bCase, OConnection* _pConnection); + OAdoIndex(sal_Bool _bCase, OConnection* _pConnection,ADOIndex* _pIndex); + OAdoIndex(sal_Bool _bCase, OConnection* _pConnection); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - WpADOIndex getImpl() const { return m_aIndex;} + WpADOIndex getImpl() const { return m_aIndex;} }; } } diff --git a/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx index 9d2057bbf565..ddf9e3ebfd81 100644 --- a/connectivity/source/inc/ado/AIndexColumn.hxx +++ b/connectivity/source/inc/ado/AIndexColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,18 +38,18 @@ namespace connectivity class OIndexColumn : public OAdoColumn { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; public: OIndexColumn(); - OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, + OIndexColumn( sal_Bool _IsAscending, + const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx index be58ffb6f2b0..e7f667bd7d9a 100644 --- a/connectivity/source/inc/ado/AIndexColumns.hxx +++ b/connectivity/source/inc/ado/AIndexColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< starcontainer::XNamed > createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< starbeans::XPropertySet > createDescriptor(); public: - OIndexColumns( ::cppu::OWeakObject& _rParent, + OIndexColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, OTable* _pTable, - connectivity::sdbcx::IRefreshableColumns* _pParent) + connectivity::sdbcx::IRefreshableColumns* _pParent) : OColumns(_rParent,_rMutex,_rVector,_pTable,_pParent) { } diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx index 345c9ce8176d..454ac6493536 100644 --- a/connectivity/source/inc/ado/AIndexes.hxx +++ b/connectivity/source/inc/ado/AIndexes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace connectivity class OConnection; class OIndexes : public sdbcx::OCollection { - WpADOIndexes m_aCollection; - OConnection* m_pConnection; + WpADOIndexes m_aCollection; + OConnection* m_pConnection; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -51,9 +51,9 @@ namespace connectivity OIndexes(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOIndexes& _rCollection, + const WpADOIndexes& _rCollection, sal_Bool _bCase, - OConnection* _pConnection) + OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) , m_aCollection(_rCollection) , m_pConnection(_pConnection) diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx index ad4dbada2b12..8c37ff532b29 100644 --- a/connectivity/source/inc/ado/AKey.hxx +++ b/connectivity/source/inc/ado/AKey.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace connectivity class OConnection; class OAdoKey : public OKey_ADO { - WpADOKey m_aKey; - OConnection* m_pConnection; + WpADOKey m_aKey; + OConnection* m_pConnection; protected: void fillPropertyValues(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); @@ -59,7 +59,7 @@ namespace connectivity virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - WpADOKey getImpl() const { return m_aKey;} + WpADOKey getImpl() const { return m_aKey;} // map the update/delete rules static RuleEnum Map2Rule(const sal_Int32& _eNum); static sal_Int32 MapRule(const RuleEnum& _eNum); diff --git a/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx index 098a4b36e0f8..64f20668a282 100644 --- a/connectivity/source/inc/ado/AKeyColumn.hxx +++ b/connectivity/source/inc/ado/AKeyColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,18 +38,18 @@ namespace connectivity class OKeyColumn : public OAdoColumn { protected: - ::rtl::OUString m_ReferencedColumn; + ::rtl::OUString m_ReferencedColumn; public: OKeyColumn(); - OKeyColumn( const ::rtl::OUString& _ReferencedColumn, - const ::rtl::OUString& _Name, + OKeyColumn( const ::rtl::OUString& _ReferencedColumn, + const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx index 40873d2e252e..0041d6c57835 100644 --- a/connectivity/source/inc/ado/AKeyColumns.hxx +++ b/connectivity/source/inc/ado/AKeyColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< starcontainer::XNamed > createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< starbeans::XPropertySet > createDescriptor(); public: - OKeyColumns( ::cppu::OWeakObject& _rParent, + OKeyColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, OTable* _pTable, - connectivity::sdbcx::IRefreshableColumns* _pParent) + connectivity::sdbcx::IRefreshableColumns* _pParent) : OColumns(_rParent,_rMutex,_rVector,_pTable,_pParent) { } diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx index 03991d0345ba..24f75394878d 100644 --- a/connectivity/source/inc/ado/AKeys.hxx +++ b/connectivity/source/inc/ado/AKeys.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace connectivity class OConnection; class OKeys : public sdbcx::OCollection { - WpADOKeys m_aCollection; - OConnection* m_pConnection; + WpADOKeys m_aCollection; + OConnection* m_pConnection; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index 33f504349679..b195184225be 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> +// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -45,7 +45,7 @@ namespace connectivity namespace ado { - class OPreparedStatement : public OStatement_Base, + class OPreparedStatement : public OStatement_Base, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XParameters, public ::com::sun::star::sdbc::XPreparedBatchExecution, @@ -55,16 +55,16 @@ namespace connectivity { void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType,const sal_Int32& _nSize,const OLEVariant& _Val) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void replaceParameterNodeName( OSQLParseNode* _pNode, + void replaceParameterNodeName( OSQLParseNode* _pNode, const ::rtl::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; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + const OTypeInfoMap& m_aTypeInfo; + ADOParameters* m_pParameters; virtual ~OPreparedStatement(); diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 3f16d080d83a..2136c0b25515 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace connectivity { class OResultSetMetaData; /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -67,22 +67,22 @@ namespace connectivity ::com::sun::star::sdbcx::XDeleteRows, ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; - class OResultSet : public comphelper::OBaseMutex, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + class OResultSet : public comphelper::OBaseMutex, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { - ADORecordset* m_pRecordSet; - OStatement_Base* m_pStmt; + ADORecordset* m_pRecordSet; + OStatement_Base* m_pStmt; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - ::std::vector<OLEVariant> m_aBookmarks; - OLEVariant m_aValue; - sal_Int32 m_nRowPos; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; - sal_Bool m_bOnFirstAfterOpen; + ::std::vector<OLEVariant> m_aBookmarks; + OLEVariant m_aValue; + sal_Int32 m_nRowPos; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; + sal_Bool m_bOnFirstAfterOpen; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index 535e333f5c25..16c118a1b062 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,17 +48,17 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OResultSetMetaData : public OResultSetMetaData_BASE + class OResultSetMetaData : public OResultSetMetaData_BASE { friend class OResultSet; - ADORecordset* m_pRecordSet; - sal_Int32 m_nColCount; + ADORecordset* m_pRecordSet; + sal_Int32 m_nColCount; sal_Int32 MapADOType2Jdbc(DataTypeEnum eType); private: - OResultSetMetaData( const OResultSetMetaData& ); // never implemented - OResultSetMetaData& operator=( const OResultSetMetaData& ); // never implemented + OResultSetMetaData( const OResultSetMetaData& ); // never implemented + OResultSetMetaData& operator=( const OResultSetMetaData& ); // never implemented protected: virtual ~OResultSetMetaData(); diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 0f04f00a73a6..841bcfddc983 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,36 +60,36 @@ namespace connectivity //************************************************************** //************ Class: java.sql.Statement //************************************************************** - class OStatement_Base : public comphelper::OBaseMutex, - public OStatement_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>, + class OStatement_Base : public comphelper::OBaseMutex, + public OStatement_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>, public connectivity::OSubComponent<OStatement_Base, OStatement_BASE> { friend class connectivity::OSubComponent<OStatement_Base, OStatement_BASE>; friend class OResultSet; - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< ::rtl::OUString> m_aBatchList; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement - OConnection* m_pConnection;// The owning Connection object - WpADOCommand m_Command; - WpADORecordset m_RecordSet; - OLEVariant m_RecordsAffected; - OLEVariant m_Parameters; - ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry + OConnection* m_pConnection;// The owning Connection object + WpADOCommand m_Command; + WpADORecordset m_RecordSet; + OLEVariant m_RecordsAffected; + OLEVariant m_Parameters; + ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. - sal_Int32 m_nMaxRows; - sal_Int32 m_nFetchSize; - LockTypeEnum m_eLockType; - CursorTypeEnum m_eCursorType; + sal_Int32 m_nMaxRows; + sal_Int32 m_nFetchSize; + LockTypeEnum m_eLockType; + CursorTypeEnum m_eCursorType; using OStatement_BASE::rBHelper; private: @@ -177,7 +177,7 @@ namespace connectivity virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - class OStatement : public OStatement_Base, + class OStatement : public OStatement_Base, public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo { diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index afa740ad5427..6c5e1b16bbda 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ namespace connectivity typedef connectivity::sdbcx::OTable OTable_TYPEDEF; typedef connectivity::sdbcx::OTableDescriptor_BASE OTableDescriptor_BASE_TYPEDEF; - class OAdoTable : public OTable_TYPEDEF + class OAdoTable : public OTable_TYPEDEF { - WpADOTable m_aTable; - OCatalog* m_pCatalog; + WpADOTable m_aTable; + OCatalog* m_pCatalog; protected: void fillPropertyValues(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); - + public: virtual void refreshColumns(); virtual void refreshKeys(); @@ -60,7 +60,7 @@ namespace connectivity public: OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable); OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); - + virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); ::rtl::OUString getSchema() const { return m_SchemaName; } diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx index 1548cd34f7f5..ac2e0b94079e 100644 --- a/connectivity/source/inc/ado/ATables.hxx +++ b/connectivity/source/inc/ado/ATables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace connectivity class OCatalog; class OTables : public sdbcx::OCollection { - WpADOTables m_aCollection; - OCatalog* m_pCatalog; + WpADOTables m_aCollection; + OCatalog* m_pCatalog; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx index 922d9529c2e4..8595c075e9f7 100644 --- a/connectivity/source/inc/ado/AUser.hxx +++ b/connectivity/source/inc/ado/AUser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ namespace connectivity class OAdoUser : public OUser_TYPEDEF { protected: - WpADOUser m_aUser; - OCatalog* m_pCatalog; + WpADOUser m_aUser; + OCatalog* m_pCatalog; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, @@ -58,7 +58,7 @@ namespace connectivity public: virtual void refreshGroups(); public: - OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser=NULL); + OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser=NULL); OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name); // com::sun::star::lang::XUnoTunnel @@ -85,7 +85,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx index 8e8c79d231cb..77aa4504bf1d 100644 --- a/connectivity/source/inc/ado/AUsers.hxx +++ b/connectivity/source/inc/ado/AUsers.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ namespace connectivity class OUsers : public sdbcx::OCollection { - WpADOUsers m_aCollection; - OCatalog* m_pCatalog; + WpADOUsers m_aCollection; + OCatalog* m_pCatalog; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); @@ -56,8 +56,8 @@ namespace connectivity OUsers( OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOUsers& _rCollection, - sal_Bool _bCase) + const WpADOUsers& _rCollection, + sal_Bool _bCase) :sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx index 4ca8b51b6a2f..8ec340608c4b 100644 --- a/connectivity/source/inc/ado/AView.hxx +++ b/connectivity/source/inc/ado/AView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ namespace connectivity typedef sdbcx::OView OView_ADO; - class OAdoView : public OView_ADO + class OAdoView : public OView_ADO { - WpADOView m_aView; + WpADOView m_aView; protected: // OPropertySetHelper diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx index 78a4f16134d0..27a7bebb36a9 100644 --- a/connectivity/source/inc/ado/AViews.hxx +++ b/connectivity/source/inc/ado/AViews.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace connectivity class OViews : public sdbcx::OCollection { - WpADOViews m_aCollection; - OCatalog* m_pCatalog; + WpADOViews m_aCollection; + OCatalog* m_pCatalog; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index fd343f32df61..7efda7a2f06f 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,20 +79,20 @@ namespace connectivity sal_Int32 length() const; }; - class OLEVariant : public ::tagVARIANT + class OLEVariant : public ::tagVARIANT { public: OLEVariant(); OLEVariant(const VARIANT& varSrc); - OLEVariant(const OLEVariant& varSrc) ; - OLEVariant(sal_Bool x) ; - OLEVariant(sal_Int8 n) ; - OLEVariant(sal_Int16 n) ; - OLEVariant(sal_Int32 n) ; - OLEVariant(sal_Int64 x) ; - - OLEVariant(const rtl::OUString& us) ; - ~OLEVariant() ; + OLEVariant(const OLEVariant& varSrc) ; + OLEVariant(sal_Bool x) ; + OLEVariant(sal_Int8 n) ; + OLEVariant(sal_Int16 n) ; + OLEVariant(sal_Int32 n) ; + OLEVariant(sal_Int64 x) ; + + OLEVariant(const rtl::OUString& us) ; + ~OLEVariant() ; OLEVariant(const ::com::sun::star::util::Date& x ); OLEVariant(const ::com::sun::star::util::Time& x ); OLEVariant(const ::com::sun::star::util::DateTime& x ); @@ -107,21 +107,21 @@ namespace connectivity // Assign a const VARIANT* (::VariantCopy handles everything) // OLEVariant& operator=(const VARIANT* pSrc); - void setByte(sal_uInt8 n) ; - void setInt16(sal_Int16 n) ; - void setInt32(sal_Int32 n) ; - void setFloat(float f) ; - void setDouble(double d) ; - void setDate(DATE d) ; - void setChar(unsigned char a) ; - void setCurrency(double aCur) ; - void setBool(sal_Bool b) ; - void setString(const rtl::OUString& us) ; - void setNoArg() ; + void setByte(sal_uInt8 n) ; + void setInt16(sal_Int16 n) ; + void setInt32(sal_Int32 n) ; + void setFloat(float f) ; + void setDouble(double d) ; + void setDate(DATE d) ; + void setChar(unsigned char a) ; + void setCurrency(double aCur) ; + void setBool(sal_Bool b) ; + void setString(const rtl::OUString& us) ; + void setNoArg() ; void setIDispatch(IDispatch* pDispInterface); - void setNull() ; - void setEmpty() ; + void setNull() ; + void setEmpty() ; void setUI1SAFEARRAYPtr(SAFEARRAY* pSafeAr); void setArray(SAFEARRAY* pSafeArray, VARTYPE vtType); @@ -134,31 +134,31 @@ namespace connectivity operator ::rtl::OUString() const; - operator sal_Bool() const { return getBool(); } - operator sal_Int8() const { return getInt8(); } - operator sal_Int16() const { return getInt16(); } - operator sal_Int32() const { return getInt32(); } - operator float() const { return getFloat(); } - operator double() const { return getDouble(); } + operator sal_Bool() const { return getBool(); } + operator sal_Int8() const { return getInt8(); } + operator sal_Int16() const { return getInt16(); } + operator sal_Int32() const { return getInt32(); } + operator float() const { return getFloat(); } + operator double() const { return getDouble(); } operator ::com::sun::star::uno::Sequence< sal_Int8 >() const; operator ::com::sun::star::util::Date() const ; - operator ::com::sun::star::util::Time() const ; + operator ::com::sun::star::util::Time() const ; operator ::com::sun::star::util::DateTime()const ; - ::rtl::OUString getString() const; - sal_Bool getBool() const; - IUnknown* getIUnknown() const; - IDispatch* getIDispatch() const; - sal_uInt8 getByte() const; - sal_Int16 getInt16() const; - sal_Int8 getInt8() const; - sal_Int32 getInt32() const; - sal_uInt32 getUInt32() const; - float getFloat() const; - double getDouble() const; - double getDate() const; - CY getCurrency() const; - SAFEARRAY* getUI1SAFEARRAYPtr() const; + ::rtl::OUString getString() const; + sal_Bool getBool() const; + IUnknown* getIUnknown() const; + IDispatch* getIDispatch() const; + sal_uInt8 getByte() const; + sal_Int16 getInt16() const; + sal_Int8 getInt8() const; + sal_Int32 getInt32() const; + sal_uInt32 getUInt32() const; + float getFloat() const; + double getDouble() const; + double getDate() const; + CY getCurrency() const; + SAFEARRAY* getUI1SAFEARRAYPtr() const; ::com::sun::star::uno::Any makeAny() const; static VARIANT_BOOL VariantBool(sal_Bool bEinBoolean); diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 79371befcb7f..fe582e1e39f1 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,7 +156,7 @@ namespace connectivity inline void Refresh(){pInterface->Refresh();} - inline sal_Int32 GetItemCount() const + inline sal_Int32 GetItemCount() const { sal_Int32 nCount = 0; return pInterface ? (SUCCEEDED(pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 10476e790ca5..8c69f6e91e06 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,8 +54,8 @@ namespace connectivity class WpADOError; class WpADOProperty; - typedef WpOLEAppendCollection< ADOFields, ADOField, WpADOField> WpADOFields; - typedef WpOLECollection< ADOProperties, ADOProperty, WpADOProperty> WpADOProperties; + typedef WpOLEAppendCollection< ADOFields, ADOField, WpADOField> WpADOFields; + typedef WpOLECollection< ADOProperties, ADOProperty, WpADOProperty> WpADOProperties; //------------------------------------------------------------------------ class WpADOConnection : public WpOLEBase<ADOConnection> @@ -63,7 +63,7 @@ namespace connectivity friend class WpADOCommand; public: - WpADOConnection(ADOConnection* pInt) : WpOLEBase<ADOConnection>(pInt){} + WpADOConnection(ADOConnection* pInt) : WpOLEBase<ADOConnection>(pInt){} WpADOConnection(const WpADOConnection& rhs){operator=(rhs);} @@ -82,7 +82,7 @@ namespace connectivity void PutCommandTimeout(sal_Int32 nRet); - sal_Int32 GetConnectionTimeout() const ; + sal_Int32 GetConnectionTimeout() const ; void PutConnectionTimeout(sal_Int32 nRet); @@ -173,7 +173,7 @@ namespace connectivity WpADOCommand(){} // Konstruktoren, operator= // diese rufen nur die Oberklasse - WpADOCommand(ADOCommand* pInt) : WpOLEBase<ADOCommand>(pInt){} + WpADOCommand(ADOCommand* pInt) : WpOLEBase<ADOCommand>(pInt){} WpADOCommand(const WpADOCommand& rhs){operator=(rhs);} @@ -236,7 +236,7 @@ namespace connectivity //------------------------------------------------------------------------ class WpADOField : public WpOLEBase<ADOField> { - // friend class WpADOFields; + // friend class WpADOFields; public: // Konstruktoren, operator= @@ -251,7 +251,7 @@ namespace connectivity WpADOProperties get_Properties(); sal_Int32 GetActualSize() const ; sal_Int32 GetAttributes() const ; - sal_Int32 GetStatus() const ; + sal_Int32 GetStatus() const ; sal_Int32 GetDefinedSize() const ; // gibt den Namen des Feldes zur"ueck ::rtl::OUString GetName() const ; @@ -320,8 +320,8 @@ namespace connectivity } ~WpADORecordset() { - // if(pInterface && get_State() == adStateOpen) - // Close(); + // if(pInterface && get_State() == adStateOpen) + // Close(); } ////////////////////////////////////////////////////////////////////// void Create(); @@ -400,19 +400,19 @@ namespace connectivity { public: /** putValue set the property value at the ado column - @param _rProps the properties where to set - @param _aPosition which property to set - @param _aValVar the value to set + @param _rProps the properties where to set + @param _aPosition which property to set + @param _aValVar the value to set */ - static void putValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition,const OLEVariant &_aValVar); + static void putValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition,const OLEVariant &_aValVar); /** getValue returns a specific property value - @param _rProps the properties where to set - @param _aPosition the property + @param _rProps the properties where to set + @param _aPosition the property - @return the property value + @return the property value */ - static OLEVariant getValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition); + static OLEVariant getValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition); }; } } diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx index 614c139aecb5..aaab885eca6b 100644 --- a/connectivity/source/inc/ado/Awrapadox.hxx +++ b/connectivity/source/inc/ado/Awrapadox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #ifndef __User_FWD_DEFINED__ #define __User_FWD_DEFINED__ typedef struct _ADOUser User; -#endif /* __User_FWD_DEFINED__ */ +#endif /* __User_FWD_DEFINED__ */ #ifndef __Group_FWD_DEFINED__ #define __Group_FWD_DEFINED__ @@ -44,7 +44,7 @@ typedef struct _ADOGroup Group; #ifndef __Column_FWD_DEFINED__ #define __Column_FWD_DEFINED__ typedef struct _ADOColumn Column; -#endif /* __Column_FWD_DEFINED__ */ +#endif /* __Column_FWD_DEFINED__ */ #ifndef __Index_FWD_DEFINED__ #define __Index_FWD_DEFINED__ @@ -54,12 +54,12 @@ typedef struct _ADOIndex Index; #ifndef __Key_FWD_DEFINED__ #define __Key_FWD_DEFINED__ typedef struct _ADOKey Key; -#endif /* __Key_FWD_DEFINED__ */ +#endif /* __Key_FWD_DEFINED__ */ #ifndef __Table_FWD_DEFINED__ #define __Table_FWD_DEFINED__ typedef struct _ADOTable Table; -#endif /* __Table_FWD_DEFINED__ */ +#endif /* __Table_FWD_DEFINED__ */ #include "ado_pre_sys_include.h" @@ -85,7 +85,7 @@ namespace connectivity class WpADOView : public WpOLEBase<ADOView> { public: - WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){} + WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){} WpADOView(const WpADOView& rhs){operator=(rhs);} inline WpADOView& operator=(const WpADOView& rhs) @@ -99,7 +99,7 @@ namespace connectivity class WpADOGroup : public WpOLEBase<ADOGroup> { public: - WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){} + WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){} WpADOGroup(const WpADOGroup& rhs){operator=(rhs);} inline WpADOGroup& operator=(const WpADOGroup& rhs) @@ -123,7 +123,7 @@ namespace connectivity class WpADOUser : public WpOLEBase<_ADOUser> { public: - WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){} + WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){} WpADOUser(const WpADOUser& rhs){operator=(rhs);} inline WpADOUser& operator=(const WpADOUser& rhs) diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx index 8ebbb6259c35..1cc25e25bd41 100644 --- a/connectivity/source/inc/ado/WrapCatalog.hxx +++ b/connectivity/source/inc/ado/WrapCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity class WpADOCatalog : public WpOLEBase<_ADOCatalog> { public: - WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){} + WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){} WpADOCatalog(const WpADOCatalog& rhs){operator=(rhs);} inline WpADOCatalog& operator=(const WpADOCatalog& rhs) @@ -46,11 +46,11 @@ namespace connectivity ::rtl::OUString GetObjectOwner(const ::rtl::OUString& _rName, ObjectTypeEnum _eNum); void putref_ActiveConnection(IDispatch* pCon); - WpADOTables get_Tables(); - WpADOViews get_Views(); - WpADOGroups get_Groups(); - WpADOUsers get_Users(); - ADOProcedures* get_Procedures(); + WpADOTables get_Tables(); + WpADOViews get_Views(); + WpADOGroups get_Groups(); + WpADOUsers get_Users(); + ADOProcedures* get_Procedures(); void Create(); }; } diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx index e39474b5057b..4245ef5b3168 100644 --- a/connectivity/source/inc/ado/WrapColumn.hxx +++ b/connectivity/source/inc/ado/WrapColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace connectivity class WpADOColumn : public WpOLEBase<_ADOColumn> { public: - WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){} + WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){} WpADOColumn(const WpADOColumn& rhs){operator=(rhs);} void Create(); diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx index bc350f72eb3d..1847adfeae65 100644 --- a/connectivity/source/inc/ado/WrapIndex.hxx +++ b/connectivity/source/inc/ado/WrapIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity class WpADOIndex : public WpOLEBase<_ADOIndex> { public: - WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){} + WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){} WpADOIndex(const WpADOIndex& rhs){operator=(rhs);} inline WpADOIndex& operator=(const WpADOIndex& rhs) @@ -46,14 +46,14 @@ namespace connectivity void Create(); ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); - sal_Bool get_Clustered() const; - void put_Clustered(sal_Bool _b); - sal_Bool get_Unique() const; - void put_Unique(sal_Bool _b); - sal_Bool get_PrimaryKey() const; - void put_PrimaryKey(sal_Bool _b); - WpADOColumns get_Columns() const; + void put_Name(const ::rtl::OUString& _rName); + sal_Bool get_Clustered() const; + void put_Clustered(sal_Bool _b); + sal_Bool get_Unique() const; + void put_Unique(sal_Bool _b); + sal_Bool get_PrimaryKey() const; + void put_PrimaryKey(sal_Bool _b); + WpADOColumns get_Columns() const; }; } } diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx index 3666338fd613..50b70954e4e9 100644 --- a/connectivity/source/inc/ado/WrapKey.hxx +++ b/connectivity/source/inc/ado/WrapKey.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity class WpADOKey : public WpOLEBase<ADOKey> { public: - WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){} + WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){} WpADOKey(const WpADOKey& rhs){operator=(rhs);} inline WpADOKey& operator=(const WpADOKey& rhs) diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx index 646b26e333de..7c94004230cc 100644 --- a/connectivity/source/inc/ado/WrapTable.hxx +++ b/connectivity/source/inc/ado/WrapTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity class WpADOTable : public WpOLEBase<_ADOTable> { public: - WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){} + WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){} WpADOTable(const WpADOTable& rhs){operator=(rhs);} inline WpADOTable& operator=(const WpADOTable& rhs) @@ -48,18 +48,18 @@ namespace connectivity void Create(); ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); + void put_Name(const ::rtl::OUString& _rName); ::rtl::OUString get_Type() const; - WpADOColumns get_Columns() const; - WpADOIndexes get_Indexes() const; - WpADOKeys get_Keys() const; - WpADOCatalog get_ParentCatalog() const; + WpADOColumns get_Columns() const; + WpADOIndexes get_Indexes() const; + WpADOKeys get_Keys() const; + WpADOCatalog get_ParentCatalog() const; WpADOProperties get_Properties() const; - void putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject); + void putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject); }; - - typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; + + typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; } } diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx index c81ec6839ae9..c96bcebc6982 100644 --- a/connectivity/source/inc/ado/WrapTypeDefs.hxx +++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ namespace connectivity class WpADOView; class WpADOUser; - typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; - typedef WpOLEAppendCollection<ADOKeys, ADOKey, WpADOKey> WpADOKeys; - typedef WpOLEAppendCollection<ADOIndexes, _ADOIndex, WpADOIndex> WpADOIndexes; - typedef WpOLEAppendCollection<ADOColumns, _ADOColumn, WpADOColumn> WpADOColumns; - typedef WpOLEAppendCollection<ADOGroups, ADOGroup, WpADOGroup> WpADOGroups; - typedef WpOLEAppendCollection<ADOViews, ADOView, WpADOView> WpADOViews; - typedef WpOLEAppendCollection<ADOUsers, _ADOUser, WpADOUser> WpADOUsers; + typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; + typedef WpOLEAppendCollection<ADOKeys, ADOKey, WpADOKey> WpADOKeys; + typedef WpOLEAppendCollection<ADOIndexes, _ADOIndex, WpADOIndex> WpADOIndexes; + typedef WpOLEAppendCollection<ADOColumns, _ADOColumn, WpADOColumn> WpADOColumns; + typedef WpOLEAppendCollection<ADOGroups, ADOGroup, WpADOGroup> WpADOGroups; + typedef WpOLEAppendCollection<ADOViews, ADOView, WpADOView> WpADOViews; + typedef WpOLEAppendCollection<ADOUsers, _ADOUser, WpADOUser> WpADOUsers; } } diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx index eb07d0200582..8744c614142d 100644 --- a/connectivity/source/inc/ado/adoimp.hxx +++ b/connectivity/source/inc/ado/adoimp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,62 +49,62 @@ namespace connectivity // Auch hier: BSTR mit SysFreeString() freigeben! static OLEString& GetKeyStr(); - static const CLSID CLSID_ADOCATALOG_25; - static const IID IID_ADOCATALOG_25; + static const CLSID CLSID_ADOCATALOG_25; + static const IID IID_ADOCATALOG_25; - static const CLSID CLSID_ADOCONNECTION_21; - static const IID IID_ADOCONNECTION_21; + static const CLSID CLSID_ADOCONNECTION_21; + static const IID IID_ADOCONNECTION_21; - static const CLSID CLSID_ADOCOMMAND_21; - static const IID IID_ADOCOMMAND_21; + static const CLSID CLSID_ADOCOMMAND_21; + static const IID IID_ADOCOMMAND_21; - static const CLSID CLSID_ADORECORDSET_21; - static const IID IID_ADORECORDSET_21; + static const CLSID CLSID_ADORECORDSET_21; + static const IID IID_ADORECORDSET_21; - static const CLSID CLSID_ADOINDEX_25; - static const IID IID_ADOINDEX_25; + static const CLSID CLSID_ADOINDEX_25; + static const IID IID_ADOINDEX_25; - static const CLSID CLSID_ADOCOLUMN_25; - static const IID IID_ADOCOLUMN_25; + static const CLSID CLSID_ADOCOLUMN_25; + static const IID IID_ADOCOLUMN_25; - static const CLSID CLSID_ADOKEY_25; - static const IID IID_ADOKEY_25; + static const CLSID CLSID_ADOKEY_25; + static const IID IID_ADOKEY_25; - static const CLSID CLSID_ADOTABLE_25; - static const IID IID_ADOTABLE_25; + static const CLSID CLSID_ADOTABLE_25; + static const IID IID_ADOTABLE_25; - static const CLSID CLSID_ADOGROUP_25; - static const IID IID_ADOGROUP_25; + static const CLSID CLSID_ADOGROUP_25; + static const IID IID_ADOGROUP_25; - static const CLSID CLSID_ADOUSER_25; - static const IID IID_ADOUSER_25; + static const CLSID CLSID_ADOUSER_25; + static const IID IID_ADOUSER_25; - static const CLSID CLSID_ADOVIEW_25; - static const IID IID_ADOVIEW_25; + static const CLSID CLSID_ADOVIEW_25; + static const IID IID_ADOVIEW_25; static void ThrowException(ADOConnection* _pAdoCon,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); static sal_Int32 MapADOType2Jdbc(DataTypeEnum eType); static DataTypeEnum MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine); static sal_Bool isJetEngine(sal_Int32 _nEngineType); - static ObjectTypeEnum mapObjectType2Ado(sal_Int32 objType); - static sal_Int32 mapAdoType2Object(ObjectTypeEnum objType); - static sal_Int32 mapAdoRights2Sdbc(RightsEnum eRights); - static sal_Int32 mapRights2Ado(sal_Int32 nRights); + static ObjectTypeEnum mapObjectType2Ado(sal_Int32 objType); + static sal_Int32 mapAdoType2Object(ObjectTypeEnum objType); + static sal_Int32 mapAdoRights2Sdbc(RightsEnum eRights); + static sal_Int32 mapRights2Ado(sal_Int32 nRights); - static WpADOField getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + static WpADOField getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } -#define ADO_PROP(ItemName) \ - WpADOProperty aProp(aProps.GetItem(ItemName)); \ - OLEVariant aVar; \ - if(aProp.IsValid()) \ - aVar = aProp.GetValue(); \ - else \ +#define ADO_PROP(ItemName) \ + WpADOProperty aProp(aProps.GetItem(ItemName)); \ + OLEVariant aVar; \ + if(aProp.IsValid()) \ + aVar = aProp.GetValue(); \ + else \ ADOS::ThrowException(*m_pADOConnection,*this); diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx index fb3616c0a075..d5b21d3e6aee 100644 --- a/connectivity/source/inc/calc/CCatalog.hxx +++ b/connectivity/source/inc/calc/CCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx index bef6a7b767e8..73e83f518c81 100644 --- a/connectivity/source/inc/calc/CColumns.hxx +++ b/connectivity/source/inc/calc/CColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index b58f25cfc8c7..94391b98a559 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx index e001e315f502..93e706d9aa76 100644 --- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx +++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class OCalcDatabaseMetaData : public file::ODatabaseMetaData + class OCalcDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 1488d3605888..c88cf742b671 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx index 331b3aa5212d..7166b7ff5f6b 100644 --- a/connectivity/source/inc/calc/CPreparedStatement.hxx +++ b/connectivity/source/inc/calc/CPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx index d144f75dc09e..171069a014dc 100644 --- a/connectivity/source/inc/calc/CResultSet.hxx +++ b/connectivity/source/inc/calc/CResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace connectivity // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper2< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbcx::XDeleteRows> OCalcResultSet_BASE; - typedef file::OResultSet OCalcResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<OCalcResultSet> OCalcResultSet_BASE3; + typedef file::OResultSet OCalcResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<OCalcResultSet> OCalcResultSet_BASE3; class OCalcResultSet : public OCalcResultSet_BASE2, @@ -59,7 +59,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - OCalcResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OCalcResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); private: // XInterface diff --git a/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx index 46df690cb65d..d919c457e9b0 100644 --- a/connectivity/source/inc/calc/CStatement.hxx +++ b/connectivity/source/inc/calc/CStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 0db28e7fd9a5..8e907b6d37aa 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "file/FTable.hxx" #include <tools/date.hxx> - + namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; class XSpreadsheetDocument; @@ -53,11 +53,11 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; - class OCalcTable : public OCalcTable_BASE + class OCalcTable : public OCalcTable_BASE { - private: - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + private: + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth ::std::vector<sal_Int32> m_aScales; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > m_xSheet; OCalcConnection* m_pConnection; diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx index 97f8f161fdbc..5ba872b98ccd 100644 --- a/connectivity/source/inc/calc/CTables.hxx +++ b/connectivity/source/inc/calc/CTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx index 493fc94b470b..6814277ba0eb 100644 --- a/connectivity/source/inc/dbase/DCatalog.hxx +++ b/connectivity/source/inc/dbase/DCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx index 7c5fc7312e1a..c5a0d667903f 100644 --- a/connectivity/source/inc/dbase/DCode.hxx +++ b/connectivity/source/inc/dbase/DCode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx index fc86b7d42378..159544100244 100644 --- a/connectivity/source/inc/dbase/DColumns.hxx +++ b/connectivity/source/inc/dbase/DColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx index 6d93cc5a19ac..97c1ca32f00d 100644 --- a/connectivity/source/inc/dbase/DConnection.hxx +++ b/connectivity/source/inc/dbase/DConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity protected: virtual ~ODbaseConnection(); public: - ODbaseConnection(ODriver* _pDriver); + ODbaseConnection(ODriver* _pDriver); // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx index cde83ca67497..1c661bceccb4 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class ODbaseDatabaseMetaData : public file::ODatabaseMetaData + class ODbaseDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx index 2d24d0f7585e..12fc3ebced3f 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,29 +64,29 @@ namespace connectivity DECLARE_STL_VECTOR(::com::sun::star::uno::Any,ORow); DECLARE_STL_VECTOR(ORow, ORows); - class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, + public ODatabaseMetaDataResultSet_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ORows m_aRows; - ORowsIterator m_aRowsIter; - ::com::sun::star::uno::WeakReferenceHelper + ORows m_aRows; + ORowsIterator m_aRowsIter; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sal_Int32 m_nRowPos; - sal_Int32 m_nColPos; + sal_Int32 m_nRowPos; + sal_Int32 m_nColPos; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bWasNull; - sal_Bool m_bBOF; + sal_Bool m_bWasNull; + sal_Bool m_bBOF; void construct(); @@ -102,7 +102,7 @@ namespace connectivity DECLARE_CTY_DEFAULTS(ODatabaseMetaDataResultSet_BASE); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSet( ); - + void setRows(const ORows& _rRows) { m_aRows = _rRows; } diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx index 114aa25545fb..3a8adf9b9339 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,15 +46,15 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { friend class ODatabaseMetaDataResultSet; ::std::vector<sal_Int32> m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; + ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - sal_Int32 m_nColCount; + sal_Int32 m_nColCount; protected: void setColumnPrivilegesMap(); @@ -71,7 +71,7 @@ namespace connectivity public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ODatabaseMetaDataResultSet* _pRes) - : m_nColCount(0) + : m_nColCount(0) { } ~ODatabaseMetaDataResultSetMetaData(); diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index eac29c1826c2..a4ac77d24a3a 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace connectivity // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index fb3ed77e7048..c241dce433aa 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace connectivity typedef file::OBoolOperator OBoolOperator_BASE; typedef file::OOperand OOperand_BASE; - class ODbaseIndex : public ODbaseIndex_BASE + class ODbaseIndex : public ODbaseIndex_BASE { friend SvStream& operator << (SvStream &rStream, ODbaseIndex&); friend SvStream& operator >> (SvStream &rStream, ODbaseIndex&); @@ -63,34 +63,34 @@ namespace connectivity //================================================================== struct NDXHeader { - sal_uInt32 db_rootpage; /* Position der Rootpage */ - sal_uInt32 db_pagecount; /* Anzahl Pages */ - sal_uInt8 db_frei[4]; /* reserviert */ - sal_uInt16 db_keylen; /* Laenge des Schluessels */ - sal_uInt16 db_maxkeys; /* Max. # keys pro Seite */ + sal_uInt32 db_rootpage; /* Position der Rootpage */ + sal_uInt32 db_pagecount; /* Anzahl Pages */ + sal_uInt8 db_frei[4]; /* reserviert */ + sal_uInt16 db_keylen; /* Laenge des Schluessels */ + sal_uInt16 db_maxkeys; /* Max. # keys pro Seite */ sal_uInt16 db_keytype; /* Art des Schluessels (0-Text) - (1-Numerisch) */ + (1-Numerisch) */ sal_uInt16 db_keyrec; /* Laenge eines IndexSatzes - SatzNr + keylen */ - sal_uInt8 db_frei1[3]; /* reserviert */ - sal_uInt8 db_unique; /* eindeutig */ - char db_name[488]; /* index_name (Feldname) */ + SatzNr + keylen */ + sal_uInt8 db_frei1[3]; /* reserviert */ + sal_uInt8 db_unique; /* eindeutig */ + char db_name[488]; /* index_name (Feldname) */ }; private: - SvStream* m_pFileStream; // Stream zum Lesen/Schreiben des Index - NDXHeader m_aHeader; + SvStream* m_pFileStream; // Stream zum Lesen/Schreiben des Index + NDXHeader m_aHeader; ONDXPageList m_aCollector; // Pool von nicht mehr benoetigten Seiten - ONDXPagePtr m_aRoot, // Wurzel des b+ Baums - m_aCurLeaf; // aktuelles Blatt - USHORT m_nCurNode; // Position des aktuellen Knoten + ONDXPagePtr m_aRoot, // Wurzel des b+ Baums + m_aCurLeaf; // aktuelles Blatt + USHORT m_nCurNode; // Position des aktuellen Knoten - sal_uInt32 m_nPageCount, + sal_uInt32 m_nPageCount, m_nRootPage; - ODbaseTable* m_pTable; - BOOL m_bUseCollector : 1; // Verwenden des GarbageCollectors + ODbaseTable* m_pTable; + BOOL m_bUseCollector : 1; // Verwenden des GarbageCollectors ::rtl::OUString getCompletePath(); void closeImpl(); @@ -118,14 +118,14 @@ namespace connectivity virtual OIndexIterator* createIterator(OBoolOperator_BASE* pOp, const OOperand_BASE* pOperand = NULL); - void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} - void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;} + void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} + void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;} - sal_uInt32 GetRootPos() {return m_nRootPage;} - sal_uInt32 GetPageCount() {return m_nPageCount;} + sal_uInt32 GetRootPos() {return m_nRootPage;} + sal_uInt32 GetPageCount() {return m_nPageCount;} - BOOL IsText() const {return m_aHeader.db_keytype == 0;} - USHORT GetMaxNodes() const {return m_aHeader.db_maxkeys;} + BOOL IsText() const {return m_aHeader.db_keytype == 0;} + USHORT GetMaxNodes() const {return m_aHeader.db_maxkeys;} virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue); virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&); diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx index 136c49a1f574..d967cd878d38 100644 --- a/connectivity/source/inc/dbase/DIndexColumns.hxx +++ b/connectivity/source/inc/dbase/DIndexColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: - ODbaseIndexColumns( ODbaseIndex* _pIndex, + ODbaseIndexColumns( ODbaseIndex* _pIndex, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector) diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index a6c4308a35e2..cbc520a7e7f6 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ namespace connectivity class OIndexIterator { protected: - file::OBoolOperator* m_pOperator; - const file::OOperand* m_pOperand; - ODbaseIndex* m_pIndex; - ONDXPagePtr m_aRoot, + file::OBoolOperator* m_pOperator; + const file::OOperand* m_pOperand; + ODbaseIndex* m_pIndex; + ONDXPagePtr m_aRoot, m_aCurLeaf; - USHORT m_nCurNode; + USHORT m_nCurNode; protected: ULONG Find(BOOL bFirst); diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx index bde6e63526da..a2eab66974fb 100644 --- a/connectivity/source/inc/dbase/DIndexes.hxx +++ b/connectivity/source/inc/dbase/DIndexes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity class ODbaseIndexes : public ODbaseIndexes_BASE { - ODbaseTable* m_pTable; + ODbaseTable* m_pTable; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx index 52bbaf73bb8c..beaec2e58e66 100644 --- a/connectivity/source/inc/dbase/DPreparedStatement.hxx +++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx index d5a05e946dcf..9b2837916c96 100644 --- a/connectivity/source/inc/dbase/DResultSet.hxx +++ b/connectivity/source/inc/dbase/DResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ namespace connectivity // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper2< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbcx::XDeleteRows> ODbaseResultSet_BASE; - typedef file::OResultSet ODbaseResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<ODbaseResultSet> ODbaseResultSet_BASE3; + typedef file::OResultSet ODbaseResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<ODbaseResultSet> ODbaseResultSet_BASE3; class ODbaseResultSet : public ODbaseResultSet_BASE2, @@ -60,7 +60,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - ODbaseResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + ODbaseResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx index 8029cf9ed79a..edb8c0310c56 100644 --- a/connectivity/source/inc/dbase/DStatement.hxx +++ b/connectivity/source/inc/dbase/DStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index ba41c10c8df7..53d89af63a9d 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ namespace connectivity typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; - class ODbaseTable : public ODbaseTable_BASE + class ODbaseTable : public ODbaseTable_BASE { // der Typ einer dBase datei wird mit dem ersten Byte bestimmt public: - enum DBFType { dBaseIII = 0x03, + enum DBFType { dBaseIII = 0x03, dBaseIV = 0x04, - dBaseV = 0x05, - VisualFoxPro = 0x30, + dBaseV = 0x05, + VisualFoxPro = 0x30, VisualFoxProAuto = 0x31, // Visual FoxPro w. AutoIncrement field dBaseFS = 0x43, dBaseFSMemo = 0xB3, @@ -61,14 +61,14 @@ namespace connectivity dBaseIVMemoSQL = 0x8E, FoxProMemo = 0xF5 }; - enum DBFMemoType { MemodBaseIII = 0, + enum DBFMemoType { MemodBaseIII = 0, MemodBaseIV, MemoFoxPro }; private: struct DBFHeader { /* Kopfsatz-Struktur */ - DBFType db_typ; /* Dateityp */ + DBFType db_typ; /* Dateityp */ BYTE db_aedat[3]; /* Datum der letzen Aenderung */ /* JJ MM TT */ sal_uInt32 db_anz; /* Anzahl der Saetze */ @@ -86,20 +86,20 @@ namespace connectivity }; struct DBFMemoHeader { - DBFMemoType db_typ; /* Dateityp */ + DBFMemoType db_typ; /* Dateityp */ UINT32 db_next; /* naechster freier Block */ USHORT db_size; /* Blockgroesse: dBase 3 fest */ }; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth ::std::vector<sal_Int32> m_aScales; ::std::vector<sal_Int32> m_aRealFieldLengths; - DBFHeader m_aHeader; - DBFMemoHeader m_aMemoHeader; - SvStream* m_pMemoStream; + DBFHeader m_aHeader; + DBFMemoHeader m_aMemoHeader; + SvStream* m_pMemoStream; rtl_TextEncoding m_eEncoding; - sal_Bool m_bWriteableMemo; + sal_Bool m_bWriteableMemo; void alterColumn(sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor , @@ -126,7 +126,7 @@ namespace connectivity protected: virtual void FileClose(); -// using ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper; +// using ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper; public: virtual void refreshColumns(); @@ -162,8 +162,8 @@ namespace connectivity // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - BOOL DropImpl(); - BOOL CreateImpl(); + BOOL DropImpl(); + BOOL CreateImpl(); virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); @@ -173,8 +173,8 @@ namespace connectivity virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor); virtual void dropColumn(sal_Int32 _nPos); - static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL ); - static BOOL Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); + static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL ); + static BOOL Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); virtual void refreshHeader(); diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx index 91ed713fe0b9..29f10222d980 100644 --- a/connectivity/source/inc/dbase/DTables.hxx +++ b/connectivity/source/inc/dbase/DTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 97808ff7d838..41c78aecc75e 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,8 +51,8 @@ namespace connectivity class ONDXKey : public ONDXKey_BASE { friend class ONDXNode; - UINT32 nRecord; /* Satzzeiger */ - ORowSetValue xValue; /* Schluesselwert */ + UINT32 nRecord; /* Satzzeiger */ + ORowSetValue xValue; /* Schluesselwert */ public: ONDXKey(UINT32 nRec=0); @@ -67,13 +67,13 @@ namespace connectivity virtual const ORowSetValue& getValue() const; - UINT32 GetRecord() const { return nRecord; } - void setRecord(UINT32 _nRec) { nRecord = _nRec; } - void ResetRecord() { nRecord = 0; } + UINT32 GetRecord() const { return nRecord; } + void setRecord(UINT32 _nRec) { nRecord = _nRec; } + void ResetRecord() { nRecord = 0; } BOOL operator == (const ONDXKey& rKey) const; BOOL operator != (const ONDXKey& rKey) const; - BOOL operator < (const ONDXKey& rKey) const; + BOOL operator < (const ONDXKey& rKey) const; BOOL operator <= (const ONDXKey& rKey) const; BOOL operator > (const ONDXKey& rKey) const; BOOL operator >= (const ONDXKey& rKey) const; @@ -101,7 +101,7 @@ namespace connectivity friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&); friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&); - UINT32 nPagePos; // Position in der Indexdatei + UINT32 nPagePos; // Position in der Indexdatei public: ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){} @@ -113,7 +113,7 @@ namespace connectivity UINT32 GetPagePos() const {return nPagePos;} BOOL HasPage() const {return nPagePos != 0;} - // sal_Bool Is() const { return isValid(); } + // sal_Bool Is() const { return isValid(); } }; //================================================================== // Index Seite @@ -125,26 +125,26 @@ namespace connectivity friend SvStream& operator << (SvStream &rStream, const ONDXPage&); friend SvStream& operator >> (SvStream &rStream, ONDXPage&); - UINT32 nPagePos; // Position in der Indexdatei - BOOL bModified : 1; - USHORT nCount; + UINT32 nPagePos; // Position in der Indexdatei + BOOL bModified : 1; + USHORT nCount; - ONDXPagePtr aParent, // VaterSeite - aChild; // Zeiger auf rechte ChildPage + ONDXPagePtr aParent, // VaterSeite + aChild; // Zeiger auf rechte ChildPage ODbaseIndex& rIndex; - ONDXNode* ppNodes; // array von Knoten + ONDXNode* ppNodes; // array von Knoten public: // Knoten Operationen - USHORT Count() const {return nCount;} + USHORT Count() const {return nCount;} - BOOL Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0); - BOOL Insert(USHORT nIndex, ONDXNode& rNode); - BOOL Append(ONDXNode& rNode); - BOOL Delete(USHORT); - void Remove(USHORT); - void Release(BOOL bSave = TRUE); - void ReleaseFull(BOOL bSave = TRUE); + BOOL Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0); + BOOL Insert(USHORT nIndex, ONDXNode& rNode); + BOOL Append(ONDXNode& rNode); + BOOL Delete(USHORT); + void Remove(USHORT); + void Release(BOOL bSave = TRUE); + void ReleaseFull(BOOL bSave = TRUE); // Aufteilen und Zerlegen ONDXNode Split(ONDXPage& rPage); @@ -187,7 +187,7 @@ namespace connectivity void SetModified(BOOL bMod) {bModified = bMod;} void SetPagePos(UINT32 nPage) {nPagePos = nPage;} - BOOL Find(const ONDXKey&); // rek. Abstieg + BOOL Find(const ONDXKey&); // rek. Abstieg USHORT FindPos(const ONDXKey& rKey) const; #if OSL_DEBUG_LEVEL > 1 @@ -222,7 +222,7 @@ namespace connectivity SvStream& operator << (SvStream &rStream, const ONDXPage& rPage); - typedef ::std::vector<ONDXPage*> ONDXPageList; + typedef ::std::vector<ONDXPage*> ONDXPageList; //================================================================== // Index Knoten @@ -230,8 +230,8 @@ namespace connectivity class ONDXNode { friend class ONDXPage; - ONDXPagePtr aChild; /* naechster Seitenverweis */ - ONDXKey aKey; + ONDXPagePtr aChild; /* naechster Seitenverweis */ + ONDXKey aKey; public: ONDXNode(){} @@ -240,16 +240,16 @@ namespace connectivity :aChild(aPagePtr),aKey(rKey) {} // verweist der Knoten auf eine Seite - BOOL HasChild() const {return aChild.HasPage();} + BOOL HasChild() const {return aChild.HasPage();} // Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden - ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL); + ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL); - const ONDXKey& GetKey() const { return aKey;} - ONDXKey& GetKey() { return aKey;} + const ONDXKey& GetKey() const { return aKey;} + ONDXKey& GetKey() { return aKey;} // Setzen des Childs, ueber Referenz, um die PagePos zu erhalten - void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL); - void SetKey(ONDXKey& rKey) {aKey = rKey;} + void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL); + void SetKey(ONDXKey& rKey) {aKey = rKey;} void Write(SvStream &rStream, const ONDXPage& rPage) const; void Read(SvStream &rStream, ODbaseIndex&); @@ -257,32 +257,32 @@ namespace connectivity //================================================================== // inline implementation //================================================================== -// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec) -// : ONDXKey_BASE(eType) -// , nRecord(nRec),xValue(rVal) -// { -// } - - -// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) -// ,nRecord(nRec) -// { -// if (aStr.len()) -// xValue = aStr; -// } - -// inline ONDXKey::ONDXKey(double aVal, UINT32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) -// ,nRecord(nRec) -// ,xValue(aVal) -// { -// } - -// inline ONDXKey::ONDXKey(UINT32 nRec) -// :nRecord(nRec) -// { -// } +// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec) +// : ONDXKey_BASE(eType) +// , nRecord(nRec),xValue(rVal) +// { +// } + + +// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec) +// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) +// ,nRecord(nRec) +// { +// if (aStr.len()) +// xValue = aStr; +// } + +// inline ONDXKey::ONDXKey(double aVal, UINT32 nRec) +// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) +// ,nRecord(nRec) +// ,xValue(aVal) +// { +// } + +// inline ONDXKey::ONDXKey(UINT32 nRec) +// :nRecord(nRec) +// { +// } inline ONDXKey::ONDXKey(const ONDXKey& rKey) : ONDXKey_BASE(rKey.getDBType()) diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h index 52043001c0bb..5ce8b47b7816 100644 --- a/connectivity/source/inc/diagnose_ex.h +++ b/connectivity/source/inc/diagnose_ex.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 49afc2d7ef02..2886762debe0 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,14 +42,14 @@ namespace connectivity public connectivity::sdbcx::OCatalog { protected: - OConnection* m_pConnection; + OConnection* m_pConnection; /** builds the name which should be used to access the object later on in the collection. Will only be called in fillNames. - @param _xRow + @param _xRow The current row from the resultset given to fillNames. */ - virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); public: virtual void refreshTables(); @@ -59,7 +59,7 @@ namespace connectivity public: OFileCatalog(OConnection* _pCon); - OConnection* getConnection() { return m_pConnection; } + OConnection* getConnection() { return m_pConnection; } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index 1d73de5924e3..409b184b0883 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ namespace connectivity class OOO_DLLPUBLIC_FILE OColumns : public sdbcx::OCollection { protected: - OFileTable* m_pTable; + OFileTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OColumns( OFileTable* _pTable, + OColumns( OFileTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector) diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 244d8055b4a8..612c8a471ed3 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,22 +64,22 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by - String m_aFilenameExtension; - OFileDriver* m_pDriver; // Pointer to the owning + String m_aFilenameExtension; + OFileDriver* m_pDriver; // Pointer to the owning // driver object - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > m_xDir; // directory - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - - sal_Bool m_bClosed; - sal_Bool m_bAutoCommit; - sal_Bool m_bReadOnly; - sal_Bool m_bShowDeleted; - sal_Bool m_bCaseSensitiveExtension; - sal_Bool m_bCheckSQL92; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > m_xDir; // directory + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; + + sal_Bool m_bClosed; + sal_Bool m_bAutoCommit; + sal_Bool m_bReadOnly; + sal_Bool m_bShowDeleted; + sal_Bool m_bCaseSensitiveExtension; + sal_Bool m_bCheckSQL92; bool m_bDefaultTextEncoding; @@ -88,8 +88,8 @@ namespace connectivity virtual ~OConnection(); public: - OConnection(OFileDriver* _pDriver); - + OConnection(OFileDriver* _pDriver); + virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -126,23 +126,23 @@ 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); - //XUnoTunnel + //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // no interface methods ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > getDir() const; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getContent() const { return m_xContent; } + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getContent() const { return m_xContent; } // create a catalog or return the catalog already created virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); - sal_Bool matchesExtension( const String& _rExt ) const; + sal_Bool matchesExtension( const String& _rExt ) const; - inline const String& getExtension() const { return m_aFilenameExtension; } - inline sal_Bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } - inline OFileDriver* getDriver() const { return m_pDriver; } - inline sal_Bool showDeleted() const { return m_bShowDeleted; } - inline sal_Bool isCheckEnabled() const { return m_bCheckSQL92; } + inline const String& getExtension() const { return m_aFilenameExtension; } + inline sal_Bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } + inline OFileDriver* getDriver() const { return m_pDriver; } + inline sal_Bool showDeleted() const { return m_bShowDeleted; } + inline sal_Bool isCheckEnabled() const { return m_bCheckSQL92; } inline bool isTextEncodingDefaulted() const { return m_bDefaultTextEncoding; } public: @@ -153,7 +153,7 @@ namespace connectivity GrantAccess() { } }; - void setCaseSensitiveExtension( sal_Bool _bIsCS, GrantAccess ) { m_bCaseSensitiveExtension = _bIsCS; } + void setCaseSensitiveExtension( sal_Bool _bIsCS, GrantAccess ) { m_bCaseSensitiveExtension = _bIsCS; } }; } } diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx index bf4db7268912..aea33e07098b 100644 --- a/connectivity/source/inc/file/FDatabaseMetaData.hxx +++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity //************************************************************** class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE ODatabaseMetaData : - public ODatabaseMetaDataBase + public ODatabaseMetaDataBase { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information @@ -189,7 +189,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx index 4133e61e1b3d..0551d3fd4d16 100644 --- a/connectivity/source/inc/file/FDateFunctions.hxx +++ b/connectivity/source/inc/file/FDateFunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,11 +128,11 @@ namespace connectivity /** WEEK(date) WEEK(date,first) With a single argument, returns the week for date, in the range 0 to 53 (yes, there may be the beginnings of a week 53), for locations where Sunday is the first day of the week. The two-argument form of WEEK() allows you to specify whether the week starts on Sunday or Monday and whether the return value should be in the range 0-53 or 1-52. Here is a table for how the second argument works: - Value Meaning - 0 Week starts on Sunday and return value is in range 0-53 - 1 Week starts on Monday and return value is in range 0-53 - 2 Week starts on Sunday and return value is in range 1-53 - 3 Week starts on Monday and return value is in range 1-53 (ISO 8601) + Value Meaning + 0 Week starts on Sunday and return value is in range 0-53 + 1 Week starts on Monday and return value is in range 0-53 + 2 Week starts on Sunday and return value is in range 1-53 + 3 Week starts on Monday and return value is in range 1-53 (ISO 8601) > SELECT WEEK('1998-02-20'); -> 7 diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 337f8488bbd0..4cf15e8d864a 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,16 +40,16 @@ namespace connectivity { namespace file { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE; class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OFileDriver : public ODriver_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; // vector containing a list + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx index f98cdb7a2642..a76e988a5f82 100644 --- a/connectivity/source/inc/file/FNumericFunctions.hxx +++ b/connectivity/source/inc/file/FNumericFunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index f6e7eee77ed9..069261a58506 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> +// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include "file/FResultSet.hxx" @@ -44,7 +44,7 @@ namespace connectivity namespace file { - class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OPreparedStatement : public OStatement_BASE2, + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OPreparedStatement : public OStatement_BASE2, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XParameters, public ::com::sun::star::sdbc::XResultSetMetaDataSupplier, @@ -55,12 +55,12 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::rtl::OUString m_aSql; - OValueRefRow m_aParameterRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - - OResultSet* m_pResultSet; - ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns + ::rtl::OUString m_aSql; + OValueRefRow m_aParameterRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + + OResultSet* m_pResultSet; + ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns // factory method for resultset's virtual OResultSet* createResultSet(); @@ -69,7 +69,7 @@ namespace connectivity void checkAndResizeParameters(sal_Int32 parameterIndex); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); - UINT32 AddParameter(connectivity::OSQLParseNode * pParameter, + UINT32 AddParameter(connectivity::OSQLParseNode * pParameter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); @@ -83,7 +83,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: OPreparedStatement( OConnection* _pConnection); - + virtual void construct(const ::rtl::OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 2701985ca4d3..3e82fa6e5f58 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ namespace connectivity namespace file { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -73,79 +73,79 @@ namespace connectivity ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE; class OOO_DLLPUBLIC_FILE OResultSet : - public comphelper::OBaseMutex, - public ::connectivity::IResultSetHelper, - public OResultSet_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + public comphelper::OBaseMutex, + public ::connectivity::IResultSetHelper, + public OResultSet_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - ::std::vector<void*> m_aBindVector; - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector<void*> m_aBindVector; + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; + ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; - OValueRefRow m_aSelectRow; - OValueRefRow m_aRow; - OValueRefRow m_aEvaluateRow; // contains all values of a row - OValueRefRow m_aParameterRow; - OValueRefRow m_aInsertRow; // needed for insert by cursor - ORefAssignValues m_aAssignValues; // needed for insert,update and parameters + OValueRefRow m_aSelectRow; + OValueRefRow m_aRow; + OValueRefRow m_aEvaluateRow; // contains all values of a row + OValueRefRow m_aParameterRow; + OValueRefRow m_aInsertRow; // needed for insert by cursor + ORefAssignValues m_aAssignValues; // needed for insert,update and parameters // to compare with the restrictions - TIntVector* m_pEvaluationKeySet; - TIntVector::iterator m_aEvaluateIter; + TIntVector* m_pEvaluationKeySet; + TIntVector::iterator m_aEvaluateIter; -// TInt2IntMap m_aBookmarks; // map from bookmarks to logical position -// ::std::vector<TInt2IntMap::iterator> m_aBookmarksPositions;// vector of iterators to bookmark map, the order is the logical position - OSkipDeletedSet m_aSkipDeletedSet; +// TInt2IntMap m_aBookmarks; // map from bookmarks to logical position +// ::std::vector<TInt2IntMap::iterator> m_aBookmarksPositions;// vector of iterators to bookmark map, the order is the logical position + OSkipDeletedSet m_aSkipDeletedSet; - ::rtl::Reference<OKeySet> m_pFileSet; - OKeySet::Vector::iterator m_aFileSetIter; + ::rtl::Reference<OKeySet> m_pFileSet; + OKeySet::Vector::iterator m_aFileSetIter; - OSortIndex* m_pSortIndex; - ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns - ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; - OFileTable* m_pTable; - connectivity::OSQLParseNode* m_pParseTree; + OSortIndex* m_pSortIndex; + ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns + ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; + OFileTable* m_pTable; + connectivity::OSQLParseNode* m_pParseTree; - OSQLAnalyzer* m_pSQLAnalyzer; - connectivity::OSQLParseTreeIterator& m_aSQLIterator; + OSQLAnalyzer* m_pSQLAnalyzer; + connectivity::OSQLParseTreeIterator& m_aSQLIterator; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns - ::rtl::OUString m_aTableRange; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nFilePos; - sal_Int32 m_nLastVisitedPos; - sal_Int32 m_nRowCountResult; - sal_Int32 m_nCurrentPosition; // current position of the resultset is returned when ask for getRow() - sal_Int32 m_nColumnCount; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bLastRecord; - sal_Bool m_bInserted; // true when moveToInsertRow was called + ::rtl::OUString m_aTableRange; + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nFilePos; + sal_Int32 m_nLastVisitedPos; + sal_Int32 m_nRowCountResult; + sal_Int32 m_nCurrentPosition; // current position of the resultset is returned when ask for getRow() + sal_Int32 m_nColumnCount; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; // after last record + sal_Bool m_bLastRecord; + sal_Bool m_bInserted; // true when moveToInsertRow was called // set to false when cursor moved or cancel - sal_Bool m_bRowUpdated; - sal_Bool m_bRowInserted; - sal_Bool m_bRowDeleted; - sal_Bool m_bShowDeleted; - sal_Bool m_bIsCount; + sal_Bool m_bRowUpdated; + sal_Bool m_bRowInserted; + sal_Bool m_bRowDeleted; + sal_Bool m_bShowDeleted; + sal_Bool m_bIsCount; void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount); void construct(); @@ -184,7 +184,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { @@ -284,27 +284,27 @@ namespace connectivity virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // special methods - inline sal_Int32 mapColumn(sal_Int32 column); + inline sal_Int32 mapColumn(sal_Int32 column); virtual BOOL OpenImpl(); virtual void doTableSpecials(const OSQLTable& _xTable); inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; } - inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } - inline void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } - inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } - inline void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } - inline void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } - inline void setSelectRow(const OValueRefRow& _rRow) - { - m_aSelectRow = _rRow; + inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } + inline void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } + inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } + inline void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } + inline void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } + inline void setSelectRow(const OValueRefRow& _rRow) + { + m_aSelectRow = _rRow; m_nColumnCount = m_aSelectRow->get().size(); } - inline void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } - inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } + inline void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } + inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } - inline void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } + inline void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } inline void setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } - inline void setEvaluationKeySet(TIntVector* _pEvaluationKeySet) { m_pEvaluationKeySet = _pEvaluationKeySet; } + inline void setEvaluationKeySet(TIntVector* _pEvaluationKeySet) { m_pEvaluationKeySet = _pEvaluationKeySet; } inline void setMetaData(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} // clears the resultset so it can be reused by a preparedstatement @@ -326,7 +326,7 @@ namespace connectivity // ------------------------------------------------------------------------- inline sal_Int32 OResultSet::mapColumn(sal_Int32 column) { - sal_Int32 map = column; + sal_Int32 map = column; OSL_ENSURE(column > 0, "file::OResultSet::mapColumn: invalid column index!"); // the first column (index 0) is for convenience only. The first real select column is no 1. diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index e4824f5044e3..35dfde40124c 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,18 +46,18 @@ namespace connectivity typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OOO_DLLPUBLIC_FILE OResultSetMetaData : - public OResultSetMetaData_BASE + public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; - ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; - OFileTable* m_pTable; + ::rtl::OUString m_aTableName; + ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; + OFileTable* m_pTable; void checkColumnIndex(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~OResultSetMetaData(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable); + OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable); /// Avoid ambigous cast error from the compiler. inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index b1b5b3bdf465..bee5efef1953 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,49 +68,49 @@ namespace connectivity //************ Class: java.sql.Statement //************************************************************** class OOO_DLLPUBLIC_FILE OStatement_Base : - public comphelper::OBaseMutex, - public OStatement_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> + public comphelper::OBaseMutex, + public OStatement_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> { protected: - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index + ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; ::com::sun::star::sdbc::SQLWarning m_aLastWarning; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns // for this Statement + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns // for this Statement - connectivity::OSQLParser m_aParser; - connectivity::OSQLParseTreeIterator m_aSQLIterator; + connectivity::OSQLParser m_aParser; + connectivity::OSQLParseTreeIterator m_aSQLIterator; - OConnection* m_pConnection;// The owning Connection object - connectivity::OSQLParseNode* m_pParseTree; - OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset + OConnection* m_pConnection;// The owning Connection object + connectivity::OSQLParseNode* m_pParseTree; + OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset - ::std::vector<sal_Int32>* m_pEvaluationKeySet; + ::std::vector<sal_Int32>* m_pEvaluationKeySet; - OFileTable* m_pTable; // the current table - OValueRefRow m_aSelectRow; - OValueRefRow m_aRow; - OValueRefRow m_aEvaluateRow; // contains all values of a row - ORefAssignValues m_aAssignValues; // needed for insert,update and parameters + OFileTable* m_pTable; // the current table + OValueRefRow m_aSelectRow; + OValueRefRow m_aRow; + OValueRefRow m_aEvaluateRow; // contains all values of a row + ORefAssignValues m_aAssignValues; // needed for insert,update and parameters // to compare with the restrictions - ::rtl::OUString m_aCursorName; - sal_Int32 m_nMaxFieldSize; - sal_Int32 m_nMaxRows; - sal_Int32 m_nQueryTimeOut; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_aCursorName; + sal_Int32 m_nMaxFieldSize; + sal_Int32 m_nMaxRows; + sal_Int32 m_nQueryTimeOut; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; + sal_Bool m_bEscapeProcessing; ::cppu::OBroadcastHelper& rBHelper; @@ -137,7 +137,7 @@ namespace connectivity const String& aValue, BOOL bSetNull = FALSE, UINT32 nParameter=SQL_NO_PARAMETER); - void ParseAssignValues( const ::std::vector< String>& aColumnNameList, + void ParseAssignValues( const ::std::vector< String>& aColumnNameList, connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex); virtual void parseParamterElem(const String& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem); diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx index 6b3a6bc88c3e..8821d29aee22 100644 --- a/connectivity/source/inc/file/FStringFunctions.hxx +++ b/connectivity/source/inc/file/FStringFunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index 687f96bb60bf..d9a9d395ccce 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,16 +44,16 @@ namespace connectivity { typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - class OOO_DLLPUBLIC_FILE OFileTable : public OTable_TYPEDEF + class OOO_DLLPUBLIC_FILE OFileTable : public OTable_TYPEDEF { protected: - OConnection* m_pConnection; - SvStream* m_pFileStream; - ::rtl::Reference<OSQLColumns> m_aColumns; - sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement - sal_uInt8* m_pBuffer; - sal_uInt16 m_nBufferSize; // Groesse des ReadBuffer, wenn pBuffer != NULL - sal_Bool m_bWriteable; // svstream cann't say if we are writeable + OConnection* m_pConnection; + SvStream* m_pFileStream; + ::rtl::Reference<OSQLColumns> m_aColumns; + sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement + sal_uInt8* m_pBuffer; + sal_uInt16 m_nBufferSize; // Groesse des ReadBuffer, wenn pBuffer != NULL + sal_Bool m_bWriteable; // svstream cann't say if we are writeable // so we have to virtual void FileClose(); @@ -64,7 +64,7 @@ namespace connectivity virtual void refreshIndexes(); public: OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection); - OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, + OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description = ::rtl::OUString(), @@ -91,7 +91,7 @@ namespace connectivity virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor); virtual void dropColumn(sal_Int32 _nPos); - // refresh the header of file based tables to see changes done by someone + // refresh the header of file based tables to see changes done by someone virtual void refreshHeader(); ::rtl::OUString SAL_CALL getName() throw() { return m_Name; } @@ -103,7 +103,7 @@ namespace connectivity virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - + sal_Int32 getFilePos() const { return m_nFilePos; } public: diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index e85fd51102bd..f2aa5c9f4851 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace connectivity public sdbcx::OCollection { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 60eb3bfae559..c6f45df02353 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,16 +39,16 @@ namespace connectivity class OConnection; class OOO_DLLPUBLIC_FILE OSQLAnalyzer { - typedef ::std::list<OEvaluateSet*> OEvaluateSetList; + typedef ::std::list<OEvaluateSet*> OEvaluateSetList; typedef ::std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates; - ::std::vector< TPredicates > m_aSelectionEvaluations; - ::rtl::Reference<OPredicateCompiler> m_aCompiler; - ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; + ::std::vector< TPredicates > m_aSelectionEvaluations; + ::rtl::Reference<OPredicateCompiler> m_aCompiler; + ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; OConnection* m_pConnection; - mutable sal_Bool m_bHasSelectionCode; - mutable sal_Bool m_bSelectionFirstTime; + mutable sal_Bool m_bHasSelectionCode; + mutable sal_Bool m_bSelectionFirstTime; void bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvaluateSetList& _rEvaluateSetList); @@ -59,21 +59,21 @@ namespace connectivity { return ::rtl_allocateMemory( nSize ); } inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW( () ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) { ::rtl_freeMemory( pMem ); } inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW( () ) { } OConnection* getConnection() const { return m_pConnection; } void describeParam(::rtl::Reference<OSQLColumns> rParameterColumns); // genauere Beschreibung der Parameter - ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Anbinden einer Ergebniszeile an die Restrictions + ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Anbinden einer Ergebniszeile an die Restrictions /** bind the select columns if they contain a function which needs a row value - @param _pRow the result row + @param _pRow the result row */ void bindSelectRow(const OValueRefRow& _pRow); /** binds the row to parameter for the restrictions - @param _pRow the parameter row + @param _pRow the parameter row */ void bindParameterRow(OValueRefRow& _pRow); @@ -84,7 +84,7 @@ namespace connectivity void clean(); virtual BOOL hasRestriction() const; virtual BOOL hasFunctions() const; - inline BOOL evaluateRestriction() { return m_aInterpreter->start(); } + inline BOOL evaluateRestriction() { return m_aInterpreter->start(); } void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const OFileColumns& rCols); virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index ce489a34832d..f52c95690ef5 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,16 +90,16 @@ namespace connectivity virtual sal_Int32 getDBType() const {return m_eDBType;} virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); - inline sal_Bool isValid() const; + inline sal_Bool isValid() const; TYPEINFO(); }; class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand { - sal_uInt16 m_nRowPos; + sal_uInt16 m_nRowPos; protected: - OValueRefRow m_pRow; + OValueRefRow m_pRow; OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType); public: @@ -352,7 +352,7 @@ namespace connectivity virtual double operate(const double& fLeft,const double& fRight) const; }; - inline sal_Bool OOperand::isValid() const + inline sal_Bool OOperand::isValid() const { return getValue().getDouble() != double(0.0); } diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 95bdd48eda56..be00efaac15d 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,12 +49,12 @@ namespace connectivity friend class OPredicateInterpreter; friend class OSQLAnalyzer; - OCodeList m_aCodeList; - OFileColumns m_orgColumns; // in filecurs this are the filecolumns - OSQLAnalyzer* m_pAnalyzer; + OCodeList m_aCodeList; + OFileColumns m_orgColumns; // in filecurs this are the filecolumns + OSQLAnalyzer* m_pAnalyzer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xIndexes; - sal_Int32 m_nParamCounter; - sal_Bool m_bORCondition; + sal_Int32 m_nParamCounter; + sal_Bool m_bORCondition; public: OPredicateCompiler(OSQLAnalyzer* pAnalyzer); @@ -77,7 +77,7 @@ namespace connectivity sal_Bool isClean() const {return m_aCodeList.empty();} sal_Bool hasCode() const {return !isClean();} sal_Bool hasORCondition() const {return m_bORCondition;} - void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } + void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } const OFileColumns getOrigColumns() const { return m_orgColumns; } protected: OOperand* execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -93,27 +93,27 @@ namespace connectivity class OPredicateInterpreter : public ::salhelper::SimpleReferenceObject { - OCodeStack m_aStack; + OCodeStack m_aStack; ::rtl::Reference<OPredicateCompiler> m_rCompiler; public: OPredicateInterpreter(const ::rtl::Reference<OPredicateCompiler>& rComp) : m_rCompiler(rComp){} virtual ~OPredicateInterpreter(); - sal_Bool evaluate(OCodeList& rCodeList); - void evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal); + sal_Bool evaluate(OCodeList& rCodeList); + void evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal); - inline sal_Bool start() - { + inline sal_Bool start() + { return evaluate(m_rCompiler->m_aCodeList); } - inline void startSelection(ORowSetValueDecoratorRef& _rVal) - { + inline void startSelection(ORowSetValueDecoratorRef& _rVal) + { return evaluateSelection(m_rCompiler->m_aCodeList,_rVal); } - + }; } } diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx index ac826dc1040e..5c8e3d878e80 100644 --- a/connectivity/source/inc/file/filedllapi.hxx +++ b/connectivity/source/inc/file/filedllapi.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx index cd4ace069420..4bcf6e5a0f0f 100644 --- a/connectivity/source/inc/file/quotedstring.hxx +++ b/connectivity/source/inc/file/quotedstring.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ namespace connectivity QuotedTokenizedString() {} QuotedTokenizedString(const String& _sString) : m_sString(_sString){} - xub_StrLen GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const; - void GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0' ) const; + xub_StrLen GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const; + void GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0' ) const; inline String& GetString() { return m_sString; } inline xub_StrLen Len() const { return m_sString.Len(); } inline operator String&() { return m_sString; } diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx index 18bf218e2c28..600b7930470e 100644 --- a/connectivity/source/inc/flat/ECatalog.hxx +++ b/connectivity/source/inc/flat/ECatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx index 63adc8fffbb4..93f219734992 100644 --- a/connectivity/source/inc/flat/EColumns.hxx +++ b/connectivity/source/inc/flat/EColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx index 423e625f3cfd..e70da8152081 100644 --- a/connectivity/source/inc/flat/EConnection.hxx +++ b/connectivity/source/inc/flat/EConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,23 +39,23 @@ namespace connectivity class OFlatConnection : public file::OConnection { private: - sal_Bool m_bHeaderLine; // column names in first row - sal_Unicode m_cFieldDelimiter; // look at the name - sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter - sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint) - sal_Unicode m_cThousandDelimiter; // + sal_Bool m_bHeaderLine; // column names in first row + sal_Unicode m_cFieldDelimiter; // look at the name + sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter + sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint) + sal_Unicode m_cThousandDelimiter; // public: - OFlatConnection(ODriver* _pDriver); + OFlatConnection(ODriver* _pDriver); virtual ~OFlatConnection(); virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); // own methods - inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } - inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } - inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } - inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } - inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} + inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } + inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } + inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } + inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } + inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx index 14400139acf3..c4d0bce60a5e 100644 --- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx +++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class OFlatDatabaseMetaData : public file::ODatabaseMetaData + class OFlatDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); protected: diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index 617b4fe47c21..794b4c5da139 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace connectivity // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx index 16ab510838f2..4304be59f6e9 100644 --- a/connectivity/source/inc/flat/EPreparedStatement.hxx +++ b/connectivity/source/inc/flat/EPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx index 9bafb5d9ecd0..1d0e2eab1af8 100644 --- a/connectivity/source/inc/flat/EResultSet.hxx +++ b/connectivity/source/inc/flat/EResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,11 @@ namespace connectivity class OFlatResultSet; // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XRowLocate> OFlatResultSet_BASE; - typedef file::OResultSet OFlatResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<OFlatResultSet> OFlatResultSet_BASE3; + typedef file::OResultSet OFlatResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<OFlatResultSet> OFlatResultSet_BASE3; - class OFlatResultSet : public OFlatResultSet_BASE2, + class OFlatResultSet : public OFlatResultSet_BASE2, public OFlatResultSet_BASE, public OFlatResultSet_BASE3 { @@ -57,7 +57,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - OFlatResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OFlatResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx index c38a7874a101..018b204aae45 100644 --- a/connectivity/source/inc/flat/EStatement.hxx +++ b/connectivity/source/inc/flat/EStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 24b6ba412b59..9702070c2387 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,25 +46,25 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; typedef ::std::map<sal_Int32, sal_Int32> TRowPositionsInFile; - class OFlatTable : public OFlatTable_BASE + class OFlatTable : public OFlatTable_BASE { // maps a row postion to a file position TRowPositionsInFile m_aFilePosToEndLinePos; - ::std::map<sal_Int32, TRowPositionsInFile::iterator> + ::std::map<sal_Int32, TRowPositionsInFile::iterator> m_aRowPosToFilePos; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + ::std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xNumberFormatter; ::com::sun::star::util::Date m_aNullDate; - sal_Int32 m_nStartRowFilePos; - sal_Int32 m_nRowPos; - sal_Int32 m_nMaxRowCount; // will be set if stream is once eof - sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter - sal_Unicode m_cFieldDelimiter; // look at the name + sal_Int32 m_nStartRowFilePos; + sal_Int32 m_nRowPos; + sal_Int32 m_nMaxRowCount; // will be set if stream is once eof + sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter + sal_Unicode m_cFieldDelimiter; // look at the name bool m_bNeedToReadLine; - private: + private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo); sal_Bool readLine(sal_Int32& _rnCurrentPos); @@ -72,7 +72,7 @@ namespace connectivity virtual void refreshColumns(); public: - // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); + // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); OFlatTable( sdbcx::OCollection* _pTables,OFlatConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx index 818dbc8b38e4..75db907662ef 100644 --- a/connectivity/source/inc/flat/ETables.hxx +++ b/connectivity/source/inc/flat/ETables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index f46e19c022fd..71282008b668 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; /** calls XDatabaseMetaData::getTables. - @param _sKindOfObject + @param _sKindOfObject The type of tables to be fetched. - @param _rNames + @param _rNames The container for the names to be filled. */ void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames); @@ -52,15 +52,15 @@ namespace connectivity public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OHCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() const { return m_xConnection; } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index 5078e3566bfe..637ea8f2c263 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); public: - OHSQLColumns( ::cppu::OWeakObject& _rParent + OHSQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -51,7 +51,7 @@ namespace connectivity typedef sdbcx::OColumn OHSQLColumn_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OHSQLColumn> OHSQLColumn_PROP; - class OHSQLColumn : public OHSQLColumn_BASE, + class OHSQLColumn : public OHSQLColumn_BASE, public OHSQLColumn_PROP { ::rtl::OUString m_sAutoIncrement; diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index ec954c102e9f..50e825c097ea 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xORB ); - + // XServiceInfo DECLARE_SERVICE_INFO(); DECLARE_XTYPEPROVIDER() diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 2ef4164899c7..b75c92c46481 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,31 +50,31 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XDriver + typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XDriver ,::com::sun::star::sdbcx::XDataDefinitionSupplier , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdbcx::XCreateCatalog , ::com::sun::star::embed::XTransactionListener - > ODriverDelegator_BASE; + > ODriverDelegator_BASE; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,::com::sun::star::uno::WeakReferenceHelper> TWeakRefPair; typedef ::std::pair< ::rtl::OUString ,TWeakRefPair > TWeakConnectionPair; - + typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; - + /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. - + */ class ODriverDelegator : public ::comphelper::OBaseMutex ,public ODriverDelegator_BASE { - TWeakPairVector m_aConnections; // vector containing a list + TWeakPairVector m_aConnections; // vector containing a list // of all the Connection objects // for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; sal_Bool m_bInShutDownConnections; /** load the driver we want to delegate. @@ -139,7 +139,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_HSQLDB_DRIVER_HXX diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx index 079d8c7d0ec7..b543e09d5c84 100644 --- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx +++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index 5f94b03617da..ee27fff089e1 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,17 +45,17 @@ namespace connectivity { class StreamHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream> m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> m_xSeek; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> m_xOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> m_xInputStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream> m_xStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> m_xSeek; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> m_xOutputStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> m_xInputStream; public: StreamHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream>& _xStream); ~StreamHelper(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> getOutputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> getSeek(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> getOutputStream(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> getSeek(); }; @@ -83,10 +83,10 @@ namespace connectivity static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env); }; //........................................................................ - } // namespace hsqldb + } // namespace hsqldb //........................................................................ //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index ef11cc13a4df..a59f5b9b3179 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,33 +41,33 @@ namespace connectivity ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OHSQLTable; - typedef ::comphelper::OIdPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; - class OHSQLTable : public OTableHelper + typedef ::comphelper::OIdPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; + class OHSQLTable : public OTableHelper ,public OHSQLTable_PROP { sal_Int32 m_nPrivileges; // we have to set our privileges by our own /** executes the statmenmt. - @param _rStatement + @param _rStatement The statement to execute. */ void executeStatement(const ::rtl::OUString& _rStatement ); protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames); @@ -79,15 +79,15 @@ namespace connectivity <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + public: - OHSQLTable( sdbcx::OCollection* _pTables, + OHSQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OHSQLTable( sdbcx::OCollection* _pTables, + OHSQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, @@ -108,7 +108,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XAlterTable virtual void SAL_CALL alterColumnByName( const ::rtl::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); - + // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index 377868453b6e..baec75504281 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity class OTables : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - + protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx index aff601e33bd8..2c1b8f4d5f9d 100644 --- a/connectivity/source/inc/hsqldb/HTools.hxx +++ b/connectivity/source/inc/hsqldb/HTools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx index f5df521ade33..d5201c63e87f 100644 --- a/connectivity/source/inc/hsqldb/HUser.hxx +++ b/connectivity/source/inc/hsqldb/HUser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx index 0626c92e903c..10bfa31eb2bb 100644 --- a/connectivity/source/inc/hsqldb/HUsers.hxx +++ b/connectivity/source/inc/hsqldb/HUsers.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity class OUsers : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - connectivity::sdbcx::IRefreshableUsers* m_pParent; + connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 495c63e437cd..51117c991411 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,10 +77,10 @@ namespace connectivity { namespace hsqldb /** retrieves the current command of the View @throws ::com::sun::star::lang::WrappedTargetException - if an error occurs while retrieving the command from the database and + if an error occurs while retrieving the command from the database and <arg>_bAllowSQLExceptin</arg> is <FALSE/> @throws ::com::sun::star::sdbc::SQLException - if an error occurs while retrieving the command from the database and + if an error occurs while retrieving the command from the database and <arg>_bAllowSQLException</arg> is <TRUE/> */ ::rtl::OUString impl_getCommand_throw( bool _bAllowSQLException ) const; diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index a8d9b83c7b17..ee2f61e6ab2d 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx index 08a29151623d..3009dc5992d4 100644 --- a/connectivity/source/inc/internalnode.hxx +++ b/connectivity/source/inc/internalnode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity /** special node for avoiding memory leaks */ class OSQLInternalNode : public OSQLParseNode - { + { public: OSQLInternalNode(const sal_Char* pNewValue, SQLNodeType eNodeType, @@ -58,6 +58,6 @@ namespace connectivity }; } -#endif //_CONNECTIVITY_SQLINTERNALNODE_HXX +#endif //_CONNECTIVITY_SQLINTERNALNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index fc6661c27eaa..f1f49f0af8f6 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace connectivity { namespace jdbc //==================================================================== //= ContextClassLoaderScope //==================================================================== - /** + /** */ class ContextClassLoaderScope { @@ -65,7 +65,7 @@ namespace connectivity { namespace jdbc @param _rxErrorContext the context which should be passed to java_lang_object::ThrowLoggedSQLException in case an error occurs - + */ ContextClassLoaderScope( JNIEnv& environment, diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 4aeacbe7b62d..b6db5de5160d 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index fb4cb6588635..6f499ced88f7 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx index 20837abf136d..5fdb5a5abbd6 100644 --- a/connectivity/source/inc/java/io/InputStream.hxx +++ b/connectivity/source/inc/java/io/InputStream.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace connectivity { - + //************************************************************** //************ Class: java.io.InputStream //************************************************************** @@ -46,7 +46,7 @@ namespace connectivity static jclass theClass; virtual ~java_io_InputStream(); public: - virtual jclass getMyClass() const; + virtual jclass getMyClass() const; // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_io_InputStream( JNIEnv * pEnv, jobject myObj ); // XInputStream diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx index 0e0a3e3e8f59..74235ff5d328 100644 --- a/connectivity/source/inc/java/io/Reader.hxx +++ b/connectivity/source/inc/java/io/Reader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ namespace connectivity virtual ~java_io_Reader(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_io_Reader( JNIEnv * pEnv, jobject myObj ); // XInputStream diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx index 68b6d9adfe0f..4c036bdf1869 100644 --- a/connectivity/source/inc/java/lang/Boolean.hxx +++ b/connectivity/source/inc/java/lang/Boolean.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ -#define _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ +#define _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ #include "java/lang/Object.hxx" //************************************************************** diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx index 69af774a380d..b0ce9983149d 100644 --- a/connectivity/source/inc/java/lang/Class.hxx +++ b/connectivity/source/inc/java/lang/Class.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ -#define _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ +#define _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ //************************************************************** //************ Class: java.lang.Class //************************************************************** @@ -48,7 +48,7 @@ namespace connectivity static java_lang_Class * forName( const ::rtl::OUString &_par0 ); // return the jre object jobject newInstanceObject(); - + }; } diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx index 5e4111a54c6e..2eb76b5aef0c 100644 --- a/connectivity/source/inc/java/lang/Exception.hxx +++ b/connectivity/source/inc/java/lang/Exception.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 481f458bc1a6..b017163de77a 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ -#define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ +#define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ #if STLPORT_VERSION>=321 // jni.h needs cstdarg for std::va_list @@ -68,8 +68,8 @@ namespace connectivity public: SDBThreadAttach(); ~SDBThreadAttach(); - - JNIEnv* pEnv; + + JNIEnv* pEnv; static void addRef(); static void releaseRef(); @@ -100,7 +100,7 @@ namespace connectivity // Klassendefinition // neu in SJ2: - static jclass theClass; // die Klasse braucht nur einmal angefordert werden ! + static jclass theClass; // die Klasse braucht nur einmal angefordert werden ! virtual jclass getMyClass() const; @@ -113,9 +113,9 @@ namespace connectivity virtual ~java_lang_Object(); - void saveRef( JNIEnv * pEnv, jobject myObj ); - jobject getJavaObject() const { return object; } - java_lang_Object * GetWrapper() { return this; } + void saveRef( JNIEnv * pEnv, jobject myObj ); + jobject getJavaObject() const { return object; } + java_lang_Object * GetWrapper() { return this; } void clearObject(JNIEnv& rEnv); void clearObject(); @@ -149,7 +149,7 @@ namespace connectivity jobject callObjectMethod( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID ) const; jobject callObjectMethodWithIntArg( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const; - template< typename T > + template< typename T > T callMethodWithIntArg(T (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) ,const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const { SDBThreadAttach t; @@ -159,7 +159,7 @@ namespace connectivity return out; } - template< typename T > + template< typename T > void callVoidMethod(const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID,sal_Int32 _nArgument, const T& _aValue) const { SDBThreadAttach t; @@ -168,7 +168,7 @@ namespace connectivity ThrowSQLException( t.pEnv, NULL ); } - + }; } #endif //_CONNECTIVITY_JAVA_LANG_OBJJECT_HXX_ diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx index 273109fd67f0..f39664e77bc0 100644 --- a/connectivity/source/inc/java/lang/String.hxx +++ b/connectivity/source/inc/java/lang/String.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_STRING_HXX_ -#define _CONNECTIVITY_JAVA_LANG_STRING_HXX_ +#define _CONNECTIVITY_JAVA_LANG_STRING_HXX_ #include "java/lang/Object.hxx" diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx index 09b047ddf1ba..9915adbea720 100644 --- a/connectivity/source/inc/java/lang/Throwable.hxx +++ b/connectivity/source/inc/java/lang/Throwable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx index 86cd9d57f9bd..39f02eca4115 100644 --- a/connectivity/source/inc/java/math/BigDecimal.hxx +++ b/connectivity/source/inc/java/math/BigDecimal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ -#define _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ +#define _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ #include "java/lang/Object.hxx" //************************************************************** diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index ecfd94799513..b3e6d4ffa078 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_ARRAY_HXX_ -#define _CONNECTIVITY_JAVA_SQL_ARRAY_HXX_ +#define _CONNECTIVITY_JAVA_SQL_ARRAY_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XArray.hpp> @@ -38,7 +38,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** - class java_sql_Array : public java_lang_Object, + class java_sql_Array : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XArray> { protected: diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx index da44418533c1..754b38b09eef 100644 --- a/connectivity/source/inc/java/sql/Blob.hxx +++ b/connectivity/source/inc/java/sql/Blob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_BLOB_HXX_ -#define _CONNECTIVITY_JAVA_SQL_BLOB_HXX_ +#define _CONNECTIVITY_JAVA_SQL_BLOB_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XBlob.hpp> @@ -39,7 +39,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** - class java_sql_Blob : public java_lang_Object, + class java_sql_Blob : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob> { protected: @@ -48,7 +48,7 @@ namespace connectivity virtual ~java_sql_Blob(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_Blob( JNIEnv * pEnv, jobject myObj ); diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx index 1269af2543bf..00fd44c6fbed 100644 --- a/connectivity/source/inc/java/sql/CallableStatement.hxx +++ b/connectivity/source/inc/java/sql/CallableStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity //************ Class: java.sql.CallableStatement //************************************************************** - class java_sql_CallableStatement : public java_sql_PreparedStatement, + class java_sql_CallableStatement : public java_sql_PreparedStatement, public ::com::sun::star::sdbc::XRow, public ::com::sun::star::sdbc::XOutParameters { @@ -52,7 +52,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const ::rtl::OUString& sql ); diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index 1b861eeebed7..01265210c30d 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_CLOB_HXX_ -#define _CONNECTIVITY_JAVA_SQL_CLOB_HXX_ +#define _CONNECTIVITY_JAVA_SQL_CLOB_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XClob.hpp> @@ -39,7 +39,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** - class java_sql_Clob : public java_lang_Object, + class java_sql_Clob : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob> { protected: diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index 899e89b86afc..211e950a883b 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace connectivity { class java_sql_Driver; - typedef OMetaConnection java_sql_Connection_BASE; + typedef OMetaConnection java_sql_Connection_BASE; class java_sql_Connection : public java_sql_Connection_BASE, public java_lang_Object, @@ -52,22 +52,22 @@ namespace connectivity public OAutoRetrievingBase { friend class OSubComponent<java_sql_Connection, java_sql_Connection_BASE>; - const java_sql_Driver* m_pDriver; - jobject m_pDriverobject; + const java_sql_Driver* m_pDriver; + jobject m_pDriverobject; jdbc::GlobalRef< jobject > m_pDriverClassLoader; - jclass m_Driver_theClass; + jclass m_Driver_theClass; java::sql::ConnectionLog m_aLogger; - sal_Bool m_bParameterSubstitution; - sal_Bool m_bIgnoreDriverPrivileges; - sal_Bool m_bIgnoreCurrency; + sal_Bool m_bParameterSubstitution; + sal_Bool m_bIgnoreDriverPrivileges; + sal_Bool m_bIgnoreCurrency; ::com::sun::star::uno::Any m_aCatalogRestriction; ::com::sun::star::uno::Any m_aSchemaRestriction; /** transform named parameter into unnamed one. - @param _sSQL + @param _sSQL The SQL statement to transform. @return The new statement witgh unnamed parameters. @@ -92,18 +92,18 @@ namespace connectivity public: virtual jclass getMyClass() const; - + DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_Connection( const java_sql_Driver& _rDriver ); - sal_Bool construct( const ::rtl::OUString& url, + sal_Bool construct( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getConnectionInfo() const { return m_aConnectionInfo; } - inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} - inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } + inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} + inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } inline const ::com::sun::star::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; } inline const ::com::sun::star::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; } diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index 4985aa244eb6..74bddcd5b9e7 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx index 04e85349440e..e0bd590cc1b7 100644 --- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx +++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 4e4b9e8ab7e3..508429c301c0 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx index 3b54087b7e9e..0e6955aa71a3 100644 --- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx +++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ -#define _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ +#define _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/DriverPropertyInfo.hpp> @@ -53,7 +53,7 @@ namespace connectivity ::rtl::OUString name(); ::rtl::OUString description(); ::rtl::OUString value(); - sal_Bool required(); + sal_Bool required(); ::com::sun::star::uno::Sequence< ::rtl::OUString> choices(); }; } diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index f621f9ce2869..39f232c8d5ba 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,17 +62,17 @@ namespace connectivity //************ Class: java.sql.Statement //************************************************************** class java_sql_Statement_Base : public comphelper::OBaseMutex, - public java_sql_Statement_BASE, - public java_lang_Object, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<java_sql_Statement_Base> + public java_sql_Statement_BASE, + public java_lang_Object, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<java_sql_Statement_Base> { sal_Int32 getQueryTimeOut() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getMaxFieldSize() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getMaxRows() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetConcurrency() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetConcurrency() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetType() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -89,13 +89,13 @@ namespace connectivity void setEscapeProcessing(sal_Bool _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; - java_sql_Connection* m_pConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; + java_sql_Connection* m_pConnection; java::sql::ConnectionLog m_aLogger; - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; // Properties - sal_Int32 m_nResultSetConcurrency; - sal_Int32 m_nResultSetType; + sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nResultSetType; sal_Bool m_bEscapeProcessing; ::cppu::OBroadcastHelper& rBHelper; @@ -174,7 +174,7 @@ namespace connectivity using ::cppu::OPropertySetHelper::getFastPropertyValue; }; - class OStatement_BASE2 :public java_sql_Statement_Base + class OStatement_BASE2 :public java_sql_Statement_Base ,public OSubComponent<OStatement_BASE2, java_sql_Statement_BASE> { @@ -189,7 +189,7 @@ namespace connectivity virtual void SAL_CALL release() throw(); }; - class java_sql_Statement : public OStatement_BASE2, + class java_sql_Statement : public OStatement_BASE2, public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo { diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 6042c3cbf7f8..0e3932cfc22d 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "java/sql/JStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> +// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -42,7 +42,7 @@ namespace connectivity //************ Class: java.sql.PreparedStatement //************************************************************** - class java_sql_PreparedStatement : public OStatement_BASE2, + class java_sql_PreparedStatement : public OStatement_BASE2, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XResultSetMetaDataSupplier, public ::com::sun::star::sdbc::XParameters, @@ -58,7 +58,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql ); diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index f7410d46e2c8..d4479be3bb35 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_REF_HXX_ -#define _CONNECTIVITY_JAVA_SQL_REF_HXX_ +#define _CONNECTIVITY_JAVA_SQL_REF_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XRef.hpp> @@ -38,7 +38,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.Ref //************************************************************** - class java_sql_Ref : public java_lang_Object, + class java_sql_Ref : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef> { protected: @@ -47,7 +47,7 @@ namespace connectivity virtual ~java_sql_Ref(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_Ref( JNIEnv * pEnv, jobject myObj ); diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 272661bdf30d..5764fec3cff2 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace connectivity { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper10< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -63,22 +63,22 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE; class java_sql_Connection; - class java_sql_ResultSet : public comphelper::OBaseMutex, - public java_sql_ResultSet_BASE, - public java_lang_Object, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet> + class java_sql_ResultSet : public comphelper::OBaseMutex, + public java_sql_ResultSet_BASE, + public java_lang_Object, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet> { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; java::sql::ConnectionLog m_aLogger; - java_sql_Connection* m_pConnection; + java_sql_Connection* m_pConnection; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -109,7 +109,7 @@ namespace connectivity virtual ~java_sql_ResultSet(); public: DECLARE_SERVICE_INFO(); - virtual jclass getMyClass() const; + virtual jclass getMyClass() const; // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt = NULL ); diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index e859afee76de..c0f43cbb8d5e 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace connectivity { protected: java::sql::ConnectionLog m_aLogger; - java_sql_Connection* m_pConnection; + java_sql_Connection* m_pConnection; sal_Int32 m_nColumnCount; // statische Daten fuer die Klasse @@ -52,7 +52,7 @@ namespace connectivity virtual ~java_sql_ResultSetMetaData(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ); diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx index 21822162ef5f..6ff404cbef65 100644 --- a/connectivity/source/inc/java/sql/SQLException.hxx +++ b/connectivity/source/inc/java/sql/SQLException.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,12 +33,12 @@ namespace connectivity { - namespace starsdbc = ::com::sun::star::sdbc; + namespace starsdbc = ::com::sun::star::sdbc; //************************************************************** //************ Class: java.sql.SQLException //************************************************************** class java_sql_SQLException_BASE; - class java_sql_SQLException : public starsdbc::SQLException + class java_sql_SQLException : public starsdbc::SQLException { public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: @@ -46,7 +46,7 @@ namespace connectivity java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext); }; - class java_sql_SQLException_BASE : public java_lang_Exception + class java_sql_SQLException_BASE : public java_lang_Exception { protected: // statische Daten fuer die Klasse @@ -56,14 +56,14 @@ namespace connectivity virtual ~java_sql_SQLException_BASE(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_SQLException_BASE( JNIEnv * pEnv, jobject myObj ); - + ::rtl::OUString getSQLState() const; - sal_Int32 getErrorCode() const; + sal_Int32 getErrorCode() const; starsdbc::SQLException getNextException() const; static jclass st_getMyClass(); }; - + } #endif // _CONNECTIVITY_JAVA_SQL_SQLEXCEPTION_HXX_ diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx index c77c0e9f6ee9..8026d0ac5f94 100644 --- a/connectivity/source/inc/java/sql/SQLWarning.hxx +++ b/connectivity/source/inc/java/sql/SQLWarning.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ namespace connectivity { - // namespace starsdbc = ::com::sun::star::sdbc; - // namespace ::com::sun::star::uno = ::com::sun::star::uno; + // namespace starsdbc = ::com::sun::star::sdbc; + // namespace ::com::sun::star::uno = ::com::sun::star::uno; //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** @@ -54,7 +54,7 @@ namespace connectivity class java_sql_SQLWarning : public java_sql_SQLException { public: - java_sql_SQLWarning(const java_sql_SQLWarning_BASE& _rW,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext) + java_sql_SQLWarning(const java_sql_SQLWarning_BASE& _rW,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext) : java_sql_SQLException(_rW,_rContext) {} }; } diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index e849178cfe87..ce3908fb4779 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_ -#define _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_ +#define _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_ #include "java/util/Date.hxx" #include <com/sun/star/util/Time.hpp> diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index 6a0982fa0211..7924edba027e 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,11 +74,11 @@ namespace connectivity jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & _rMap); /** return if a exception occured - @param pEnv + @param pEnv The native java env - @param _bClear + @param _bClear <TRUE/> if the execption should be cleared - @return + @return <TRUE/> if an exception is occured */ sal_Bool isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear); diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx index d7be97f33519..7c8c7a9811dc 100644 --- a/connectivity/source/inc/java/util/Date.hxx +++ b/connectivity/source/inc/java/util/Date.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_UTIL_DATE_HXX_ -#define _CONNECTIVITY_JAVA_UTIL_DATE_HXX_ +#define _CONNECTIVITY_JAVA_UTIL_DATE_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/util/Date.hpp> diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx index b31961b7e46f..b3de8690c5ee 100644 --- a/connectivity/source/inc/java/util/Property.hxx +++ b/connectivity/source/inc/java/util/Property.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx index 42e884619163..e07fce0cd3f2 100644 --- a/connectivity/source/inc/mysql/YCatalog.hxx +++ b/connectivity/source/inc/mysql/YCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; /** calls XDatabaseMetaData::getTables. - @param _sKindOfObject + @param _sKindOfObject The type of tables to be fetched. - @param _rNames + @param _rNames The container for the names to be filled. <OUT/> */ void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames); @@ -53,15 +53,15 @@ namespace connectivity public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OMySQLCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() const { return m_xConnection; } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx index 85c3b3b5eb7b..a9573a35d581 100644 --- a/connectivity/source/inc/mysql/YColumns.hxx +++ b/connectivity/source/inc/mysql/YColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); public: - OMySQLColumns( ::cppu::OWeakObject& _rParent + OMySQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -51,7 +51,7 @@ namespace connectivity typedef sdbcx::OColumn OMySQLColumn_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OMySQLColumn> OMySQLColumn_PROP; - class OMySQLColumn : public OMySQLColumn_BASE, + class OMySQLColumn : public OMySQLColumn_BASE, public OMySQLColumn_PROP { ::rtl::OUString m_sAutoIncrement; diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 770afe34702e..ab523896f688 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,29 +63,29 @@ namespace connectivity D_JDBC, D_NATIVE } T_DRIVERTYPE; - + /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. - + */ class ODriverDelegator : public ::comphelper::OBaseMutex ,public ODriverDelegator_BASE { - TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers - TWeakPairVector m_aConnections; // vector containing a list + TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers + TWeakPairVector m_aConnections; // vector containing a list // of all the Connection objects // for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - ::rtl::OUString m_sOldDriverClass; - T_DRIVERTYPE m_eDriverType; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::rtl::OUString m_sOldDriverClass; + T_DRIVERTYPE m_eDriverType; /** load the driver we want to delegate. The <member>m_xODBCDriver</member> or <member>m_xDBCDriver</member> may be <NULL/> if the driver could not be loaded. - @param url + @param url The URL. - @param info + @param info The property info contains which driver we have to delegate. @return The driver which was currently selected. @@ -121,7 +121,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_MYSQL_DRIVER_HXX diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx index e5b44479ee14..8c718f9b06a9 100644 --- a/connectivity/source/inc/mysql/YTable.hxx +++ b/connectivity/source/inc/mysql/YTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,33 +41,33 @@ namespace connectivity ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OMySQLTable; - typedef ::comphelper::OIdPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; - class OMySQLTable : public OTableHelper + typedef ::comphelper::OIdPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; + class OMySQLTable : public OTableHelper ,public OMySQLTable_PROP { sal_Int32 m_nPrivileges; // we have to set our privileges by our own /** executes the statmenmt. - @param _rStatement + @param _rStatement The statement to execute. */ void executeStatement(const ::rtl::OUString& _rStatement ); protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames); @@ -86,15 +86,15 @@ namespace connectivity <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + public: - OMySQLTable( sdbcx::OCollection* _pTables, + OMySQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OMySQLTable( sdbcx::OCollection* _pTables, + OMySQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 7a3d62afa48f..72d654137cdb 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity public ::dbtools::ISQLStatementHelper { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - + protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx index 145fffc7a815..bdc0ee8b1e05 100644 --- a/connectivity/source/inc/mysql/YUser.hxx +++ b/connectivity/source/inc/mysql/YUser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx index c7d71a897c67..59c5189122f0 100644 --- a/connectivity/source/inc/mysql/YUsers.hxx +++ b/connectivity/source/inc/mysql/YUsers.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity class OUsers : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - connectivity::sdbcx::IRefreshableUsers* m_pParent; + connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index 038acfe5353b..fdd95845eb9f 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; sal_Bool m_bInDrop; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 2310a2e9352b..5817aac1078b 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity OBoundParam() { paramLength = NULL; - binaryData = NULL; + binaryData = NULL; pA1=0; pA2=0; pB1=0; @@ -185,10 +185,10 @@ namespace connectivity // Data attributes //==================================================================== - sal_Int8* binaryData; // Storage area to be used + sal_Int8* binaryData; // Storage area to be used // when binding the parameter - sal_Int8* paramLength; // Storage area to be used + sal_Int8* paramLength; // Storage area to be used // for the bound length of the // parameter. Note that this // data is in native format. @@ -200,12 +200,12 @@ namespace connectivity // input stream is saved // until needed. - sal_Int32 paramInputStreamLen; // Length of input stream + sal_Int32 paramInputStreamLen; // Length of input stream sal_Int32 sqlType; // Java SQL type used to // register an OUT parameter - sal_Bool outputParameter; // true for OUTPUT parameters + sal_Bool outputParameter; // true for OUTPUT parameters sal_Int32 pA1; //pointers diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index c5dbe644705b..4b6f6b108187 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace connectivity class ODatabaseMetaData; typedef connectivity::OMetaConnection OConnection_BASE; - typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; + typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; class OOO_DLLPUBLIC_ODBCBASE OConnection : public OConnection_BASE, @@ -66,40 +66,40 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements - TTypeInfoVector m_aTypeInfo; // vector containing an entry + ::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 // DatabaseMetaData.getTypeInfo. - + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - ::rtl::OUString m_sUser; // the user name - ODBCDriver* m_pDriver; // Pointer to the owning + ::rtl::OUString m_sUser; // the user name + ODBCDriver* m_pDriver; // Pointer to the owning // driver object - - SQLHANDLE m_aConnectionHandle; - SQLHANDLE m_pDriverHandleCopy; // performance reason - sal_Int32 m_nStatementCount; - sal_Bool m_bClosed; - sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases - sal_Bool m_bUseOldDateFormat; - sal_Bool m_bParameterSubstitution; - sal_Bool m_bIgnoreDriverPrivileges; + + SQLHANDLE m_aConnectionHandle; + SQLHANDLE m_pDriverHandleCopy; // performance reason + sal_Int32 m_nStatementCount; + sal_Bool m_bClosed; + sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases + sal_Bool m_bUseOldDateFormat; + sal_Bool m_bParameterSubstitution; + sal_Bool m_bIgnoreDriverPrivileges; sal_Bool m_bPreventGetVersionColumns; // #i60273# sal_Bool m_bReadOnly; - SQLRETURN OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); - - virtual OConnection* cloneConnection(); // creates a new connection + SQLRETURN OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); + virtual OConnection* cloneConnection(); // creates a new connection + public: oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; virtual SQLRETURN Construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); - // OConnection(const SQLHANDLE _pConnectionHandle); + OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); + // OConnection(const SQLHANDLE _pConnectionHandle); virtual ~OConnection(); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -136,24 +136,24 @@ namespace connectivity 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); // - SQLHANDLE getConnection() { return m_aConnectionHandle; } - + SQLHANDLE getConnection() { return m_aConnectionHandle; } + // should we use the catalog on filebased databases - inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } - inline sal_Bool isParameterSubstitutionEnabled() const { return m_bParameterSubstitution; } - inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } + inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } + inline sal_Bool isParameterSubstitutionEnabled() const { return m_bParameterSubstitution; } + inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } inline sal_Bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; } - inline sal_Bool useOldDateFormat() const { return m_bUseOldDateFormat; } - inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} - inline ODBCDriver* getDriver() const { return m_pDriver;} - inline ::rtl::OUString getUserName() const { return m_sUser; } + inline sal_Bool useOldDateFormat() const { return m_bUseOldDateFormat; } + inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} + inline ODBCDriver* getDriver() const { return m_pDriver;} + inline ::rtl::OUString getUserName() const { return m_sUser; } - SQLHANDLE createStatementHandle(); + SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE - void freeStatementHandle(SQLHANDLE& _pHandle); + void freeStatementHandle(SQLHANDLE& _pHandle); void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); - const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } + const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } }; } } diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index 08d4f91f3a94..ab4eddfa53e6 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,10 +44,10 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData : public ODatabaseMetaDataBase { - SQLHANDLE m_aConnectionHandle; - OConnection* m_pConnection; - sal_Bool m_bUseCatalog; - sal_Bool m_bOdbc3; + SQLHANDLE m_aConnectionHandle; + OConnection* m_pConnection; + sal_Bool m_bUseCatalog; + sal_Bool m_bOdbc3; // cached database information virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); @@ -76,9 +76,9 @@ namespace connectivity } ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon); + - - + // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -101,10 +101,10 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -140,12 +140,12 @@ namespace connectivity virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 1ae6042ca04f..8851f1f56efc 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,9 +52,9 @@ namespace connectivity { class ODatabaseMetaDataResultSetMetaData; /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, @@ -64,43 +64,43 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + public ODatabaseMetaDataResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange; + ::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; + ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange; - ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange; + ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; - SQLHANDLE m_aStatementHandle; - SQLHANDLE m_aConnectionHandle; - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; + SQLHANDLE m_aStatementHandle; + SQLHANDLE m_aConnectionHandle; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - SQLUSMALLINT* m_pRowStatusArray; - OConnection* m_pConnection; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are - sal_Int32 m_nDriverColumnCount; // column count of the driver wich can sometimes be less than the metadata count - SQLRETURN m_nCurrentFetchState; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bFreeHandle; + SQLUSMALLINT* m_pRowStatusArray; + OConnection* m_pConnection; + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are + sal_Int32 m_nDriverColumnCount; // column count of the driver wich can sometimes be less than the metadata count + SQLRETURN m_nCurrentFetchState; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; // after last record + sal_Bool m_bFreeHandle; // set the columncount of the driver void checkColumnCount(); sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex); - sal_Int32 mapColumn (sal_Int32 column); + sal_Int32 mapColumn (sal_Int32 column); protected: diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx index 4eec4e8157c4..29a56fe4c4b9 100644 --- a/connectivity/source/inc/odbc/ODefs3.hxx +++ b/connectivity/source/inc/odbc/ODefs3.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index 7b28a196ee72..abdf59496496 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,17 +46,17 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE SAL_NO_VTABLE ODBCDriver : public ODriver_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; // vector containing a list + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - SQLHANDLE m_pDriverHandle; - - virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath) = 0; + SQLHANDLE m_pDriverHandle; + virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath) = 0; + public: ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index e0ffbe91b6fc..c5874e61a864 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ // odbcstub definiert die in den Quellen benutzten NSQL...-Methoden // als indirekte Funktionsaufrufe. // odbcimp zieht sich selbst preos2, odbc und postos2 an. -// #include "odbc3imp.hxx" +// #include "odbc3imp.hxx" #else @@ -107,7 +107,7 @@ #define SQL_FETCH_PRIOR SQL_FETCH_PREV #define SQL_NO_TOTAL (-4) -// #include "odbc3defs.hxx" +// #include "odbc3defs.hxx" #endif @@ -142,10 +142,10 @@ // definiert. #define SDB_ODBC_CHAR UCHAR -#define SQL_WCHAR (-8) -#define SQL_WVARCHAR (-9) -#define SQL_WLONGVARCHAR (-10) -#define SQL_C_WCHAR SQL_WCHAR +#define SQL_WCHAR (-8) +#define SQL_WVARCHAR (-9) +#define SQL_WLONGVARCHAR (-10) +#define SQL_C_WCHAR SQL_WCHAR #endif // UNX @@ -153,22 +153,22 @@ //-------------------------------------------------------------------------- #ifndef SQL_WCHAR -#define SQL_WCHAR (-8) +#define SQL_WCHAR (-8) #endif #ifndef SQL_WVARCHAR -#define SQL_WVARCHAR (-9) +#define SQL_WVARCHAR (-9) #endif #ifndef SQL_WLONGVARCHAR -#define SQL_WLONGVARCHAR (-10) +#define SQL_WLONGVARCHAR (-10) #endif #ifndef SQL_C_WCHAR -#define SQL_C_WCHAR SQL_WCHAR +#define SQL_C_WCHAR SQL_WCHAR #endif #ifdef UNICODE -#define SQL_C_TCHAR SQL_C_WCHAR +#define SQL_C_TCHAR SQL_C_WCHAR #else -#define SQL_C_TCHAR SQL_C_CHAR +#define SQL_C_TCHAR SQL_C_CHAR #endif #endif // _CONNECTIVITY_OFUNCTIONDEFS_HXX_ diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index fc61134bae74..6e53f332b5e2 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,518 +36,518 @@ namespace connectivity { -// sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True); -// sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath); -// sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath); +// sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True); +// sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath); +// sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath); // Connecting to a data source - typedef SQLRETURN (SQL_API *T3SQLAllocHandle) (SQLSMALLINT HandleType,SQLHANDLE InputHandle,SQLHANDLE * OutputHandlePtr); + typedef SQLRETURN (SQL_API *T3SQLAllocHandle) (SQLSMALLINT HandleType,SQLHANDLE InputHandle,SQLHANDLE * OutputHandlePtr); #define N3SQLAllocHandle(a,b,c) (*(T3SQLAllocHandle)getOdbcFunction(ODBC3SQLAllocHandle))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLConnect) (SQLHDBC ConnectionHandle,SQLCHAR *ServerName,SQLSMALLINT NameLength1,SQLCHAR *UserName,SQLSMALLINT NameLength2,SQLCHAR *Authentication,SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLConnect) (SQLHDBC ConnectionHandle,SQLCHAR *ServerName,SQLSMALLINT NameLength1,SQLCHAR *UserName,SQLSMALLINT NameLength2,SQLCHAR *Authentication,SQLSMALLINT NameLength3); #define N3SQLConnect(a,b,c,d,e,f,g) (*(T3SQLConnect)getOdbcFunction(ODBC3SQLConnect))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLDriverConnect) ( SQLHDBC ConnectionHandle, - HWND WindowHandle, - SQLCHAR * InConnectionString, - SQLSMALLINT StringLength1, - SQLCHAR * OutConnectionString, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength2Ptr, - SQLUSMALLINT DriverCompletion); + typedef SQLRETURN (SQL_API *T3SQLDriverConnect) ( SQLHDBC ConnectionHandle, + HWND WindowHandle, + SQLCHAR * InConnectionString, + SQLSMALLINT StringLength1, + SQLCHAR * OutConnectionString, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLength2Ptr, + SQLUSMALLINT DriverCompletion); #define N3SQLDriverConnect(a,b,c,d,e,f,g,h) (*(T3SQLDriverConnect)getOdbcFunction(ODBC3SQLDriverConnect))(a,b,c,d,e,f,g,h) - typedef SQLRETURN (SQL_API *T3SQLBrowseConnect) ( SQLHDBC ConnectionHandle, - SQLCHAR * InConnectionString, - SQLSMALLINT StringLength1, - SQLCHAR * OutConnectionString, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength2Ptr); + typedef SQLRETURN (SQL_API *T3SQLBrowseConnect) ( SQLHDBC ConnectionHandle, + SQLCHAR * InConnectionString, + SQLSMALLINT StringLength1, + SQLCHAR * OutConnectionString, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLength2Ptr); #define N3SQLBrowseConnect(a,b,c,d,e,f) (*(T3SQLBrowseConnect)getOdbcFunction(ODBC3SQLBrowseConnect))(a,b,c,d,e,f) // Obtaining information about a driver and data source - typedef SQLRETURN (SQL_API *T3SQLDataSources) ( SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, - SQLCHAR * ServerName, - SQLSMALLINT BufferLength1, - SQLSMALLINT * NameLength1Ptr, - SQLCHAR * Description, - SQLSMALLINT BufferLength2, - SQLSMALLINT * NameLength2Ptr); + typedef SQLRETURN (SQL_API *T3SQLDataSources) ( SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, + SQLCHAR * ServerName, + SQLSMALLINT BufferLength1, + SQLSMALLINT * NameLength1Ptr, + SQLCHAR * Description, + SQLSMALLINT BufferLength2, + SQLSMALLINT * NameLength2Ptr); #define N3SQLDataSources(a,b,c,d,e,f,g,h) (*(T3SQLDataSources)getOdbcFunction(ODBC3SQLDataSources))(a,b,c,d,e,f,g,h) - typedef SQLRETURN (SQL_API *T3SQLDrivers) ( SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, - SQLCHAR * DriverDescription, - SQLSMALLINT BufferLength1, - SQLSMALLINT * DescriptionLengthPtr, - SQLCHAR * DriverAttributes, - SQLSMALLINT BufferLength2, - SQLSMALLINT * AttributesLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLDrivers) ( SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, + SQLCHAR * DriverDescription, + SQLSMALLINT BufferLength1, + SQLSMALLINT * DescriptionLengthPtr, + SQLCHAR * DriverAttributes, + SQLSMALLINT BufferLength2, + SQLSMALLINT * AttributesLengthPtr); #define N3SQLDrivers(a,b,c,d,e,f,g,h) (*(T3SQLDrivers)getOdbcFunction(ODBC3SQLDrivers))(a,b,c,d,e,f,g,h) - typedef SQLRETURN (SQL_API *T3SQLGetInfo) ( SQLHDBC ConnectionHandle, - SQLUSMALLINT InfoType, - SQLPOINTER InfoValuePtr, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLGetInfo) ( SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, + SQLPOINTER InfoValuePtr, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr); #define N3SQLGetInfo(a,b,c,d,e) (*(T3SQLGetInfo)getOdbcFunction(ODBC3SQLGetInfo))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLGetFunctions) (SQLHDBC ConnectionHandle, - SQLUSMALLINT FunctionId, - SQLUSMALLINT * SupportedPtr); + typedef SQLRETURN (SQL_API *T3SQLGetFunctions) (SQLHDBC ConnectionHandle, + SQLUSMALLINT FunctionId, + SQLUSMALLINT * SupportedPtr); #define N3SQLGetFunctions(a,b,c) (*(T3SQLGetFunctions)getOdbcFunction(ODBC3SQLGetFunctions))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLGetTypeInfo) ( SQLHSTMT StatementHandle, - SQLSMALLINT DataType); + typedef SQLRETURN (SQL_API *T3SQLGetTypeInfo) ( SQLHSTMT StatementHandle, + SQLSMALLINT DataType); #define N3SQLGetTypeInfo(a,b) (*(T3SQLGetTypeInfo)getOdbcFunction(ODBC3SQLGetTypeInfo))(a,b) // Setting and retrieving driver attributes - typedef SQLRETURN (SQL_API *T3SQLSetConnectAttr)(SQLHDBC ConnectionHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER StringLength); + typedef SQLRETURN (SQL_API *T3SQLSetConnectAttr)(SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER StringLength); #define N3SQLSetConnectAttr(a,b,c,d) (*(T3SQLSetConnectAttr)getOdbcFunction(ODBC3SQLSetConnectAttr))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLGetConnectAttr) (SQLHDBC ConnectionHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER* StringLength); + typedef SQLRETURN (SQL_API *T3SQLGetConnectAttr) (SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER* StringLength); #define N3SQLGetConnectAttr(a,b,c,d,e) (*(T3SQLGetConnectAttr)getOdbcFunction(ODBC3SQLGetConnectAttr))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLSetEnvAttr) ( SQLHENV EnvironmentHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER StringLength); + typedef SQLRETURN (SQL_API *T3SQLSetEnvAttr) ( SQLHENV EnvironmentHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER StringLength); #define N3SQLSetEnvAttr(a,b,c,d) (*(T3SQLSetEnvAttr)getOdbcFunction(ODBC3SQLSetEnvAttr))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLGetEnvAttr) ( SQLHENV EnvironmentHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER* StringLength); + typedef SQLRETURN (SQL_API *T3SQLGetEnvAttr) ( SQLHENV EnvironmentHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER* StringLength); #define N3SQLGetEnvAttr(a,b,c,d,e) (*(T3SQLGetEnvAttr)getOdbcFunction(ODBC3SQLGetEnvAttr))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLSetStmtAttr) ( SQLHSTMT StatementHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER StringLength); + typedef SQLRETURN (SQL_API *T3SQLSetStmtAttr) ( SQLHSTMT StatementHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER StringLength); #define N3SQLSetStmtAttr(a,b,c,d) (*(T3SQLSetStmtAttr)getOdbcFunction(ODBC3SQLSetStmtAttr))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLGetStmtAttr) ( SQLHSTMT StatementHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER* StringLength); + typedef SQLRETURN (SQL_API *T3SQLGetStmtAttr) ( SQLHSTMT StatementHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER* StringLength); #define N3SQLGetStmtAttr(a,b,c,d,e) (*(T3SQLGetStmtAttr)getOdbcFunction(ODBC3SQLGetStmtAttr))(a,b,c,d,e) // Setting and retrieving descriptor fields - /*typedef SQLRETURN (SQL_API *T3SQLSetDescField) (SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength); + /*typedef SQLRETURN (SQL_API *T3SQLSetDescField) (SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT FieldIdentifier, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength); #define N3SQLSetDescField(a,b,c,d,e) (*(T3SQLSetDescField)getOdbcFunction(ODBC3SQLSetDescField))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLGetDescField) ( SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER * StringLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLGetDescField) ( SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT FieldIdentifier, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER * StringLengthPtr); #define N3SQLGetDescField(a,b,c,d,e,f) (*(T3SQLGetDescField)getOdbcFunction(ODBC3SQLGetDescField))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLGetDescRec) ( SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLCHAR * Name, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr, - SQLSMALLINT * TypePtr, - SQLSMALLINT * SubTypePtr, - SQLLEN * LengthPtr, - SQLSMALLINT * PrecisionPtr, - SQLSMALLINT * ScalePtr, - SQLSMALLINT * NullablePtr); + typedef SQLRETURN (SQL_API *T3SQLGetDescRec) ( SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLCHAR * Name, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr, + SQLSMALLINT * TypePtr, + SQLSMALLINT * SubTypePtr, + SQLLEN * LengthPtr, + SQLSMALLINT * PrecisionPtr, + SQLSMALLINT * ScalePtr, + SQLSMALLINT * NullablePtr); #define N3SQLGetDescRec(a,b,c,d,e,f,g,h,i,j,k) (*(T3SQLGetDescRec)getOdbcFunction(ODBC3SQLGetDescRec))(a,b,c,d,e,f,g,h,i,j,k) - typedef SQLRETURN (SQL_API *T3SQLSetDescRec) ( SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLSMALLINT Type, - SQLSMALLINT SubType, - SQLINTEGER Length, - SQLSMALLINT Precision, - SQLSMALLINT Scale, - SQLPOINTER DataPtr, - SQLLEN * StringLengthPtr, - SQLLEN * IndicatorPtr); + typedef SQLRETURN (SQL_API *T3SQLSetDescRec) ( SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT Type, + SQLSMALLINT SubType, + SQLINTEGER Length, + SQLSMALLINT Precision, + SQLSMALLINT Scale, + SQLPOINTER DataPtr, + SQLLEN * StringLengthPtr, + SQLLEN * IndicatorPtr); #define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j) */ // Preparing SQL requests - typedef SQLRETURN (SQL_API *T3SQLPrepare) ( SQLHSTMT StatementHandle, - SQLCHAR * StatementText, - SQLINTEGER TextLength); + typedef SQLRETURN (SQL_API *T3SQLPrepare) ( SQLHSTMT StatementHandle, + SQLCHAR * StatementText, + SQLINTEGER TextLength); #define N3SQLPrepare(a,b,c) (*(T3SQLPrepare)getOdbcFunction(ODBC3SQLPrepare))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLBindParameter) (SQLHSTMT StatementHandle, - SQLUSMALLINT ParameterNumber, - SQLSMALLINT InputOutputType, - SQLSMALLINT ValueType, - SQLSMALLINT ParameterType, - SQLULEN ColumnSize, - SQLSMALLINT DecimalDigits, - SQLPOINTER ParameterValuePtr, - SQLLEN BufferLength, - SQLLEN * StrLen_or_IndPtr); + typedef SQLRETURN (SQL_API *T3SQLBindParameter) (SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, + SQLSMALLINT InputOutputType, + SQLSMALLINT ValueType, + SQLSMALLINT ParameterType, + SQLULEN ColumnSize, + SQLSMALLINT DecimalDigits, + SQLPOINTER ParameterValuePtr, + SQLLEN BufferLength, + SQLLEN * StrLen_or_IndPtr); #define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j) - /*typedef SQLRETURN (SQL_API *T3SQLGetCursorName) (SQLHSTMT StatementHandle, - SQLCHAR * CursorName, - SQLSMALLINT BufferLength, - SQLSMALLINT * NameLengthPtr); + /*typedef SQLRETURN (SQL_API *T3SQLGetCursorName) (SQLHSTMT StatementHandle, + SQLCHAR * CursorName, + SQLSMALLINT BufferLength, + SQLSMALLINT * NameLengthPtr); #define N3SQLGetCursorName(a,b,c,d) (*(T3SQLGetCursorName)getOdbcFunction(ODBC3SQLGetCursorName))(a,b,c,d) */ - typedef SQLRETURN (SQL_API *T3SQLSetCursorName) (SQLHSTMT StatementHandle, - SQLCHAR * CursorName, - SQLSMALLINT NameLength); + typedef SQLRETURN (SQL_API *T3SQLSetCursorName) (SQLHSTMT StatementHandle, + SQLCHAR * CursorName, + SQLSMALLINT NameLength); #define N3SQLSetCursorName(a,b,c) (*(T3SQLSetCursorName)getOdbcFunction(ODBC3SQLSetCursorName))(a,b,c) // Submitting requests - typedef SQLRETURN (SQL_API *T3SQLExecute) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLExecute) ( SQLHSTMT StatementHandle); #define N3SQLExecute(a) (*(T3SQLExecute)getOdbcFunction(ODBC3SQLExecute))(a) - typedef SQLRETURN (SQL_API *T3SQLExecDirect) ( SQLHSTMT StatementHandle, - SQLCHAR * StatementText, - SQLINTEGER TextLength); + typedef SQLRETURN (SQL_API *T3SQLExecDirect) ( SQLHSTMT StatementHandle, + SQLCHAR * StatementText, + SQLINTEGER TextLength); #define N3SQLExecDirect(a,b,c) (*(T3SQLExecDirect)getOdbcFunction(ODBC3SQLExecDirect))(a,b,c) - /*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC ConnectionHandle, - SQLCHAR * InStatementText, - SQLINTEGER TextLength1, - SQLCHAR * utStatementText, - SQLINTEGER BufferLength, - SQLINTEGER * TextLength2Ptr); + /*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC ConnectionHandle, + SQLCHAR * InStatementText, + SQLINTEGER TextLength1, + SQLCHAR * utStatementText, + SQLINTEGER BufferLength, + SQLINTEGER * TextLength2Ptr); #define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f)*/ - typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT StatementHandle, - SQLUSMALLINT ParameterNumber, - SQLSMALLINT * DataTypePtr, - SQLULEN * ParameterSizePtr, - SQLSMALLINT * DecimalDigitsPtr, - SQLSMALLINT * NullablePtr); + typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, + SQLSMALLINT * DataTypePtr, + SQLULEN * ParameterSizePtr, + SQLSMALLINT * DecimalDigitsPtr, + SQLSMALLINT * NullablePtr); #define N3SQLDescribeParam(a,b,c,d,e,f) (*(T3SQLDescribeParam)getOdbcFunction(ODBC3SQLDescribeParam))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLNumParams) ( SQLHSTMT StatementHandle, - SQLSMALLINT * ParameterCountPtr); + typedef SQLRETURN (SQL_API *T3SQLNumParams) ( SQLHSTMT StatementHandle, + SQLSMALLINT * ParameterCountPtr); #define N3SQLNumParams(a,b) (*(T3SQLNumParams)getOdbcFunction(ODBC3SQLNumParams))(a,b) - typedef SQLRETURN (SQL_API *T3SQLParamData) ( SQLHSTMT StatementHandle, - SQLPOINTER * ValuePtrPtr); + typedef SQLRETURN (SQL_API *T3SQLParamData) ( SQLHSTMT StatementHandle, + SQLPOINTER * ValuePtrPtr); #define N3SQLParamData(a,b) (*(T3SQLParamData)getOdbcFunction(ODBC3SQLParamData))(a,b) - typedef SQLRETURN (SQL_API *T3SQLPutData) ( SQLHSTMT StatementHandle, - SQLPOINTER DataPtr, - SQLLEN StrLen_or_Ind); + typedef SQLRETURN (SQL_API *T3SQLPutData) ( SQLHSTMT StatementHandle, + SQLPOINTER DataPtr, + SQLLEN StrLen_or_Ind); #define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c) // Retrieving results and information about results - typedef SQLRETURN (SQL_API *T3SQLRowCount) ( SQLHSTMT StatementHandle, - SQLLEN * RowCountPtr); + typedef SQLRETURN (SQL_API *T3SQLRowCount) ( SQLHSTMT StatementHandle, + SQLLEN * RowCountPtr); #define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b) - typedef SQLRETURN (SQL_API *T3SQLNumResultCols) (SQLHSTMT StatementHandle, - SQLSMALLINT * ColumnCountPtr); + typedef SQLRETURN (SQL_API *T3SQLNumResultCols) (SQLHSTMT StatementHandle, + SQLSMALLINT * ColumnCountPtr); #define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b) - typedef SQLRETURN (SQL_API *T3SQLDescribeCol) ( SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLCHAR * ColumnName, - SQLSMALLINT BufferLength, - SQLSMALLINT * NameLengthPtr, - SQLSMALLINT * DataTypePtr, - SQLULEN * ColumnSizePtr, - SQLSMALLINT * DecimalDigitsPtr, - SQLSMALLINT * NullablePtr); + typedef SQLRETURN (SQL_API *T3SQLDescribeCol) ( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLCHAR * ColumnName, + SQLSMALLINT BufferLength, + SQLSMALLINT * NameLengthPtr, + SQLSMALLINT * DataTypePtr, + SQLULEN * ColumnSizePtr, + SQLSMALLINT * DecimalDigitsPtr, + SQLSMALLINT * NullablePtr); #define N3SQLDescribeCol(a,b,c,d,e,f,g,h,i) (*(T3SQLDescribeCol)getOdbcFunction(ODBC3SQLDescribeCol))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLColAttribute) (SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLUSMALLINT FieldIdentifier, - SQLPOINTER CharacterAttributePtr, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr, - SQLLEN * NumericAttributePtr); + typedef SQLRETURN (SQL_API *T3SQLColAttribute) (SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLUSMALLINT FieldIdentifier, + SQLPOINTER CharacterAttributePtr, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr, + SQLLEN * NumericAttributePtr); #define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLBindCol) ( SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLSMALLINT TargetType, - SQLPOINTER TargetValuePtr, - SQLLEN BufferLength, - SQLLEN * StrLen_or_IndPtr); + typedef SQLRETURN (SQL_API *T3SQLBindCol) ( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLSMALLINT TargetType, + SQLPOINTER TargetValuePtr, + SQLLEN BufferLength, + SQLLEN * StrLen_or_IndPtr); #define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLFetch) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLFetch) ( SQLHSTMT StatementHandle); #define N3SQLFetch(a) (*(T3SQLFetch)getOdbcFunction(ODBC3SQLFetch))(a) - typedef SQLRETURN (SQL_API *T3SQLFetchScroll) ( SQLHSTMT StatementHandle, - SQLSMALLINT FetchOrientation, - SQLLEN FetchOffset); + typedef SQLRETURN (SQL_API *T3SQLFetchScroll) ( SQLHSTMT StatementHandle, + SQLSMALLINT FetchOrientation, + SQLLEN FetchOffset); #define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLGetData) ( SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLSMALLINT TargetType, - SQLPOINTER TargetValuePtr, - SQLLEN BufferLength, - SQLLEN * StrLen_or_IndPtr); + typedef SQLRETURN (SQL_API *T3SQLGetData) ( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLSMALLINT TargetType, + SQLPOINTER TargetValuePtr, + SQLLEN BufferLength, + SQLLEN * StrLen_or_IndPtr); #define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLSetPos) ( SQLHSTMT StatementHandle, - SQLSETPOSIROW RowNumber, - SQLUSMALLINT Operation, - SQLUSMALLINT LockType); + typedef SQLRETURN (SQL_API *T3SQLSetPos) ( SQLHSTMT StatementHandle, + SQLSETPOSIROW RowNumber, + SQLUSMALLINT Operation, + SQLUSMALLINT LockType); #define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLBulkOperations) ( SQLHSTMT StatementHandle, - SQLSMALLINT Operation); + typedef SQLRETURN (SQL_API *T3SQLBulkOperations) ( SQLHSTMT StatementHandle, + SQLSMALLINT Operation); #define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b) - typedef SQLRETURN (SQL_API *T3SQLMoreResults) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLMoreResults) ( SQLHSTMT StatementHandle); #define N3SQLMoreResults(a) (*(T3SQLMoreResults)getOdbcFunction(ODBC3SQLMoreResults))(a) - /*typedef SQLRETURN (SQL_API *T3SQLGetDiagField) (SQLSMALLINT HandleType, - SQLHANDLE Handle, - SQLSMALLINT RecNumber, - SQLSMALLINT DiagIdentifier, - SQLPOINTER DiagInfoPtr, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr); + /*typedef SQLRETURN (SQL_API *T3SQLGetDiagField) (SQLSMALLINT HandleType, + SQLHANDLE Handle, + SQLSMALLINT RecNumber, + SQLSMALLINT DiagIdentifier, + SQLPOINTER DiagInfoPtr, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr); #define N3SQLGetDiagField(a,b,c,d,e,f,g) (*(T3SQLGetDiagField)getOdbcFunction(ODBC3SQLGetDiagField))(a,b,c,d,e,f,g)*/ - typedef SQLRETURN (SQL_API *T3SQLGetDiagRec) ( SQLSMALLINT HandleType, - SQLHANDLE Handle, - SQLSMALLINT RecNumber, - SQLCHAR * Sqlstate, - SQLINTEGER * NativeErrorPtr, - SQLCHAR * MessageText, - SQLSMALLINT BufferLength, - SQLSMALLINT * TextLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLGetDiagRec) ( SQLSMALLINT HandleType, + SQLHANDLE Handle, + SQLSMALLINT RecNumber, + SQLCHAR * Sqlstate, + SQLINTEGER * NativeErrorPtr, + SQLCHAR * MessageText, + SQLSMALLINT BufferLength, + SQLSMALLINT * TextLengthPtr); #define N3SQLGetDiagRec(a,b,c,d,e,f,g,h) (*(T3SQLGetDiagRec)getOdbcFunction(ODBC3SQLGetDiagRec))(a,b,c,d,e,f,g,h) // Obtaining information about the data source's system tables (catalog functions) - typedef SQLRETURN (SQL_API *T3SQLColumnPrivileges) (SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLColumnPrivileges) (SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLCHAR * ColumnName, + SQLSMALLINT NameLength4); #define N3SQLColumnPrivileges(a,b,c,d,e,f,g,h,i) (*(T3SQLColumnPrivileges)getOdbcFunction(ODBC3SQLColumnPrivileges))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLColumns) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLColumns) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLCHAR * ColumnName, + SQLSMALLINT NameLength4); #define N3SQLColumns(a,b,c,d,e,f,g,h,i) (*(T3SQLColumns)getOdbcFunction(ODBC3SQLColumns))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLForeignKeys) ( SQLHSTMT StatementHandle, - SQLCHAR * PKCatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * PKSchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * PKTableName, - SQLSMALLINT NameLength3, - SQLCHAR * FKCatalogName, - SQLSMALLINT NameLength4, - SQLCHAR * FKSchemaName, - SQLSMALLINT NameLength5, - SQLCHAR * FKTableName, - SQLSMALLINT NameLength6); + typedef SQLRETURN (SQL_API *T3SQLForeignKeys) ( SQLHSTMT StatementHandle, + SQLCHAR * PKCatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * PKSchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * PKTableName, + SQLSMALLINT NameLength3, + SQLCHAR * FKCatalogName, + SQLSMALLINT NameLength4, + SQLCHAR * FKSchemaName, + SQLSMALLINT NameLength5, + SQLCHAR * FKTableName, + SQLSMALLINT NameLength6); #define N3SQLForeignKeys(a,b,c,d,e,f,g,h,i,j,k,l,m) (*(T3SQLForeignKeys)getOdbcFunction(ODBC3SQLForeignKeys))(a,b,c,d,e,f,g,h,i,j,k,l,m) - typedef SQLRETURN (SQL_API *T3SQLPrimaryKeys) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLPrimaryKeys) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3); #define N3SQLPrimaryKeys(a,b,c,d,e,f,g) (*(T3SQLPrimaryKeys)getOdbcFunction(ODBC3SQLPrimaryKeys))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLProcedureColumns) (SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * ProcName, - SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLProcedureColumns) (SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * ProcName, + SQLSMALLINT NameLength3, + SQLCHAR * ColumnName, + SQLSMALLINT NameLength4); #define N3SQLProcedureColumns(a,b,c,d,e,f,g,h,i) (*(T3SQLProcedureColumns)getOdbcFunction(ODBC3SQLProcedureColumns))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLProcedures) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * ProcName, - SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLProcedures) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * ProcName, + SQLSMALLINT NameLength3); #define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLSpecialColumns) (SQLHSTMT StatementHandle, - SQLUSMALLINT IdentifierType, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLUSMALLINT Scope, - SQLUSMALLINT Nullable); + typedef SQLRETURN (SQL_API *T3SQLSpecialColumns) (SQLHSTMT StatementHandle, + SQLUSMALLINT IdentifierType, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLUSMALLINT Scope, + SQLUSMALLINT Nullable); #define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j) - typedef SQLRETURN (SQL_API *T3SQLStatistics) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLUSMALLINT Unique, - SQLUSMALLINT Reserved); + typedef SQLRETURN (SQL_API *T3SQLStatistics) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, + SQLUSMALLINT Reserved); #define N3SQLStatistics(a,b,c,d,e,f,g,h,i) (*(T3SQLStatistics)getOdbcFunction(ODBC3SQLStatistics))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLTablePrivileges) (SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLTablePrivileges) (SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3); #define N3SQLTablePrivileges(a,b,c,d,e,f,g) (*(T3SQLTablePrivileges)getOdbcFunction(ODBC3SQLTablePrivileges))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLTables) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLCHAR * TableType, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLTables) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLCHAR * TableType, + SQLSMALLINT NameLength4); #define N3SQLTables(a,b,c,d,e,f,g,h,i) (*(T3SQLTables)getOdbcFunction(ODBC3SQLTables))(a,b,c,d,e,f,g,h,i) // Terminating a statement - typedef SQLRETURN (SQL_API *T3SQLFreeStmt) ( SQLHSTMT StatementHandle, - SQLUSMALLINT Option); + typedef SQLRETURN (SQL_API *T3SQLFreeStmt) ( SQLHSTMT StatementHandle, + SQLUSMALLINT Option); #define N3SQLFreeStmt(a,b) (*(T3SQLFreeStmt)getOdbcFunction(ODBC3SQLFreeStmt))(a,b) - typedef SQLRETURN (SQL_API *T3SQLCloseCursor) (SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLCloseCursor) (SQLHSTMT StatementHandle); #define N3SQLCloseCursor(a) (*(T3SQLCloseCursor)getOdbcFunction(ODBC3SQLCloseCursor))(a) - typedef SQLRETURN (SQL_API *T3SQLCancel) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLCancel) ( SQLHSTMT StatementHandle); #define N3SQLCancel(a) (*(T3SQLCancel)getOdbcFunction(ODBC3SQLCancel))(a) - typedef SQLRETURN (SQL_API *T3SQLEndTran) ( SQLSMALLINT HandleType, - SQLHANDLE Handle, - SQLSMALLINT CompletionType); + typedef SQLRETURN (SQL_API *T3SQLEndTran) ( SQLSMALLINT HandleType, + SQLHANDLE Handle, + SQLSMALLINT CompletionType); #define N3SQLEndTran(a,b,c) (*(T3SQLEndTran)getOdbcFunction(ODBC3SQLEndTran))(a,b,c) // Terminating a connection - typedef SQLRETURN (SQL_API *T3SQLDisconnect) (SQLHDBC ConnectionHandle); + typedef SQLRETURN (SQL_API *T3SQLDisconnect) (SQLHDBC ConnectionHandle); #define N3SQLDisconnect(a) (*(T3SQLDisconnect)getOdbcFunction(ODBC3SQLDisconnect))(a) - typedef SQLRETURN (SQL_API *T3SQLFreeHandle) (SQLSMALLINT HandleType, - SQLHANDLE Handle); + typedef SQLRETURN (SQL_API *T3SQLFreeHandle) (SQLSMALLINT HandleType, + SQLHANDLE Handle); #define N3SQLFreeHandle(a,b) (*(T3SQLFreeHandle)getOdbcFunction(ODBC3SQLFreeHandle))(a,b) - typedef SQLRETURN (SQL_API *T3SQLGetCursorName) ( SQLHSTMT StatementHandle, - SQLCHAR * CursorName, - SQLSMALLINT BufferLength, - SQLSMALLINT* NameLength2); + typedef SQLRETURN (SQL_API *T3SQLGetCursorName) ( SQLHSTMT StatementHandle, + SQLCHAR * CursorName, + SQLSMALLINT BufferLength, + SQLSMALLINT* NameLength2); #define N3SQLGetCursorName(a,b,c,d) (*(T3SQLGetCursorName)getOdbcFunction(ODBC3SQLGetCursorName))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHSTMT ConnectionHandle, - SQLCHAR * InStatementText, - SQLINTEGER TextLength1, - SQLCHAR * OutStatementText, - SQLINTEGER BufferLength, - SQLINTEGER * TextLength2Ptr); + typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHSTMT ConnectionHandle, + SQLCHAR * InStatementText, + SQLINTEGER TextLength1, + SQLCHAR * OutStatementText, + SQLINTEGER BufferLength, + SQLINTEGER * TextLength2Ptr); #define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f) } diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 8c413555b17a..1e8362834b55 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,54 +44,54 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XPreparedBatchExecution, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; class OOO_DLLPUBLIC_ODBCBASE OPreparedStatement : - public OStatement_BASE2, + public OStatement_BASE2, public OPreparedStatement_BASE { protected: struct Parameter { - ::com::sun::star::uno::Any aValue; - sal_Int32 nDataType; + ::com::sun::star::uno::Any aValue; + sal_Int32 nDataType; - Parameter(const ::com::sun::star::uno::Any& rValue, - sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) + Parameter(const ::com::sun::star::uno::Any& rValue, + sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) { } }; - ::std::vector< Parameter> m_aParameters; + ::std::vector< Parameter> m_aParameters; //==================================================================== // Data attributes //==================================================================== - SQLSMALLINT numParams; // Number of parameter markers + SQLSMALLINT numParams; // Number of parameter markers // for the prepared statement - OBoundParam* boundParams; + OBoundParam* boundParams; // Array of bound parameter // objects. Each parameter // marker will have a // corresponding object to // hold bind information, and // resulting data. - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + sal_Bool m_bPrepared; void FreeParams(); void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException); void setStream (sal_Int32 ParameterIndex,const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, SQLLEN length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException); - sal_Int32 getParamLength ( sal_Int32 index); + sal_Int32 getParamLength ( sal_Int32 index); sal_Int8* getLengthBuf (sal_Int32 index); sal_Int8* getDataBuf (sal_Int32 index); - sal_Int8* allocBindBuf ( sal_Int32 index, sal_Int32 bufLen); + sal_Int8* allocBindBuf ( sal_Int32 index, sal_Int32 bufLen); void initBoundParam () throw(::com::sun::star::sdbc::SQLException); void setParameter(sal_Int32 parameterIndex,sal_Int32 _nType,sal_Int32 _nSize,void* _pData); diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index bbb39209496e..7a9b39969427 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace connectivity { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -74,7 +74,7 @@ namespace connectivity typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr; typedef ::std::allocator< TVoidPtr > TVoidAlloc; typedef ::std::vector<TVoidPtr> TVoidVector; - // typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector; + // typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector; /// unary_function Functor object for class ZZ returntype is void struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< ::com::sun::star::uno::Sequence<sal_Int8>, ::com::sun::star::uno::Sequence<sal_Int8>, bool > { @@ -86,8 +86,8 @@ namespace connectivity sal_Int32 nCount = _rLH.getLength(); if(nCount != 4) { - const sal_Int8* pLHBack = _rLH.getConstArray() + nCount - 1; - const sal_Int8* pRHBack = _rRH.getConstArray() + nCount - 1; + const sal_Int8* pLHBack = _rLH.getConstArray() + nCount - 1; + const sal_Int8* pRHBack = _rRH.getConstArray() + nCount - 1; sal_Int32 i; for(i=0;i < nCount;++i,--pLHBack,--pRHBack) @@ -114,52 +114,52 @@ namespace connectivity typedef ::std::map< ::com::sun::star::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; class OOO_DLLPUBLIC_ODBCBASE OResultSet : - public comphelper::OBaseMutex, - public ::connectivity::IResultSetHelper, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + public comphelper::OBaseMutex, + public ::connectivity::IResultSetHelper, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - TBookmarkPosMap m_aPosToBookmarks; + TBookmarkPosMap m_aPosToBookmarks; // used top hold the information about the value and the datatype to save calls to metadata - typedef ::std::vector<ORowSetValue> TDataRow; + typedef ::std::vector<ORowSetValue> TDataRow; - TVoidVector m_aBindVector; - ::std::vector<SQLLEN> m_aLengthVector; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; - ::com::sun::star::uno::Sequence<sal_Int8> m_aBookmark; + TVoidVector m_aBindVector; + ::std::vector<SQLLEN> m_aLengthVector; + ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + ::com::sun::star::uno::Sequence<sal_Int8> m_aBookmark; - TDataRow m_aRow; // only used when SQLGetData can't be called in any order - ORowSetValue m_aEmptyValue; // needed for the getValue method when no prefetch is used - SQLHANDLE m_aStatementHandle; - SQLHANDLE m_aConnectionHandle; - OStatement_Base* m_pStatement; - OSkipDeletedSet* m_pSkipDeletedSet; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + TDataRow m_aRow; // only used when SQLGetData can't be called in any order + ORowSetValue m_aEmptyValue; // needed for the getValue method when no prefetch is used + SQLHANDLE m_aStatementHandle; + SQLHANDLE m_aConnectionHandle; + OStatement_Base* m_pStatement; + OSkipDeletedSet* m_pSkipDeletedSet; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - SQLUSMALLINT* m_pRowStatusArray; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are + SQLUSMALLINT* m_pRowStatusArray; + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are mutable sal_uInt32 m_nUseBookmarks; - SQLRETURN m_nCurrentFetchState; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bLastRecord; - sal_Bool m_bFreeHandle; - sal_Bool m_bInserting; - sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow - sal_Bool m_bRowInserted; - sal_Bool m_bRowDeleted; - sal_Bool m_bUseFetchScroll; + SQLRETURN m_nCurrentFetchState; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; // after last record + sal_Bool m_bLastRecord; + sal_Bool m_bFreeHandle; + sal_Bool m_bInserting; + sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow + sal_Bool m_bRowInserted; + sal_Bool m_bRowDeleted; + sal_Bool m_bUseFetchScroll; - sal_Bool isBookmarkable() const; + sal_Bool isBookmarkable() const; sal_Int32 getResultSetConcurrency() const; - sal_Int32 getResultSetType() const; - sal_Int32 getFetchDirection() const; - sal_Int32 getFetchSize() const; - ::rtl::OUString getCursorName() const; + sal_Int32 getResultSetType() const; + sal_Int32 getFetchDirection() const; + sal_Int32 getFetchSize() const; + ::rtl::OUString getCursorName() const; void setFetchDirection(sal_Int32 _par0); void setFetchSize(sal_Int32 _par0); @@ -175,7 +175,7 @@ namespace connectivity TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex); SQLRETURN unbind(sal_Bool _bUnbindHandle = sal_True); SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex); - + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index 213db25288dc..86e2441d38cd 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,28 +48,28 @@ namespace connectivity typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData : - public OResultSetMetaData_BASE + public OResultSetMetaData_BASE { protected: ::std::vector<sal_Int32> m_vMapping; // when not every column is needed ::std::map<sal_Int32,sal_Int32> m_aColumnTypes; - SQLHANDLE m_aStatementHandle; - OConnection* m_pConnection; - sal_Int32 m_nColCount; - sal_Bool m_bUseODBC2Types; + SQLHANDLE m_aStatementHandle; + OConnection* m_pConnection; + sal_Int32 m_nColCount; + sal_Bool m_bUseODBC2Types; ::rtl::OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ) + OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ) :m_aStatementHandle( _pStmt ) ,m_pConnection(_pConnection) ,m_nColCount(-1) ,m_bUseODBC2Types(sal_False) {} - OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping) + OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping) :m_vMapping(_vMapping) ,m_aStatementHandle( _pStmt ) ,m_pConnection(_pConnection) diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 3532156e7d94..97a1254e1806 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace connectivity namespace odbc { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable, @@ -66,23 +66,23 @@ namespace connectivity //************************************************************** class OOO_DLLPUBLIC_ODBCBASE OStatement_Base : public comphelper::OBaseMutex, - public OStatement_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> + public OStatement_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> { ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; - ::rtl::OUString m_sSqlStatement; + ::std::list< ::rtl::OUString> m_aBatchList; + ::rtl::OUString m_sSqlStatement; - OConnection* m_pConnection;// The owning Connection object - SQLHANDLE m_aStatementHandle; - SQLUSMALLINT* m_pRowStatusArray; + OConnection* m_pConnection;// The owning Connection object + SQLHANDLE m_aStatementHandle; + SQLUSMALLINT* m_pRowStatusArray; ::cppu::OBroadcastHelper& rBHelper; protected: @@ -90,26 +90,26 @@ namespace connectivity sal_Int32 getQueryTimeOut() const; sal_Int32 getMaxFieldSize() const; sal_Int32 getMaxRows() const; - sal_Int32 getResultSetConcurrency() const; + sal_Int32 getResultSetConcurrency() const; sal_Int32 getResultSetType() const; sal_Int32 getFetchDirection() const; sal_Int32 getFetchSize() const; ::rtl::OUString getCursorName() const; - sal_Bool isUsingBookmarks() const; + sal_Bool isUsingBookmarks() const; sal_Bool getEscapeProcessing() const; sal_Int32 getStmtOption (short fOption) const; - void setQueryTimeOut(sal_Int32 _par0) ; - void setMaxFieldSize(sal_Int32 _par0) ; - void setMaxRows(sal_Int32 _par0) ; - void setFetchDirection(sal_Int32 _par0) ; - void setFetchSize(sal_Int32 _par0) ; + void setQueryTimeOut(sal_Int32 _par0) ; + void setMaxFieldSize(sal_Int32 _par0) ; + void setMaxRows(sal_Int32 _par0) ; + void setFetchDirection(sal_Int32 _par0) ; + void setFetchSize(sal_Int32 _par0) ; void setCursorName(const ::rtl::OUString &_par0); void setEscapeProcessing( const sal_Bool _bEscapeProc ); - virtual void setResultSetConcurrency(sal_Int32 _par0) ; - virtual void setResultSetType(sal_Int32 _par0) ; - virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; + virtual void setResultSetConcurrency(sal_Int32 _par0) ; + virtual void setResultSetType(sal_Int32 _par0) ; + virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; void reset () throw( ::com::sun::star::sdbc::SQLException); void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); @@ -197,8 +197,8 @@ namespace connectivity SQLHANDLE getConnectionHandle() { return m_pConnection->getConnection(); } OConnection* getOwnConnection() const { return m_pConnection;} /** getCursorProperties return the properties for a specific cursor type - @param _nCursorType the CursorType - @param bFirst when true the first property set is returned + @param _nCursorType the CursorType + @param bFirst when true the first property set is returned @return the cursor properties */ diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index 7f48373e22f4..e493cec4544f 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,60 +39,60 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/textenc.h> -#define ODBC3SQLAllocHandle 1 -#define ODBC3SQLConnect 2 -#define ODBC3SQLDriverConnect 3 -#define ODBC3SQLBrowseConnect 4 -#define ODBC3SQLDataSources 5 -#define ODBC3SQLDrivers 6 -#define ODBC3SQLGetInfo 7 -#define ODBC3SQLGetFunctions 8 -#define ODBC3SQLGetTypeInfo 9 -#define ODBC3SQLSetConnectAttr 10 -#define ODBC3SQLGetConnectAttr 11 -#define ODBC3SQLSetEnvAttr 12 -#define ODBC3SQLGetEnvAttr 13 -#define ODBC3SQLSetStmtAttr 14 -#define ODBC3SQLGetStmtAttr 15 -#define ODBC3SQLPrepare 16 -#define ODBC3SQLBindParameter 17 -#define ODBC3SQLSetCursorName 18 -#define ODBC3SQLExecute 19 -#define ODBC3SQLExecDirect 20 -#define ODBC3SQLDescribeParam 21 -#define ODBC3SQLNumParams 22 -#define ODBC3SQLParamData 23 -#define ODBC3SQLPutData 24 -#define ODBC3SQLRowCount 25 -#define ODBC3SQLNumResultCols 26 -#define ODBC3SQLDescribeCol 27 -#define ODBC3SQLColAttribute 28 -#define ODBC3SQLBindCol 29 -#define ODBC3SQLFetch 30 -#define ODBC3SQLFetchScroll 31 -#define ODBC3SQLGetData 32 -#define ODBC3SQLSetPos 33 -#define ODBC3SQLBulkOperations 34 -#define ODBC3SQLMoreResults 35 -#define ODBC3SQLGetDiagRec 36 -#define ODBC3SQLColumnPrivileges 37 -#define ODBC3SQLColumns 38 -#define ODBC3SQLForeignKeys 39 -#define ODBC3SQLPrimaryKeys 40 -#define ODBC3SQLProcedureColumns 41 -#define ODBC3SQLProcedures 42 -#define ODBC3SQLSpecialColumns 43 -#define ODBC3SQLStatistics 44 -#define ODBC3SQLTablePrivileges 45 -#define ODBC3SQLTables 46 -#define ODBC3SQLFreeStmt 47 -#define ODBC3SQLCloseCursor 48 -#define ODBC3SQLCancel 49 -#define ODBC3SQLEndTran 50 -#define ODBC3SQLDisconnect 51 -#define ODBC3SQLFreeHandle 52 -#define ODBC3SQLGetCursorName 53 -#define ODBC3SQLNativeSql 54 +#define ODBC3SQLAllocHandle 1 +#define ODBC3SQLConnect 2 +#define ODBC3SQLDriverConnect 3 +#define ODBC3SQLBrowseConnect 4 +#define ODBC3SQLDataSources 5 +#define ODBC3SQLDrivers 6 +#define ODBC3SQLGetInfo 7 +#define ODBC3SQLGetFunctions 8 +#define ODBC3SQLGetTypeInfo 9 +#define ODBC3SQLSetConnectAttr 10 +#define ODBC3SQLGetConnectAttr 11 +#define ODBC3SQLSetEnvAttr 12 +#define ODBC3SQLGetEnvAttr 13 +#define ODBC3SQLSetStmtAttr 14 +#define ODBC3SQLGetStmtAttr 15 +#define ODBC3SQLPrepare 16 +#define ODBC3SQLBindParameter 17 +#define ODBC3SQLSetCursorName 18 +#define ODBC3SQLExecute 19 +#define ODBC3SQLExecDirect 20 +#define ODBC3SQLDescribeParam 21 +#define ODBC3SQLNumParams 22 +#define ODBC3SQLParamData 23 +#define ODBC3SQLPutData 24 +#define ODBC3SQLRowCount 25 +#define ODBC3SQLNumResultCols 26 +#define ODBC3SQLDescribeCol 27 +#define ODBC3SQLColAttribute 28 +#define ODBC3SQLBindCol 29 +#define ODBC3SQLFetch 30 +#define ODBC3SQLFetchScroll 31 +#define ODBC3SQLGetData 32 +#define ODBC3SQLSetPos 33 +#define ODBC3SQLBulkOperations 34 +#define ODBC3SQLMoreResults 35 +#define ODBC3SQLGetDiagRec 36 +#define ODBC3SQLColumnPrivileges 37 +#define ODBC3SQLColumns 38 +#define ODBC3SQLForeignKeys 39 +#define ODBC3SQLPrimaryKeys 40 +#define ODBC3SQLProcedureColumns 41 +#define ODBC3SQLProcedures 42 +#define ODBC3SQLSpecialColumns 43 +#define ODBC3SQLStatistics 44 +#define ODBC3SQLTablePrivileges 45 +#define ODBC3SQLTables 46 +#define ODBC3SQLFreeStmt 47 +#define ODBC3SQLCloseCursor 48 +#define ODBC3SQLCancel 49 +#define ODBC3SQLEndTran 50 +#define ODBC3SQLDisconnect 51 +#define ODBC3SQLFreeHandle 52 +#define ODBC3SQLGetCursorName 53 +#define ODBC3SQLNativeSql 54 namespace connectivity { @@ -101,12 +101,12 @@ namespace connectivity class OConnection; const sal_uInt32 ODBC_FRACTION_UNITS_PER_HSECOND = 10000000L; - const sal_Int32 MAX_PUT_DATA_LENGTH = 2000; + const sal_Int32 MAX_PUT_DATA_LENGTH = 2000; class OOO_DLLPUBLIC_ODBCBASE OTools { public: - static void ThrowException( OConnection* _pConnection, + static void ThrowException( OConnection* _pConnection, SQLRETURN _rRetCode, SQLHANDLE _pContext, SQLSMALLINT _nHandleType, @@ -115,7 +115,7 @@ namespace connectivity rtl_TextEncoding _nTextEncoding = RTL_TEXTENCODING_MS_1252) throw(::com::sun::star::sdbc::SQLException); - static void GetInfo(OConnection* _pConnection, + static void GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, ::rtl::OUString &_rValue, @@ -140,7 +140,7 @@ namespace connectivity SQLUSMALLINT _nInfo, SQLUINTEGER &_rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + static void GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, @@ -153,38 +153,38 @@ namespace connectivity static DATE_STRUCT DateToOdbcDate(const ::com::sun::star::util::Date& x) { DATE_STRUCT aVal; - aVal.year = x.Year; - aVal.month = x.Month; - aVal.day = x.Day; + aVal.year = x.Year; + aVal.month = x.Month; + aVal.day = x.Day; return aVal; } static TIME_STRUCT TimeToOdbcTime(const ::com::sun::star::util::Time& x) { TIME_STRUCT aVal; - aVal.hour = x.Hours; - aVal.minute = x.Minutes; - aVal.second = x.Seconds; + aVal.hour = x.Hours; + aVal.minute = x.Minutes; + aVal.second = x.Seconds; return aVal; } static TIMESTAMP_STRUCT DateTimeToTimestamp(const ::com::sun::star::util::DateTime& x) { TIMESTAMP_STRUCT aVal; - aVal.year = x.Year; - aVal.month = x.Month; - aVal.day = x.Day; - aVal.hour = x.Hours; - aVal.minute = x.Minutes; - aVal.second = x.Seconds; - aVal.fraction = x.HundredthSeconds * ODBC_FRACTION_UNITS_PER_HSECOND; + aVal.year = x.Year; + aVal.month = x.Month; + aVal.day = x.Day; + aVal.hour = x.Hours; + aVal.minute = x.Minutes; + aVal.second = x.Seconds; + aVal.fraction = x.HundredthSeconds * ODBC_FRACTION_UNITS_PER_HSECOND; return aVal; } - /** + /** getBindTypes set the ODBC type for C - @param _bUseWChar true when Unicode should be used - @param _bUseOldTimeDate true when the old datetime format should be used - @param _nOdbcType the ODBC sql type - @param fCType the C type for the ODBC type - @param fSqlType the SQL type for the ODBC type + @param _bUseWChar true when Unicode should be used + @param _bUseOldTimeDate true when the old datetime format should be used + @param _nOdbcType the ODBC sql type + @param fCType the C type for the ODBC type + @param fSqlType the SQL type for the ODBC type */ static void getBindTypes(sal_Bool _bUseWChar, sal_Bool _bUseOldTimeDate, @@ -192,7 +192,7 @@ namespace connectivity SQLSMALLINT& fCType, SQLSMALLINT& fSqlType); - static ::rtl::OUString getStringValue( OConnection* _pConnection, + static ::rtl::OUString getStringValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _fSqlType, @@ -200,13 +200,13 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection, + static ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _fSqlType, sal_Bool &_bWasNull, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void getValue( OConnection* _pConnection, + static void getValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, @@ -215,16 +215,16 @@ namespace connectivity void* _pValue, SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - /** + /** bindData copies the from pValue to pData - @param _nOdbcType the ODBC sql type - @param _bUseWChar true when Unicode should be used - @param _pData contains a copy of the data to be set - @param _pValue contains the data to be copied - @param _nTextEncoding the text encoding - @param _nColumnSize the columnsize which is a out param + @param _nOdbcType the ODBC sql type + @param _bUseWChar true when Unicode should be used + @param _pData contains a copy of the data to be set + @param _pValue contains the data to be copied + @param _nTextEncoding the text encoding + @param _nColumnSize the columnsize which is a out param */ - static void bindData( SQLSMALLINT _nOdbcType, + static void bindData( SQLSMALLINT _nOdbcType, sal_Bool _bUseWChar, sal_Int8 *&_pData, SQLLEN*& pLen, @@ -232,9 +232,9 @@ namespace connectivity rtl_TextEncoding _nTextEncoding, SQLULEN& _nColumnSize); - static void bindParameter( OConnection* _pConnection, + static void bindParameter( OConnection* _pConnection, SQLHANDLE _hStmt, - sal_Int32 nPos, + sal_Int32 nPos, sal_Int8*& pDataBuffer, sal_Int8* pLenBuffer, SQLSMALLINT _nJDBCtype, @@ -245,20 +245,20 @@ namespace connectivity rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void bindValue( OConnection* _pConnection, + static void bindValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, SQLSMALLINT _nMaxLen, const void* _pValue, - void* _pData, + void* _pData, SQLLEN *pLen, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding, sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - template <class T> void getValue( OConnection* _pConnection, + template <class T> void getValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, @@ -266,11 +266,11 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, T& _rValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue); + OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue); } //----------------------------------------------------------------------------- - + } } #endif // _CONNECTIVITY_OTOOLS_HXX_ diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx index e533ecdcdfd9..31ac8636e6c9 100644 --- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx +++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index f9cce49cd62d..eaa2f3e08b2d 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace connectivity struct OOO_DLLPUBLIC_DBTOOLS UStringDescription { - const sal_Char* pZeroTerminatedName; + const sal_Char* pZeroTerminatedName; sal_Int32 nLength; UStringDescription(PVFN _fCharFkt); @@ -77,84 +77,84 @@ 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(reinterpret_cast< type*>(NULL)), //------------------------------------------------------------------------------ -#define DECL_PROP0(varname, type) \ +#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) \ +#define DECL_BOOL_PROP0(varname) \ DECL_BOOL_PROP1IMPL(varname) 0) -#define PROPERTY_ID_QUERYTIMEOUT 1 -#define PROPERTY_ID_MAXFIELDSIZE 2 -#define PROPERTY_ID_MAXROWS 3 -#define PROPERTY_ID_CURSORNAME 4 -#define PROPERTY_ID_RESULTSETCONCURRENCY 5 -#define PROPERTY_ID_RESULTSETTYPE 6 -#define PROPERTY_ID_FETCHDIRECTION 7 -#define PROPERTY_ID_FETCHSIZE 8 -#define PROPERTY_ID_ESCAPEPROCESSING 9 -#define PROPERTY_ID_USEBOOKMARKS 10 +#define PROPERTY_ID_QUERYTIMEOUT 1 +#define PROPERTY_ID_MAXFIELDSIZE 2 +#define PROPERTY_ID_MAXROWS 3 +#define PROPERTY_ID_CURSORNAME 4 +#define PROPERTY_ID_RESULTSETCONCURRENCY 5 +#define PROPERTY_ID_RESULTSETTYPE 6 +#define PROPERTY_ID_FETCHDIRECTION 7 +#define PROPERTY_ID_FETCHSIZE 8 +#define PROPERTY_ID_ESCAPEPROCESSING 9 +#define PROPERTY_ID_USEBOOKMARKS 10 // Column -#define PROPERTY_ID_NAME 11 -#define PROPERTY_ID_TYPE 12 -#define PROPERTY_ID_TYPENAME 13 -#define PROPERTY_ID_PRECISION 14 -#define PROPERTY_ID_SCALE 15 -#define PROPERTY_ID_ISNULLABLE 16 -#define PROPERTY_ID_ISAUTOINCREMENT 17 -#define PROPERTY_ID_ISROWVERSION 18 -#define PROPERTY_ID_DESCRIPTION 19 -#define PROPERTY_ID_DEFAULTVALUE 20 - -#define PROPERTY_ID_REFERENCEDTABLE 21 -#define PROPERTY_ID_UPDATERULE 22 -#define PROPERTY_ID_DELETERULE 23 -#define PROPERTY_ID_CATALOG 24 -#define PROPERTY_ID_ISUNIQUE 25 -#define PROPERTY_ID_ISPRIMARYKEYINDEX 26 -#define PROPERTY_ID_ISCLUSTERED 27 -#define PROPERTY_ID_ISASCENDING 28 -#define PROPERTY_ID_SCHEMANAME 29 -#define PROPERTY_ID_CATALOGNAME 30 - -#define PROPERTY_ID_COMMAND 31 -#define PROPERTY_ID_CHECKOPTION 32 -#define PROPERTY_ID_PASSWORD 33 -#define PROPERTY_ID_RELATEDCOLUMN 34 - -#define PROPERTY_ID_FUNCTION 35 -#define PROPERTY_ID_TABLENAME 36 -#define PROPERTY_ID_REALNAME 37 -#define PROPERTY_ID_DBASEPRECISIONCHANGED 38 -#define PROPERTY_ID_ISCURRENCY 39 -#define PROPERTY_ID_ISBOOKMARKABLE 40 - -#define PROPERTY_ID_INVALID_INDEX 41 -#define PROPERTY_ID_HY010 43 +#define PROPERTY_ID_NAME 11 +#define PROPERTY_ID_TYPE 12 +#define PROPERTY_ID_TYPENAME 13 +#define PROPERTY_ID_PRECISION 14 +#define PROPERTY_ID_SCALE 15 +#define PROPERTY_ID_ISNULLABLE 16 +#define PROPERTY_ID_ISAUTOINCREMENT 17 +#define PROPERTY_ID_ISROWVERSION 18 +#define PROPERTY_ID_DESCRIPTION 19 +#define PROPERTY_ID_DEFAULTVALUE 20 + +#define PROPERTY_ID_REFERENCEDTABLE 21 +#define PROPERTY_ID_UPDATERULE 22 +#define PROPERTY_ID_DELETERULE 23 +#define PROPERTY_ID_CATALOG 24 +#define PROPERTY_ID_ISUNIQUE 25 +#define PROPERTY_ID_ISPRIMARYKEYINDEX 26 +#define PROPERTY_ID_ISCLUSTERED 27 +#define PROPERTY_ID_ISASCENDING 28 +#define PROPERTY_ID_SCHEMANAME 29 +#define PROPERTY_ID_CATALOGNAME 30 + +#define PROPERTY_ID_COMMAND 31 +#define PROPERTY_ID_CHECKOPTION 32 +#define PROPERTY_ID_PASSWORD 33 +#define PROPERTY_ID_RELATEDCOLUMN 34 + +#define PROPERTY_ID_FUNCTION 35 +#define PROPERTY_ID_TABLENAME 36 +#define PROPERTY_ID_REALNAME 37 +#define PROPERTY_ID_DBASEPRECISIONCHANGED 38 +#define PROPERTY_ID_ISCURRENCY 39 +#define PROPERTY_ID_ISBOOKMARKABLE 40 + +#define PROPERTY_ID_INVALID_INDEX 41 +#define PROPERTY_ID_HY010 43 #define PROPERTY_ID_LABEL 44 -#define PROPERTY_ID_DELIMITER 45 -#define PROPERTY_ID_FORMATKEY 46 -#define PROPERTY_ID_LOCALE 47 -#define PROPERTY_ID_IM001 48 - -#define PROPERTY_ID_AUTOINCREMENTCREATION 49 - -#define PROPERTY_ID_PRIVILEGES 50 -#define PROPERTY_ID_HAVINGCLAUSE 51 - -#define PROPERTY_ID_ISSIGNED 52 -#define PROPERTY_ID_AGGREGATEFUNCTION 53 -#define PROPERTY_ID_ISSEARCHABLE 54 - -#define PROPERTY_ID_APPLYFILTER 55 -#define PROPERTY_ID_FILTER 56 -#define PROPERTY_ID_MASTERFIELDS 57 -#define PROPERTY_ID_DETAILFIELDS 58 -#define PROPERTY_ID_FIELDTYPE 59 -#define PROPERTY_ID_VALUE 60 +#define PROPERTY_ID_DELIMITER 45 +#define PROPERTY_ID_FORMATKEY 46 +#define PROPERTY_ID_LOCALE 47 +#define PROPERTY_ID_IM001 48 + +#define PROPERTY_ID_AUTOINCREMENTCREATION 49 + +#define PROPERTY_ID_PRIVILEGES 50 +#define PROPERTY_ID_HAVINGCLAUSE 51 + +#define PROPERTY_ID_ISSIGNED 52 +#define PROPERTY_ID_AGGREGATEFUNCTION 53 +#define PROPERTY_ID_ISSEARCHABLE 54 + +#define PROPERTY_ID_APPLYFILTER 55 +#define PROPERTY_ID_FILTER 56 +#define PROPERTY_ID_MASTERFIELDS 57 +#define PROPERTY_ID_DETAILFIELDS 58 +#define PROPERTY_ID_FIELDTYPE 59 +#define PROPERTY_ID_VALUE 60 #define PROPERTY_ID_ACTIVE_CONNECTION 61 #endif // _CONNECTIVITY_PROPERTYIDS_HXX_ diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc index a5911dcd0e98..edceb2658cf6 100644 --- a/connectivity/source/inc/resource/adabas_res.hrc +++ b/connectivity/source/inc/resource/adabas_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc index 717e194ca3a4..115936ea3794 100644 --- a/connectivity/source/inc/resource/ado_res.hrc +++ b/connectivity/source/inc/resource/ado_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc index e71901814140..fbb86e5fa4cb 100644 --- a/connectivity/source/inc/resource/calc_res.hrc +++ b/connectivity/source/inc/resource/calc_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc index ac7cb89a630e..543231c4e15d 100644 --- a/connectivity/source/inc/resource/common_res.hrc +++ b/connectivity/source/inc/resource/common_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc index 981f5a89b4df..45f839925969 100644 --- a/connectivity/source/inc/resource/conn_shared_res.hrc +++ b/connectivity/source/inc/resource/conn_shared_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc index d4b31e614ced..698f31dd7ac8 100644 --- a/connectivity/source/inc/resource/dbase_res.hrc +++ b/connectivity/source/inc/resource/dbase_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc index ebe7170beb96..73f6214c24a4 100644 --- a/connectivity/source/inc/resource/evoab2_res.hrc +++ b/connectivity/source/inc/resource/evoab2_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc index bbc451920ef4..b5b7b98073b0 100644 --- a/connectivity/source/inc/resource/file_res.hrc +++ b/connectivity/source/inc/resource/file_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc index 640ed8f5ce81..c2b1f077699b 100644 --- a/connectivity/source/inc/resource/hsqldb_res.hrc +++ b/connectivity/source/inc/resource/hsqldb_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc index ff2c483f0948..e12e91516a2b 100644 --- a/connectivity/source/inc/resource/jdbc_log.hrc +++ b/connectivity/source/inc/resource/jdbc_log.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc index b03eecdb2b90..789d4a832ded 100644 --- a/connectivity/source/inc/resource/kab_res.hrc +++ b/connectivity/source/inc/resource/kab_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc index 74d64aa28ad8..fca426111cdb 100644 --- a/connectivity/source/inc/resource/macab_res.hrc +++ b/connectivity/source/inc/resource/macab_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc index 01e93ae17fd5..30aaa791f766 100644 --- a/connectivity/source/inc/resource/mozab_res.hrc +++ b/connectivity/source/inc/resource/mozab_res.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index aaac66c20539..ae6a770ce539 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ namespace connectivity the ASCII string which is to search in the string. Must not be <NULL/>. @param _rStringToSubstitute the String which should substitute the ASCII pattern. - + @return the string from the resource file, with applied string substitution */ @@ -98,7 +98,7 @@ namespace connectivity the ASCII string (2) which is to search in the string. Must not be <NULL/>. @param _rStringToSubstitute2 the String which should substitute the ASCII pattern (2) - + @return the string from the resource file, with applied string substitution */ @@ -128,7 +128,7 @@ namespace connectivity the ASCII string (3) which is to search in the string. Must not be <NULL/>. @param _rStringToSubstitute3 the String which should substitute the ASCII pattern (3) - + @return the string from the resource file, with applied string substitution */ diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index 8a5004a29b00..b9b482c241fc 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OSQLScanner { - const IParseContext* m_pContext; // context for parse, knows all international stuff - ::rtl::OString m_sStatement; // statement to parse - ::rtl::OUString m_sErrorMessage; + const IParseContext* m_pContext; // context for parse, knows all international stuff + ::rtl::OString m_sStatement; // statement to parse + ::rtl::OUString m_sErrorMessage; - sal_Int32 m_nCurrentPos; // next position to read from the statement - sal_Bool m_bInternational; // do we have a statement which may uses - sal_Int32 m_nRule; // rule to be set + sal_Int32 m_nCurrentPos; // next position to read from the statement + sal_Bool m_bInternational; // do we have a statement which may uses + sal_Int32 m_nRule; // rule to be set public: OSQLScanner(); @@ -78,12 +78,12 @@ namespace connectivity void setScanner(sal_Bool _bNull=sal_False); // rules settings void SetRule(sal_Int32 nRule) {m_nRule = nRule;} - sal_Int32 GetCurrentRule() const; - sal_Int32 GetGERRule() const; - sal_Int32 GetENGRule() const; - sal_Int32 GetSQLRule() const; - sal_Int32 GetDATERule() const; - sal_Int32 GetSTRINGRule() const; + sal_Int32 GetCurrentRule() const; + sal_Int32 GetGERRule() const; + sal_Int32 GetENGRule() const; + sal_Int32 GetSQLRule() const; + sal_Int32 GetDATERule() const; + sal_Int32 GetSTRINGRule() const; inline sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } }; } |