diff options
Diffstat (limited to 'connectivity/source/inc/java')
32 files changed, 122 insertions, 122 deletions
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 |