another name for a nonlocalized string is a string

Change-Id: Ic4ff92720edd1c10dd6d5eff026e79cb02990005

13 files changed, 99 insertions, 408 deletions

diff --git a/connectivity/AllLangResTarget_sdbcl.mk b/connectivity/AllLangResTarget_sdbcl.mk
deleted file mode 100644
index 0e6408ee9fb4..000000000000
--- a/connectivity/AllLangResTarget_sdbcl.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbcl))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sdbcl,\
-	sdbcl/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sdbcl/res))
-
-$(eval $(call gb_SrsTarget_set_include,sdbcl/res,\
-	-I$(SRCDIR)/connectivity/source/inc \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sdbcl/res,\
-	connectivity/source/resource/conn_log_res.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index e7043a77613e..2c5904b489aa 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 
 $(eval $(call gb_Module_add_l10n_targets,connectivity,\
 	AllLangResTarget_cnr \
-	AllLangResTarget_sdbcl \
 	AllLangResTarget_sdberr \
 ))
 
diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx
new file mode 100644
index 000000000000..a514191d4488
--- /dev/null
+++ b/connectivity/inc/strings.hxx
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CONNECTIVITY_INC_STRINGS_HXX
+#define INCLUDED_CONNECTIVITY_INC_STRINGS_HXX
+
+// = log messages for the JDBC driver
+
+#define STR_LOG_DRIVER_CONNECTING_URL       "jdbcBridge: connecting to URL '$1$'"
+#define STR_LOG_DRIVER_SUCCESS              "jdbcBridge: success"
+#define STR_LOG_CREATE_STATEMENT            "c$1$: creating statement"
+#define STR_LOG_CREATED_STATEMENT_ID        "c$1$: created statement, statement id: s$2$"
+#define STR_LOG_PREPARE_STATEMENT           "c$1$: preparing statement: $2$"
+#define STR_LOG_PREPARED_STATEMENT_ID       "c$1$: prepared statement, statement id: s$2$"
+#define STR_LOG_PREPARE_CALL                "c$1$: preparing call: $2$"
+#define STR_LOG_PREPARED_CALL_ID            "c$1$: prepared call, statement id: s$2$"
+#define STR_LOG_NATIVE_SQL                  "c$1$: native SQL: $2$ -> $3$"
+#define STR_LOG_LOADING_DRIVER              "c$1$: attempting to load driver class $2$"
+#define STR_LOG_NO_DRIVER_CLASS             "c$1$: no Java Driver Class was provided"
+#define STR_LOG_CONN_SUCCESS                "c$1$: success"
+#define STR_LOG_NO_SYSTEM_CONNECTION        "c$1$: JDBC driver did not provide a JDBC connection"
+#define STR_LOG_GOT_JDBC_CONNECTION         "c$1$: obtained a JDBC connection for $2$"
+#define STR_LOG_SHUTDOWN_CONNECTION         "c$1$: shutting down connection"
+#define STR_LOG_GENERATED_VALUES            "s$1$: retrieving generated values"
+#define STR_LOG_GENERATED_VALUES_FALLBACK   "s$1$: getGeneratedValues: falling back to statement: $2$"
+#define STR_LOG_EXECUTE_STATEMENT           "s$1$: going to execute: $2$"
+#define STR_LOG_EXECUTE_QUERY               "s$1$: going to execute query: $2$"
+#define STR_LOG_CLOSING_STATEMENT           "s$1$: closing/disposing statement"
+#define STR_LOG_EXECUTE_UPDATE              "s$1$: going to execute update: $2$"
+#define STR_LOG_UPDATE_COUNT                "s$1$: update count: $2$"
+#define STR_LOG_RESULT_SET_CONCURRENCY      "s$1$: going to set result set concurrency: $2$"
+#define STR_LOG_RESULT_SET_TYPE             "s$1$: going to set result set type: $2$"
+#define STR_LOG_FETCH_DIRECTION             "s$1$: fetch direction: $2$"
+#define STR_LOG_FETCH_SIZE                  "s$1$: fetch size: $2$"
+#define STR_LOG_SET_ESCAPE_PROCESSING       "s$1$: going to set escape processing: $2$"
+#define STR_LOG_EXECUTING_PREPARED          "s$1$: executing previously prepared statement"
+#define STR_LOG_EXECUTING_PREPARED_UPDATE   "s$1$: executing previously prepared update statement"
+#define STR_LOG_EXECUTING_PREPARED_QUERY    "s$1$: executing previously prepared query"
+#define STR_LOG_STRING_PARAMETER            "s$1$: parameter no. $2$: type: string; value: $3$"
+#define STR_LOG_BOOLEAN_PARAMETER           "s$1$: parameter no. $2$: type: boolean; value: $3$"
+#define STR_LOG_BYTE_PARAMETER              "s$1$: parameter no. $2$: type: byte; value: $3$"
+#define STR_LOG_DATE_PARAMETER              "s$1$: parameter no. $2$: type: date; value: $3$"
+#define STR_LOG_TIME_PARAMETER              "s$1$: parameter no. $2$: type: time; value: $3$"
+#define STR_LOG_TIMESTAMP_PARAMETER         "s$1$: parameter no. $2$: type: timestamp; value: $3$"
+#define STR_LOG_DOUBLE_PARAMETER            "s$1$: parameter no. $2$: type: double; value: $3$"
+#define STR_LOG_FLOAT_PARAMETER             "s$1$: parameter no. $2$: type: float; value: $3$"
+#define STR_LOG_INT_PARAMETER               "s$1$: parameter no. $2$: type: int; value: $3$"
+#define STR_LOG_LONG_PARAMETER              "s$1$: parameter no. $2$: type: long; value: $3$"
+#define STR_LOG_NULL_PARAMETER              "s$1$: parameter no. $2$: sql-type: $3$; value: null"
+#define STR_LOG_OBJECT_NULL_PARAMETER       "s$1$: parameter no. $2$: setting to null"
+#define STR_LOG_SHORT_PARAMETER             "s$1$: parameter no. $2$: type: short; value: $3$"
+#define STR_LOG_BYTES_PARAMETER             "s$1$: parameter no. $2$: type: byte[]"
+#define STR_LOG_CHARSTREAM_PARAMETER        "s$1$: parameter no. $2$: type: character stream"
+#define STR_LOG_BINARYSTREAM_PARAMETER      "s$1$: parameter no. $2$: type: binary stream"
+#define STR_LOG_CLEAR_PARAMETERS            "s$1$: clearing all parameters"
+#define STR_LOG_META_DATA_METHOD            "c$1$: entering XDatabaseMetaData::$2$"
+#define STR_LOG_META_DATA_METHOD_ARG1       "c$1$: entering XDatabaseMetaData::$2$( '$3$' )"
+#define STR_LOG_META_DATA_METHOD_ARG2       "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )"
+#define STR_LOG_META_DATA_METHOD_ARG3       "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )"
+#define STR_LOG_META_DATA_METHOD_ARG4       "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )"
+#define STR_LOG_META_DATA_RESULT            "c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$"
+#define STR_LOG_META_DATA_SUCCESS           "c$1$: leaving XDatabaseMetaData::$2$: success"
+#define STR_LOG_THROWING_EXCEPTION          "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$"
+#define STR_LOG_SETTING_SYSTEM_PROPERTY     "setting system property \"$1$\" to value \"$2$\""
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 788da44fafd7..9967d09c5bf9 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -27,7 +27,8 @@
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <comphelper/types.hxx>
 #include "TPrivilegesResultSet.hxx"
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
+#include "strings.hxx"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 8263225bcae4..36a3518fb396 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -19,7 +19,7 @@
 
 #include "java/math/BigDecimal.hxx"
 #include "java/tools.hxx"
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
 using namespace connectivity;
 
 //************ Class: java.lang.Boolean
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index a2a73889c0d5..fce0c21ccd8e 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -36,7 +36,7 @@
 #include <connectivity/dbexception.hxx>
 #include "java/util/Property.hxx"
 #include "java/LocalRef.hxx"
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <jvmaccess/classpath.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -44,6 +44,7 @@
 #include <jni.h>
 #include "resource/common_res.hrc"
 #include <unotools/confignode.hxx>
+#include "strings.hxx"
 
 #include <list>
 #include <memory>
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 2ae3deb0f27d..32fdd4ccc9ae 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -26,11 +26,12 @@
 #include "java/tools.hxx"
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.hxx>
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include "strings.hxx"
 
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 4f3e47679391..444a1f58a500 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -36,7 +36,8 @@
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/FetchDirection.hpp>
 
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
+#include "strings.hxx"
 
 #include <algorithm>
 #include <string.h>
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 8b7c3ca98dd0..0ddd162b8727 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -26,7 +26,8 @@
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include "java/LocalRef.hxx"
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
+#include "strings.hxx"
 
 #include <comphelper/logging.hxx>
 
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 6ded278caffa..34161a71a4aa 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -30,10 +30,11 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/jdbc_log.hrc"
+#include "resource/conn_shared_res.hrc"
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
 #include "java/LocalRef.hxx"
+#include "strings.hxx"
 #include <string.h>
 #include <memory>
 
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 8fd4a3d3774b..5871f3b09823 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -85,39 +85,39 @@ namespace connectivity { namespace java { namespace sql {
         sal_Int32   getObjectID() const { return m_nObjectID; }
 
         /// logs a given message, without any arguments, or source class/method names
-        bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID )
+        bool        log( const sal_Int32 _nLogLevel, const OUString& rMessage )
         {
-            return ConnectionLog_Base::log( _nLogLevel, _nMessageResID, m_nObjectID );
+            return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID );
         }
 
         template< typename ARGTYPE1 >
-        bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1 ) const
         {
-            return ConnectionLog_Base::log( _nLogLevel, _nMessageResID, m_nObjectID, _argument1 );
+            return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1 );
         }
 
         template< typename ARGTYPE1, typename ARGTYPE2 >
-        bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
-            return ConnectionLog_Base::log( _nLogLevel, _nMessageResID, m_nObjectID, _argument1, _argument2 );
+            return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2 );
         }
 
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
-        bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
-            return ConnectionLog_Base::log( _nLogLevel, _nMessageResID, m_nObjectID, _argument1, _argument2, _argument3 );
+            return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3 );
         }
 
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
-        bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
-            return ConnectionLog_Base::log( _nLogLevel, _nMessageResID, m_nObjectID, _argument1, _argument2, _argument3, _argument4 );
+            return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4 );
         }
 
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
-        bool        log( const sal_Int32 _nLogLevel, const sal_Int32 _nMessageResID, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
-            return ConnectionLog_Base::log( _nLogLevel, _nMessageResID, m_nObjectID, _argument1, _argument2, _argument3, _argument4, _argument5 );
+            return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4, _argument5 );
         }
     };
 
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
index 38f23c607744..06b2a81b3f3b 100644
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ b/connectivity/source/inc/resource/jdbc_log.hrc
@@ -22,63 +22,6 @@
 
 #include "resource/conn_shared_res.hrc"
 
-#define STR_LOG_DRIVER_CONNECTING_URL       ( STR_JDBC_LOG_MESSAGE_BASE +  1 )
-#define STR_LOG_DRIVER_SUCCESS              ( STR_JDBC_LOG_MESSAGE_BASE +  2 )
-#define STR_LOG_CREATE_STATEMENT            ( STR_JDBC_LOG_MESSAGE_BASE +  3 )
-#define STR_LOG_CREATED_STATEMENT_ID        ( STR_JDBC_LOG_MESSAGE_BASE +  4 )
-#define STR_LOG_PREPARE_STATEMENT           ( STR_JDBC_LOG_MESSAGE_BASE +  5 )
-#define STR_LOG_PREPARED_STATEMENT_ID       ( STR_JDBC_LOG_MESSAGE_BASE +  6 )
-#define STR_LOG_PREPARE_CALL                ( STR_JDBC_LOG_MESSAGE_BASE +  7 )
-#define STR_LOG_PREPARED_CALL_ID            ( STR_JDBC_LOG_MESSAGE_BASE +  8 )
-#define STR_LOG_NATIVE_SQL                  ( STR_JDBC_LOG_MESSAGE_BASE +  9 )
-#define STR_LOG_LOADING_DRIVER              ( STR_JDBC_LOG_MESSAGE_BASE + 10 )
-#define STR_LOG_NO_DRIVER_CLASS             ( STR_JDBC_LOG_MESSAGE_BASE + 11 )
-#define STR_LOG_CONN_SUCCESS                ( STR_JDBC_LOG_MESSAGE_BASE + 12 )
-#define STR_LOG_NO_SYSTEM_CONNECTION        ( STR_JDBC_LOG_MESSAGE_BASE + 13 )
-#define STR_LOG_GOT_JDBC_CONNECTION         ( STR_JDBC_LOG_MESSAGE_BASE + 14 )
-#define STR_LOG_SHUTDOWN_CONNECTION         ( STR_JDBC_LOG_MESSAGE_BASE + 15 )
-#define STR_LOG_GENERATED_VALUES            ( STR_JDBC_LOG_MESSAGE_BASE + 16 )
-#define STR_LOG_GENERATED_VALUES_FALLBACK   ( STR_JDBC_LOG_MESSAGE_BASE + 17 )
-#define STR_LOG_EXECUTE_STATEMENT           ( STR_JDBC_LOG_MESSAGE_BASE + 18 )
-#define STR_LOG_EXECUTE_QUERY               ( STR_JDBC_LOG_MESSAGE_BASE + 19 )
-#define STR_LOG_CLOSING_STATEMENT           ( STR_JDBC_LOG_MESSAGE_BASE + 20 )
-#define STR_LOG_EXECUTE_UPDATE              ( STR_JDBC_LOG_MESSAGE_BASE + 21 )
-#define STR_LOG_UPDATE_COUNT                ( STR_JDBC_LOG_MESSAGE_BASE + 22 )
-#define STR_LOG_RESULT_SET_CONCURRENCY      ( STR_JDBC_LOG_MESSAGE_BASE + 23 )
-#define STR_LOG_RESULT_SET_TYPE             ( STR_JDBC_LOG_MESSAGE_BASE + 24 )
-#define STR_LOG_FETCH_DIRECTION             ( STR_JDBC_LOG_MESSAGE_BASE + 25 )
-#define STR_LOG_FETCH_SIZE                  ( STR_JDBC_LOG_MESSAGE_BASE + 26 )
-#define STR_LOG_SET_ESCAPE_PROCESSING       ( STR_JDBC_LOG_MESSAGE_BASE + 27 )
-#define STR_LOG_EXECUTING_PREPARED          ( STR_JDBC_LOG_MESSAGE_BASE + 28 )
-#define STR_LOG_EXECUTING_PREPARED_UPDATE   ( STR_JDBC_LOG_MESSAGE_BASE + 29 )
-#define STR_LOG_EXECUTING_PREPARED_QUERY    ( STR_JDBC_LOG_MESSAGE_BASE + 30 )
-#define STR_LOG_STRING_PARAMETER            ( STR_JDBC_LOG_MESSAGE_BASE + 31 )
-#define STR_LOG_BOOLEAN_PARAMETER           ( STR_JDBC_LOG_MESSAGE_BASE + 32 )
-#define STR_LOG_BYTE_PARAMETER              ( STR_JDBC_LOG_MESSAGE_BASE + 33 )
-#define STR_LOG_DATE_PARAMETER              ( STR_JDBC_LOG_MESSAGE_BASE + 34 )
-#define STR_LOG_TIME_PARAMETER              ( STR_JDBC_LOG_MESSAGE_BASE + 35 )
-#define STR_LOG_TIMESTAMP_PARAMETER         ( STR_JDBC_LOG_MESSAGE_BASE + 36 )
-#define STR_LOG_DOUBLE_PARAMETER            ( STR_JDBC_LOG_MESSAGE_BASE + 37 )
-#define STR_LOG_FLOAT_PARAMETER             ( STR_JDBC_LOG_MESSAGE_BASE + 38 )
-#define STR_LOG_INT_PARAMETER               ( STR_JDBC_LOG_MESSAGE_BASE + 39 )
-#define STR_LOG_LONG_PARAMETER              ( STR_JDBC_LOG_MESSAGE_BASE + 40 )
-#define STR_LOG_NULL_PARAMETER              ( STR_JDBC_LOG_MESSAGE_BASE + 41 )
-#define STR_LOG_OBJECT_NULL_PARAMETER       ( STR_JDBC_LOG_MESSAGE_BASE + 42 )
-#define STR_LOG_SHORT_PARAMETER             ( STR_JDBC_LOG_MESSAGE_BASE + 43 )
-#define STR_LOG_BYTES_PARAMETER             ( STR_JDBC_LOG_MESSAGE_BASE + 44 )
-#define STR_LOG_CHARSTREAM_PARAMETER        ( STR_JDBC_LOG_MESSAGE_BASE + 45 )
-#define STR_LOG_BINARYSTREAM_PARAMETER      ( STR_JDBC_LOG_MESSAGE_BASE + 46 )
-#define STR_LOG_CLEAR_PARAMETERS            ( STR_JDBC_LOG_MESSAGE_BASE + 47 )
-#define STR_LOG_META_DATA_METHOD            ( STR_JDBC_LOG_MESSAGE_BASE + 48 )
-#define STR_LOG_META_DATA_METHOD_ARG1       ( STR_JDBC_LOG_MESSAGE_BASE + 49 )
-#define STR_LOG_META_DATA_METHOD_ARG2       ( STR_JDBC_LOG_MESSAGE_BASE + 50 )
-#define STR_LOG_META_DATA_METHOD_ARG3       ( STR_JDBC_LOG_MESSAGE_BASE + 51 )
-#define STR_LOG_META_DATA_METHOD_ARG4       ( STR_JDBC_LOG_MESSAGE_BASE + 52 )
-#define STR_LOG_META_DATA_RESULT            ( STR_JDBC_LOG_MESSAGE_BASE + 53 )
-#define STR_LOG_META_DATA_SUCCESS           ( STR_JDBC_LOG_MESSAGE_BASE + 54 )
-#define STR_LOG_THROWING_EXCEPTION          ( STR_JDBC_LOG_MESSAGE_BASE + 55 )
-#define STR_LOG_SETTING_SYSTEM_PROPERTY     ( STR_JDBC_LOG_MESSAGE_BASE + 56 )
-
 #endif // CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
deleted file mode 100644
index 91cc203c35cc..000000000000
--- a/connectivity/source/resource/conn_log_res.src
+++ /dev/null
@@ -1,304 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "resource/jdbc_log.hrc"
-
-// = log messages for the JDBC driver
-
-String STR_LOG_DRIVER_CONNECTING_URL
-{
-    Text = "jdbcBridge: connecting to URL '$1$'";
-};
-
-String STR_LOG_DRIVER_SUCCESS
-{
-    Text = "jdbcBridge: success";
-};
-
-String STR_LOG_CREATE_STATEMENT
-{
-    Text = "c$1$: creating statement";
-};
-
-String STR_LOG_CREATED_STATEMENT_ID
-{
-    Text = "c$1$: created statement, statement id: s$2$";
-};
-
-String STR_LOG_PREPARE_STATEMENT
-{
-    Text = "c$1$: preparing statement: $2$";
-};
-
-String STR_LOG_PREPARED_STATEMENT_ID
-{
-    Text = "c$1$: prepared statement, statement id: s$2$";
-};
-
-String STR_LOG_PREPARE_CALL
-{
-    Text = "c$1$: preparing call: $2$";
-};
-
-String STR_LOG_PREPARED_CALL_ID
-{
-    Text = "c$1$: prepared call, statement id: s$2$";
-};
-
-String STR_LOG_NATIVE_SQL
-{
-    Text = "c$1$: native SQL: $2$ -> $3$";
-};
-
-String STR_LOG_LOADING_DRIVER
-{
-    Text = "c$1$: attempting to load driver class $2$";
-};
-
-String STR_LOG_NO_DRIVER_CLASS
-{
-    Text = "c$1$: no Java Driver Class was provided";
-};
-
-String STR_LOG_CONN_SUCCESS
-{
-    Text = "c$1$: success";
-};
-
-String STR_LOG_NO_SYSTEM_CONNECTION
-{
-    Text = "c$1$: JDBC driver did not provide a JDBC connection";
-};
-
-String STR_LOG_GOT_JDBC_CONNECTION
-{
-    Text = "c$1$: obtained a JDBC connection for $2$";
-};
-
-String STR_LOG_SHUTDOWN_CONNECTION
-{
-    Text = "c$1$: shutting down connection";
-};
-
-String STR_LOG_GENERATED_VALUES
-{
-    Text = "s$1$: retrieving generated values";
-};
-
-String STR_LOG_GENERATED_VALUES_FALLBACK
-{
-    Text = "s$1$: getGeneratedValues: falling back to statement: $2$";
-};
-
-String STR_LOG_EXECUTE_STATEMENT
-{
-    Text = "s$1$: going to execute: $2$";
-};
-
-String STR_LOG_EXECUTE_QUERY
-{
-    Text = "s$1$: going to execute query: $2$";
-};
-
-String STR_LOG_CLOSING_STATEMENT
-{
-    Text = "s$1$: closing/disposing statement";
-};
-
-String STR_LOG_EXECUTE_UPDATE
-{
-    Text = "s$1$: going to execute update: $2$";
-};
-
-String STR_LOG_UPDATE_COUNT
-{
-    Text = "s$1$: update count: $2$";
-};
-
-String STR_LOG_RESULT_SET_CONCURRENCY
-{
-    Text = "s$1$: going to set result set concurrency: $2$";
-};
-
-String STR_LOG_RESULT_SET_TYPE
-{
-    Text = "s$1$: going to set result set type: $2$";
-};
-
-String STR_LOG_FETCH_DIRECTION
-{
-    Text = "s$1$: fetch direction: $2$";
-};
-
-String STR_LOG_FETCH_SIZE
-{
-    Text = "s$1$: fetch size: $2$";
-};
-
-String STR_LOG_SET_ESCAPE_PROCESSING
-{
-    Text = "s$1$: going to set escape processing: $2$";
-};
-
-String STR_LOG_EXECUTING_PREPARED
-{
-    Text = "s$1$: executing previously prepared statement";
-};
-
-String STR_LOG_EXECUTING_PREPARED_UPDATE
-{
-    Text = "s$1$: executing previously prepared update statement";
-};
-
-String STR_LOG_EXECUTING_PREPARED_QUERY
-{
-    Text = "s$1$: executing previously prepared query";
-};
-
-String STR_LOG_STRING_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: string; value: $3$";
-};
-
-String STR_LOG_BOOLEAN_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: boolean; value: $3$";
-};
-
-String STR_LOG_BYTE_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: byte; value: $3$";
-};
-
-String STR_LOG_DATE_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: date; value: $3$";
-};
-
-String STR_LOG_TIME_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: time; value: $3$";
-};
-
-String STR_LOG_TIMESTAMP_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: timestamp; value: $3$";
-};
-
-String STR_LOG_DOUBLE_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: double; value: $3$";
-};
-
-String STR_LOG_FLOAT_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: float; value: $3$";
-};
-
-String STR_LOG_INT_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: int; value: $3$";
-};
-
-String STR_LOG_LONG_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: long; value: $3$";
-};
-
-String STR_LOG_NULL_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: sql-type: $3$; value: null";
-};
-
-String STR_LOG_OBJECT_NULL_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: setting to null";
-};
-
-String STR_LOG_SHORT_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: short; value: $3$";
-};
-
-String STR_LOG_BYTES_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: byte[]";
-};
-
-String STR_LOG_CHARSTREAM_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: character stream";
-};
-
-String STR_LOG_BINARYSTREAM_PARAMETER
-{
-    Text = "s$1$: parameter no. $2$: type: binary stream";
-};
-
-String STR_LOG_CLEAR_PARAMETERS
-{
-    Text = "s$1$: clearing all parameters";
-};
-
-String STR_LOG_META_DATA_METHOD
-{
-    Text = "c$1$: entering XDatabaseMetaData::$2$";
-};
-
-String STR_LOG_META_DATA_METHOD_ARG1
-{
-    Text = "c$1$: entering XDatabaseMetaData::$2$( '$3$' )";
-};
-
-String STR_LOG_META_DATA_METHOD_ARG2
-{
-    Text = "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )";
-};
-
-String STR_LOG_META_DATA_METHOD_ARG3
-{
-    Text = "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )";
-};
-
-String STR_LOG_META_DATA_METHOD_ARG4
-{
-    Text = "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )";
-};
-
-String STR_LOG_META_DATA_RESULT
-{
-    Text = "c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$";
-};
-
-String STR_LOG_META_DATA_SUCCESS
-{
-    Text = "c$1$: leaving XDatabaseMetaData::$2$: success";
-};
-
-String STR_LOG_THROWING_EXCEPTION
-{
-    Text = "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$";
-};
-
-String STR_LOG_SETTING_SYSTEM_PROPERTY
-{
-    Text = "setting system property \"$1$\" to value \"$2$\"";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */