diff options
Diffstat (limited to 'connectivity/source')
7 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index b84132c880b1..f91f11b923f2 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -42,7 +42,7 @@ namespace connectivity { namespace java { namespace sql { } } - ConnectionLog::ConnectionLog( const ::comphelper::ResourceBasedEventLogger& _rDriverLog ) + ConnectionLog::ConnectionLog( const ::comphelper::EventLogger& _rDriverLog ) :ConnectionLog_Base( _rDriverLog ) ,m_nObjectID( lcl_getFreeID( CONNECTION ) ) { diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx index 6c2d37122e5a..5f1d1349fb26 100644 --- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx +++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx @@ -31,7 +31,7 @@ namespace connectivity { namespace jdbc using ::connectivity::java_lang_Object; ContextClassLoaderScope::ContextClassLoaderScope( JNIEnv& environment, const GlobalRef< jobject >& newClassLoader, - const ::comphelper::ResourceBasedEventLogger& _rLoggerForErrors, const Reference< XInterface >& _rxErrorContext ) + const ::comphelper::EventLogger& _rLoggerForErrors, const Reference< XInterface >& _rxErrorContext ) :m_environment( environment ) ,m_currentThread( environment ) ,m_oldContextClassLoader( environment ) diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 0ddd162b8727..4f68ea755701 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -198,7 +198,7 @@ namespace } -void java_lang_Object::ThrowLoggedSQLException( const ::comphelper::ResourceBasedEventLogger& _rLogger, JNIEnv* _pEnvironment, +void java_lang_Object::ThrowLoggedSQLException( const ::comphelper::EventLogger& _rLogger, JNIEnv* _pEnvironment, const Reference< XInterface >& _rxContext ) { SQLException aException; diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index 174c3e9377ea..5ad955e67e07 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -24,7 +24,7 @@ namespace comphelper { - class ResourceBasedEventLogger; + class EventLogger; } @@ -51,7 +51,7 @@ namespace connectivity { namespace jdbc ContextClassLoaderScope( JNIEnv& environment, const GlobalRef< jobject >& newClassLoader, - const ::comphelper::ResourceBasedEventLogger& _rLoggerForErrors, + const ::comphelper::EventLogger& _rLoggerForErrors, const css::uno::Reference< css::uno::XInterface >& _rxErrorContext ); diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index c1476e77995f..f7d136ceacc0 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -35,7 +35,7 @@ namespace comphelper { - class ResourceBasedEventLogger; + class EventLogger; } namespace connectivity @@ -97,7 +97,7 @@ namespace connectivity static void ThrowSQLException(JNIEnv * pEnv,const css::uno::Reference< css::uno::XInterface> & _rContext); static void ThrowLoggedSQLException( - const ::comphelper::ResourceBasedEventLogger& _rLogger, + const ::comphelper::EventLogger& _rLogger, JNIEnv* pEnvironment, const css::uno::Reference< css::uno::XInterface >& _rxContext ); diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index 5871f3b09823..416c17014971 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx @@ -58,7 +58,7 @@ namespace connectivity namespace connectivity { namespace java { namespace sql { - typedef ::comphelper::ResourceBasedEventLogger ConnectionLog_Base; + typedef ::comphelper::EventLogger ConnectionLog_Base; class ConnectionLog : public ConnectionLog_Base { public: @@ -76,7 +76,7 @@ namespace connectivity { namespace java { namespace sql { public: /// will construct an instance of ObjectType CONNECTION - ConnectionLog( const ::comphelper::ResourceBasedEventLogger& _rDriverLog ); + ConnectionLog( const ::comphelper::EventLogger & _rDriverLog ); /// will create an instance with the same object ID / ObjectType as a given source instance ConnectionLog( const ConnectionLog& _rSourceLog ); /// will create an instance of arbitrary ObjectType diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 8e1a20aa70b9..a295ffd83557 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -35,7 +35,7 @@ namespace connectivity class java_sql_Driver : public ::cppu::WeakImplHelper< css::sdbc::XDriver,css::lang::XServiceInfo> { css::uno::Reference<css::uno::XComponentContext> m_aContext; - ::comphelper::ResourceBasedEventLogger m_aLogger; + ::comphelper::EventLogger m_aLogger; protected: virtual ~java_sql_Driver() override; @@ -61,7 +61,7 @@ namespace connectivity virtual sal_Int32 SAL_CALL getMinorVersion( ) override; const css::uno::Reference<css::uno::XComponentContext>& getContext() const { return m_aContext; } - const ::comphelper::ResourceBasedEventLogger& getLogger() const { return m_aLogger; } + const ::comphelper::EventLogger& getLogger() const { return m_aLogger; } }; } |