migrate to boost::gettext

* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
author: Caolán McNamara <caolanm@redhat.com> 2017-06-11 20:56:30 +0100
committer: Caolán McNamara <caolanm@redhat.com> 2017-07-21 08:20:50 +0100
commit: 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
tree: fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /connectivity
parent: fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
101 files changed, 389 insertions, 1247 deletions
diff --git a/connectivity/AllLangResTarget_sdberr.mk b/connectivity/AllLangMoTarget_cnr.mk
index fffbdc88a935..a960ce0b9bb1 100644
--- a/connectivity/AllLangResTarget_sdberr.mk
+++ b/connectivity/AllLangMoTarget_cnr.mk
@@ -5,18 +5,9 @@
 # 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,sdberr))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sdberr,\
-	sdberr/res \
-))
 
-$(eval $(call gb_SrsTarget_SrsTarget,sdberr/res))
+$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,cnr))
 
-$(eval $(call gb_SrsTarget_add_files,sdberr/res,\
-	connectivity/source/resource/conn_error_message.src \
-))
+$(eval $(call gb_AllLangMoTarget_set_polocation,cnr,connectivity))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/AllLangResTarget_cnr.mk b/connectivity/AllLangResTarget_cnr.mk
deleted file mode 100644
index df94ae27b13d..000000000000
--- a/connectivity/AllLangResTarget_cnr.mk
+++ /dev/null
@@ -1,28 +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,cnr))
-
-$(eval $(call gb_AllLangResTarget_add_srs,cnr,\
-	cnr/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,cnr/res))
-
-$(eval $(call gb_SrsTarget_set_include,cnr/res,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/connectivity/source/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,cnr/res,\
-	connectivity/source/resource/conn_shared_res.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk
index fcdaf2da8ebb..3dd95356195d 100644
--- a/connectivity/CppunitTest_connectivity_ado.mk
+++ b/connectivity/CppunitTest_connectivity_ado.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,connectivity_ado))
 
 $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	-I$(SRCDIR)/connectivity/source/drivers/ado \
 	$$(INCLUDE) \
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index d197c94b237c..80e5d1ce5277 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
     utl \
     tl \
     svt \
+    vcl \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 4289a7fe6dc3..10d1d4f5f38c 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,ado))
 $(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
 
 $(eval $(call gb_Library_set_include,ado,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index eb6dda8cb157..3136a22c908b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\
 	comphelper \
 	i18nlangtag \
 	svt \
+	vcl \
 ))
 
 ifeq ($(filter-out NETBSD MACOSX,$(OS)),)
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 504eee47f45a..ee325f4464c6 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -11,6 +11,7 @@
 $(eval $(call gb_Library_Library,evoab))
 
 $(eval $(call gb_Library_set_include,evoab,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index 3f3ddc7fce10..aa79db0693fe 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_externals,firebird_sdbc,\
 ))
 
 $(eval $(call gb_Library_set_include,firebird_sdbc,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 227d8438c43c..7c0a89b56a2c 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Library_add_defs,mork,\
 ))
 
 $(eval $(call gb_Library_set_include,mork,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
index 4cb33107ce3b..ac3c0c2619e8 100644
--- a/connectivity/Library_mysql.mk
+++ b/connectivity/Library_mysql.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_sdk_api,mysql))
 
 $(eval $(call gb_Library_set_include,mysql,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 067d883a232b..3ba7ecf01d41 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,connectivity,\
-	AllLangResTarget_cnr \
-	AllLangResTarget_sdberr \
+       AllLangMoTarget_cnr \
 ))
 
 ifneq ($(ENABLE_JAVA),)
diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx
index 2df126b08063..a4999e5f5083 100644
--- a/connectivity/inc/pch/precompiled_dbtools.hxx
+++ b/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -132,7 +132,6 @@
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/numbers.hxx>
-#include <comphelper/officeresourcebundle.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propagg.hxx>
 #include <comphelper/proparrhlp.hxx>
diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
new file mode 100644
index 000000000000..dc769e1e3ee9
--- /dev/null
+++ b/connectivity/inc/strings.hrc
@@ -0,0 +1,148 @@
+/* -*- 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 .
+ */
+
+#ifndef CONNECTIVITY_STRINGS_HRC
+#define CONNECTIVITY_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// = the mozab driver's resource strings
+#define STR_ERR_EXECUTING_QUERY                 NC_("STR_ERR_EXECUTING_QUERY", "An error occurred while executing the query.")
+#define STR_QUERY_AT_LEAST_ONE_TABLES           NC_("STR_QUERY_AT_LEAST_ONE_TABLES", "The query can not be executed. It needs at least one table.")
+#define STR_NO_COUNT_SUPPORT                    NC_("STR_NO_COUNT_SUPPORT", "The driver does not support the 'COUNT' function.")
+#define STR_STMT_TYPE_NOT_SUPPORTED             NC_("STR_STMT_TYPE_NOT_SUPPORTED", "This statement type not supported by this database driver.")
+#define STR_UNSPECIFIED_ERROR                   NC_("STR_UNSPECIFIED_ERROR", "An unknown error occurred.")
+#define STR_ERROR_REFRESH_ROW                   NC_("STR_ERROR_REFRESH_ROW", "An error occurred while refreshing the current row.")
+#define STR_ERROR_GET_ROW                       NC_("STR_ERROR_GET_ROW", "An error occurred while getting the current row.")
+#define STR_QUERY_INVALID_IS_NULL_COLUMN        NC_("STR_QUERY_INVALID_IS_NULL_COLUMN", "The query can not be executed. The 'IS NULL' can only be used with a column name.")
+#define STR_ILLEGAL_MOVEMENT                    NC_("STR_ILLEGAL_MOVEMENT", "Illegal cursor movement occurred.")
+#define STR_COMMIT_ROW                          NC_("STR_COMMIT_ROW", "Please commit row '$position$' before update rows or insert new rows.")
+// = common strings
+#define STR_NO_CONNECTION_GIVEN                 NC_("STR_NO_CONNECTION_GIVEN", "It doesn't exist a connection to the database.")
+#define STR_WRONG_PARAM_INDEX                   NC_("STR_WRONG_PARAM_INDEX", "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source.")
+#define STR_NO_INPUTSTREAM                      NC_("STR_NO_INPUTSTREAM", "The input stream was not set.")
+#define STR_NO_ELEMENT_NAME                     NC_("STR_NO_ELEMENT_NAME", "There is no element named '$name$'.")
+#define STR_INVALID_BOOKMARK                    NC_("STR_INVALID_BOOKMARK", "Invalid bookmark value")
+#define STR_PRIVILEGE_NOT_GRANTED               NC_("STR_PRIVILEGE_NOT_GRANTED", "Privilege not granted: Only table privileges can be granted.")
+#define STR_PRIVILEGE_NOT_REVOKED               NC_("STR_PRIVILEGE_NOT_REVOKED", "Privilege not revoked: Only table privileges can be revoked.")
+#define STR_ERRORMSG_SEQUENCE                   NC_("STR_ERRORMSG_SEQUENCE", "Function sequence error.")
+#define STR_INVALID_INDEX                       NC_("STR_INVALID_INDEX", "Invalid descriptor index.")
+#define STR_UNSUPPORTED_FUNCTION                NC_("STR_UNSUPPORTED_FUNCTION", "The driver does not support the function '$functionname$'.")
+#define STR_UNSUPPORTED_FEATURE                 NC_("STR_UNSUPPORTED_FEATURE", "The driver does not support the functionality for '$featurename$'. It is not implemented.")
+#define STR_FORMULA_WRONG                       NC_("STR_FORMULA_WRONG", "The formula for TypeInfoSettings is wrong!")
+#define STR_STRING_LENGTH_EXCEEDED              NC_("STR_STRING_LENGTH_EXCEEDED", "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'.")
+#define STR_CANNOT_CONVERT_STRING               NC_("STR_CANNOT_CONVERT_STRING", "The string '$string$' cannot be converted using the encoding '$charset$'.")
+#define STR_URI_SYNTAX_ERROR                    NC_("STR_URI_SYNTAX_ERROR", "The connection URL is invalid.")
+#define STR_QUERY_TOO_COMPLEX                   NC_("STR_QUERY_TOO_COMPLEX", "The query can not be executed. It is too complex.")
+#define STR_OPERATOR_TOO_COMPLEX                NC_("STR_OPERATOR_TOO_COMPLEX", "The query can not be executed. The operator is too complex.")
+#define STR_QUERY_INVALID_LIKE_COLUMN           NC_("STR_QUERY_INVALID_LIKE_COLUMN", "The query can not be executed. You cannot use 'LIKE' with columns of this type.")
+#define STR_QUERY_INVALID_LIKE_STRING           NC_("STR_QUERY_INVALID_LIKE_STRING", "The query can not be executed. 'LIKE' can be used with a string argument only.")
+#define STR_QUERY_NOT_LIKE_TOO_COMPLEX          NC_("STR_QUERY_NOT_LIKE_TOO_COMPLEX", "The query can not be executed. The 'NOT LIKE' condition is too complex.")
+#define STR_QUERY_LIKE_WILDCARD                 NC_("STR_QUERY_LIKE_WILDCARD", "The query can not be executed. The 'LIKE' condition contains wildcard in the middle.")
+#define STR_QUERY_LIKE_WILDCARD_MANY            NC_("STR_QUERY_LIKE_WILDCARD_MANY", "The query can not be executed. The 'LIKE' condition contains too many wildcards.")
+#define STR_INVALID_COLUMNNAME                  NC_("STR_INVALID_COLUMNNAME", "The column name '$columnname$' is not valid.")
+#define STR_INVALID_COLUMN_SELECTION            NC_("STR_INVALID_COLUMN_SELECTION", "The statement contains an invalid selection of columns.")
+#define STR_COLUMN_NOT_UPDATEABLE               NC_("STR_COLUMN_NOT_UPDATEABLE", "The column at position '$position$' could not be updated.")
+#define STR_COULD_NOT_LOAD_FILE                 NC_("STR_COULD_NOT_LOAD_FILE", "The file $filename$ could not be loaded.")
+#define STR_LOAD_FILE_ERROR_MESSAGE             NC_("STR_LOAD_FILE_ERROR_MESSAGE", "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$")
+// = the ado driver's resource strings
+#define STR_TYPE_NOT_CONVERT                    NC_("STR_TYPE_NOT_CONVERT", "The type could not be converted.")
+#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR     NC_("STR_INVALID_COLUMN_DESCRIPTOR_ERROR", "Could not append column: invalid column descriptor.")
+#define STR_INVALID_GROUP_DESCRIPTOR_ERROR      NC_("STR_INVALID_GROUP_DESCRIPTOR_ERROR", "Could not create group: invalid object descriptor.")
+#define STR_INVALID_INDEX_DESCRIPTOR_ERROR      NC_("STR_INVALID_INDEX_DESCRIPTOR_ERROR", "Could not create index: invalid object descriptor.")
+#define STR_INVALID_KEY_DESCRIPTOR_ERROR        NC_("STR_INVALID_KEY_DESCRIPTOR_ERROR", "Could not create key: invalid object descriptor.")
+#define STR_INVALID_TABLE_DESCRIPTOR_ERROR      NC_("STR_INVALID_TABLE_DESCRIPTOR_ERROR", "Could not create table: invalid object descriptor.")
+#define STR_INVALID_USER_DESCRIPTOR_ERROR       NC_("STR_INVALID_USER_DESCRIPTOR_ERROR", "Could not create user: invalid object descriptor.")
+#define STR_INVALID_VIEW_DESCRIPTOR_ERROR       NC_("STR_INVALID_VIEW_DESCRIPTOR_ERROR", "Could not create view: invalid object descriptor.")
+#define STR_VIEW_NO_COMMAND_ERROR               NC_("STR_VIEW_NO_COMMAND_ERROR", "Could not create view: no command object.")
+#define STR_NO_CONNECTION                       NC_("STR_NO_CONNECTION", "The connection could not be created. May be the necessary data provider is not installed.")
+// dbase
+#define STR_COULD_NOT_DELETE_INDEX              NC_("STR_COULD_NOT_DELETE_INDEX", "The index could not be deleted. An unknown error while accessing the file system occurred.")
+#define STR_ONL_ONE_COLUMN_PER_INDEX            NC_("STR_ONL_ONE_COLUMN_PER_INDEX", "The index could not be created. Only one column per index is allowed.")
+#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE   NC_("STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE", "The index could not be created. The values are not unique.")
+#define STR_COULD_NOT_CREATE_INDEX              NC_("STR_COULD_NOT_CREATE_INDEX", "The index could not be created. An unknown error appeared.")
+#define STR_COULD_NOT_CREATE_INDEX_NAME         NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The file '$filename$' is used by an other index.")
+#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE      NC_("STR_COULD_NOT_CREATE_INDEX_KEYSIZE", "The index could not be created. The size of the chosen column is too big.")
+#define STR_SQL_NAME_ERROR                      NC_("STR_SQL_NAME_ERROR", "The name '$name$' doesn't match SQL naming constraints.")
+#define STR_COULD_NOT_DELETE_FILE               NC_("STR_COULD_NOT_DELETE_FILE", "The file $filename$ could not be deleted.")
+#define STR_INVALID_COLUMN_TYPE                 NC_("STR_INVALID_COLUMN_TYPE", "Invalid column type for column '$columnname$'.")
+#define STR_INVALID_COLUMN_PRECISION            NC_("STR_INVALID_COLUMN_PRECISION", "Invalid precision for column '$columnname$'.")
+#define STR_INVALID_PRECISION_SCALE             NC_("STR_INVALID_PRECISION_SCALE", "Precision is less than scale for column '$columnname$'.")
+#define STR_INVALID_COLUMN_NAME_LENGTH          NC_("STR_INVALID_COLUMN_NAME_LENGTH", "Invalid column name length for column '$columnname$'.")
+#define STR_DUPLICATE_VALUE_IN_COLUMN           NC_("STR_DUPLICATE_VALUE_IN_COLUMN", "Duplicate value found in column '$columnname$'.")
+#define STR_INVALID_COLUMN_DECIMAL_VALUE        NC_("STR_INVALID_COLUMN_DECIMAL_VALUE", "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n\nThe specified value \"$value$ is longer than the number of digits allowed.")
+#define STR_COLUMN_NOT_ALTERABLE                NC_("STR_COLUMN_NOT_ALTERABLE", "The column '$columnname$' could not be altered. May be the file system is write protected.")
+#define STR_INVALID_COLUMN_VALUE                NC_("STR_INVALID_COLUMN_VALUE", "The column '$columnname$' could not be updated. The value is invalid for that column.")
+#define STR_COLUMN_NOT_ADDABLE                  NC_("STR_COLUMN_NOT_ADDABLE", "The column '$columnname$' could not be added. May be the file system is write protected.")
+#define STR_COLUMN_NOT_DROP                     NC_("STR_COLUMN_NOT_DROP", "The column at position '$position$' could not be dropped. May be the file system is write protected.")
+#define STR_TABLE_NOT_DROP                      NC_("STR_TABLE_NOT_DROP", "The table '$tablename$' could not be dropped. May be the file system is write protected.")
+#define STR_COULD_NOT_ALTER_TABLE               NC_("STR_COULD_NOT_ALTER_TABLE", "The table could not be altered.")
+#define STR_INVALID_DBASE_FILE                  NC_("STR_INVALID_DBASE_FILE", "The file '$filename$' is an invalid (or unrecognized) dBase file.")
+// Evoab2
+#define STR_CANNOT_OPEN_BOOK                    NC_("STR_CANNOT_OPEN_BOOK", "Cannot open Evolution address book.")
+#define STR_SORT_BY_COL_ONLY                    NC_("STR_SORT_BY_COL_ONLY", "Can only sort by table columns.")
+// File
+#define STR_QUERY_COMPLEX_COUNT                 NC_("STR_QUERY_COMPLEX_COUNT", "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported.")
+#define STR_QUERY_INVALID_BETWEEN               NC_("STR_QUERY_INVALID_BETWEEN", "The query can not be executed. The 'BETWEEN' arguments are not correct.")
+#define STR_QUERY_FUNCTION_NOT_SUPPORTED        NC_("STR_QUERY_FUNCTION_NOT_SUPPORTED", "The query can not be executed. The function is not supported.")
+#define STR_TABLE_READONLY                      NC_("STR_TABLE_READONLY", "The table can not be changed. It is read only.")
+#define STR_DELETE_ROW                          NC_("STR_DELETE_ROW", "The row could not be deleted. The option \"Display inactive records\" is set.")
+#define STR_ROW_ALREADY_DELETED                 NC_("STR_ROW_ALREADY_DELETED", "The row could not be deleted. It is already deleted.")
+#define STR_QUERY_MORE_TABLES                   NC_("STR_QUERY_MORE_TABLES", "The query can not be executed. It contains more than one table.")
+#define STR_QUERY_NO_TABLE                      NC_("STR_QUERY_NO_TABLE", "The query can not be executed. It contains no valid table.")
+#define STR_QUERY_NO_COLUMN                     NC_("STR_QUERY_NO_COLUMN", "The query can not be executed. It contains no valid columns.")
+#define STR_INVALID_PARA_COUNT                  NC_("STR_INVALID_PARA_COUNT", "The count of the given parameter values doesn't match the parameters.")
+#define STR_NO_VALID_FILE_URL                   NC_("STR_NO_VALID_FILE_URL", "The URL '$URL$' is not valid. A connection can not be created.")
+#define STR_NO_CLASSNAME                        NC_("STR_NO_CLASSNAME", "The driver class '$classname$' could not be loaded.")
+#define STR_NO_JAVA                             NC_("STR_NO_JAVA", "No Java installation could be found. Please check your installation.")
+#define STR_NO_RESULTSET                        NC_("STR_NO_RESULTSET", "The execution of the query doesn't return a valid result set.")
+#define STR_NO_ROWCOUNT                         NC_("STR_NO_ROWCOUNT", "The execution of the update statement doesn't effect any rows.")
+#define STR_NO_CLASSNAME_PATH                   NC_("STR_NO_CLASSNAME_PATH", "The additional driver class path is '$classpath$'.")
+#define STR_UNKNOWN_PARA_TYPE                   NC_("STR_UNKNOWN_PARA_TYPE", "The type of parameter at position '$position$' is unknown.")
+#define STR_UNKNOWN_COLUMN_TYPE                 NC_("STR_UNKNOWN_COLUMN_TYPE", "The type of column at position '$position$' is unknown.")
+// KAB
+#define STR_NO_KDE_INST                         NC_("STR_NO_KDE_INST", "No suitable KDE installation was found.")
+#define STR_KDE_VERSION_TOO_OLD                 NC_("STR_KDE_VERSION_TOO_OLD", "KDE version $major$.$minor$ or higher is required to access the KDE Address Book.")
+#define STR_KDE_VERSION_TOO_NEW                 NC_("STR_KDE_VERSION_TOO_NEW", "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n")
+#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND     NC_("STR_KDE_VERSION_TOO_NEW_WORK_AROUND", "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n")
+#define STR_PARA_ONLY_PREPARED                  NC_("STR_PARA_ONLY_PREPARED", "Parameters can appear only in prepared statements.")
+// MACAB
+#define STR_NO_TABLE                            NC_("STR_NO_TABLE", "No such table!")
+#define STR_NO_MAC_OS_FOUND                     NC_("STR_NO_MAC_OS_FOUND", "No suitable Mac OS installation was found.")
+// hsqldb
+#define STR_NO_STORAGE                          NC_("STR_NO_STORAGE", "The connection can not be established. No storage or URL was given.")
+#define STR_INVALID_FILE_URL                    NC_("STR_INVALID_FILE_URL", "The given URL contains no valid local file system path. Please check the location of your database file.")
+#define STR_NO_TABLE_CONTAINER                  NC_("STR_NO_TABLE_CONTAINER", "An error occurred while obtaining the connection's table container.")
+#define STR_NO_TABLENAME                        NC_("STR_NO_TABLENAME", "There is no table named '$tablename$'.")
+#define STR_NO_DOCUMENTUI                       NC_("STR_NO_DOCUMENTUI", "The provided DocumentUI is not allowed to be NULL.")
+#define STR_ERROR_NEW_VERSION                   NC_("STR_ERROR_NEW_VERSION", "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.")
+
+#define STR_ROW_SET_OPERATION_VETOED            NC_("STR_ROW_SET_OPERATION_VETOED", "The record operation has been vetoed.")
+#define STR_PARSER_CYCLIC_SUB_QUERIES           NC_("STR_PARSER_CYCLIC_SUB_QUERIES", "The statement contains a cyclic reference to one or more sub queries.")
+#define STR_DB_OBJECT_NAME_WITH_SLASHES         NC_("STR_DB_OBJECT_NAME_WITH_SLASHES", "The name must not contain any slashes ('/').")
+#define STR_DB_INVALID_SQL_NAME                 NC_("STR_DB_INVALID_SQL_NAME", "$1$ is no SQL conform identifier.")
+#define STR_DB_QUERY_NAME_WITH_QUOTES           NC_("STR_DB_QUERY_NAME_WITH_QUOTES", "Query names must not contain quote characters.")
+#define STR_DB_OBJECT_NAME_IS_USED              NC_("STR_DB_OBJECT_NAME_IS_USED", "The name '$1$' is already in use in the database.")
+#define STR_DB_NOT_CONNECTED                    NC_("STR_DB_NOT_CONNECTED", "No connection to the database exists.")
+#define STR_AB_ADDRESSBOOK_NOT_FOUND            NC_("STR_AB_ADDRESSBOOK_NOT_FOUND", "No $1$ exists.")
+#define STR_DATA_CANNOT_SELECT_UNFILTERED       NC_("STR_DATA_CANNOT_SELECT_UNFILTERED", "Unable to display the complete table content. Please apply a filter.")
+
+#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx
index a514191d4488..c81b2a08b74b 100644
--- a/connectivity/inc/strings.hxx
+++ b/connectivity/inc/strings.hxx
@@ -12,62 +12,65 @@
 
 // = 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$\""
+#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$\""
+
+#define STR_DB_NOT_CONNECTED_STATE              "08003"
+#define STR_DATA_CANNOT_SELECT_UNFILTERED_STATE "IM001"
 
 #endif
 
diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx
index 4c01fc73da1f..311ef6f11687 100644
--- a/connectivity/qa/connectivity/ado/DriverTest.cxx
+++ b/connectivity/qa/connectivity/ado/DriverTest.cxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 
 using namespace ::com::sun::star::beans;
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index d8e847711f8d..afc1a8bce50c 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "TConnection.hxx"
 
 using namespace connectivity;
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index febc53170355..15bcf67f4929 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -21,7 +21,6 @@
 #include "TConnection.hxx"
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/types.hxx>
-#include <comphelper/officeresourcebundle.hxx>
 #include <connectivity/dbexception.hxx>
 
 using namespace connectivity;
@@ -76,11 +75,11 @@ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId()
     return s_aPropertyNameMap;
 }
 
-void OMetaConnection::throwGenericSQLException( sal_uInt16 _nErrorResourceId,const Reference< XInterface>& _xContext )
+void OMetaConnection::throwGenericSQLException(const char* pErrorResourceId, const Reference< XInterface>& _xContext )
 {
     OUString sErrorMessage;
-    if ( _nErrorResourceId )
-        sErrorMessage = m_aResources.getResourceString( _nErrorResourceId );
+    if (pErrorResourceId)
+        sErrorMessage = m_aResources.getResourceString(pErrorResourceId);
     Reference< XInterface> xContext = _xContext;
     if ( !xContext.is() )
         xContext = *this;
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 92728dfc1406..599f031dbc95 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/evtlistenerhlp.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <connectivity/dbexception.hxx>
 #include <sal/macros.h>
 
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 85a9827cbc3a..e9cdce9c7ca4 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -26,14 +26,11 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdb/SQLErrorEvent.hpp>
 #include "TConnection.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
-
 namespace dbtools
 {
-
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::sdb;
     using namespace ::com::sun::star::sdbc;
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index bdb7f033debb..27acbe743234 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -21,7 +21,7 @@
 #include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/DriversConfig.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 37e69c7f9d74..16c3d9b7782e 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -79,7 +79,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <connectivity/OSubComponent.hxx>
 
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 6f829f4f272b..3db5b431bd35 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -23,7 +23,7 @@
 #include <connectivity/SQLStatementHelper.hxx>
 #include <unotools/confignode.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index bcb2fd2e5634..01e07b26721f 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -22,15 +22,19 @@
 #include <connectivity/sqlerror.hxx>
 
 #include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/sdb/ErrorCondition.hpp>
 
-#include <comphelper/officeresourcebundle.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/resmgr.hxx>
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
 
+#include <strings.hrc>
+#include <strings.hxx>
 #include <string.h>
 
-
 namespace connectivity
 {
 
@@ -69,7 +73,7 @@ namespace connectivity
                 impl_getErrorMessage( ErrorCondition _eCondition );
 
         /// returns the SQLState associated with the given error condition
-        OUString
+        static OUString
                 impl_getSQLState( ErrorCondition _eCondition );
 
         /// returns an SQLException describing the given error condition
@@ -83,13 +87,12 @@ namespace connectivity
     private:
         ::osl::Mutex                                            m_aMutex;
         Reference<XComponentContext>                            m_aContext;
-        std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
+        std::unique_ptr<std::locale>                            m_xResources;
         bool                                                    m_bAttemptedInit;
     };
 
     SQLError_Impl::SQLError_Impl( const Reference<XComponentContext> & _rxContext )
         :m_aContext( _rxContext )
-        ,m_pResources( )
         ,m_bAttemptedInit( false )
     {
     }
@@ -120,16 +123,45 @@ namespace connectivity
                 _rMessage = _rMessage.replaceAt( nIndex, nPlaceholderLen, *rParamValue );
         }
 
+        const char* lcl_getResourceErrorID(const ErrorCondition _eCondition)
+        {
+            switch (_eCondition)
+            {
+                case css::sdb::ErrorCondition::ROW_SET_OPERATION_VETOED:
+                    return STR_ROW_SET_OPERATION_VETOED;
+                case css::sdb::ErrorCondition::PARSER_CYCLIC_SUB_QUERIES:
+                    return STR_PARSER_CYCLIC_SUB_QUERIES;
+                case css::sdb::ErrorCondition::DB_OBJECT_NAME_WITH_SLASHES:
+                    return STR_DB_OBJECT_NAME_WITH_SLASHES;
+                case css::sdb::ErrorCondition::DB_INVALID_SQL_NAME:
+                    return STR_DB_INVALID_SQL_NAME;
+                case css::sdb::ErrorCondition::DB_QUERY_NAME_WITH_QUOTES:
+                    return STR_DB_QUERY_NAME_WITH_QUOTES;
+                case css::sdb::ErrorCondition::DB_OBJECT_NAME_IS_USED:
+                    return STR_DB_OBJECT_NAME_IS_USED;
+                case css::sdb::ErrorCondition::DB_NOT_CONNECTED:
+                    return STR_DB_NOT_CONNECTED;
+                case css::sdb::ErrorCondition::AB_ADDRESSBOOK_NOT_FOUND:
+                    return STR_AB_ADDRESSBOOK_NOT_FOUND;
+                case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED:
+                    return STR_DATA_CANNOT_SELECT_UNFILTERED;
+            }
+            return nullptr;
+        }
 
-        sal_Int32   lcl_getResourceID( const ErrorCondition _eCondition, bool _bSQLState )
+        OUString lcl_getResourceState(const ErrorCondition _eCondition)
         {
-            return  256
-                +   2 * ::sal::static_int_cast< sal_Int32, ErrorCondition >( _eCondition )
-                +   ( _bSQLState ? 1 : 0 );
+            switch (_eCondition)
+            {
+                case css::sdb::ErrorCondition::DB_NOT_CONNECTED:
+                    return OUString(STR_DB_NOT_CONNECTED_STATE);
+                case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED:
+                    return OUString(STR_DATA_CANNOT_SELECT_UNFILTERED_STATE);
+            }
+            return OUString();
         }
     }
 
-
     OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         OUString sErrorMessage( impl_getErrorMessage( _eCondition ) );
@@ -173,7 +205,6 @@ namespace connectivity
         );
     }
 
-
     void SQLError_Impl::raiseTypedException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
@@ -191,14 +222,12 @@ namespace connectivity
         ::cppu::throwException( aException );
     }
 
-
     SQLException SQLError_Impl::getSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
         return impl_buildSQLException( _eCondition, _rxContext, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
 
-
     SQLException SQLError_Impl::impl_buildSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext,
         const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
@@ -211,14 +240,13 @@ namespace connectivity
         );
     }
 
-
     OUString SQLError_Impl::impl_getErrorMessage( ErrorCondition _eCondition )
     {
         OUStringBuffer aMessage;
 
         if ( impl_initResources() )
         {
-            OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) );
+            OUString sResMessage(Translate::get(lcl_getResourceErrorID(_eCondition), *m_xResources));
             OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
             aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage );
         }
@@ -226,37 +254,26 @@ namespace connectivity
         return aMessage.makeStringAndClear();
     }
 
-
     OUString SQLError_Impl::impl_getSQLState( ErrorCondition _eCondition )
     {
-        OUString sState;
-
-        if ( impl_initResources() )
-        {
-            sal_Int32 nResourceId( lcl_getResourceID( _eCondition, true ) );
-            if ( m_pResources->hasString( nResourceId ) )
-                sState = m_pResources->loadString( nResourceId );
-        }
-
-        if ( sState.isEmpty() )
+        OUString sState = lcl_getResourceState(_eCondition);
+        if (sState.isEmpty())
             sState = OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) );
-
         return sState;
     }
 
-
     bool SQLError_Impl::impl_initResources()
     {
-        if ( m_pResources.get() )
+        if (m_xResources.get())
             return true;
-        if ( m_bAttemptedInit )
+        if (m_bAttemptedInit)
             return false;
 
         ::osl::MutexGuard aGuard( m_aMutex );
         m_bAttemptedInit = true;
 
-        m_pResources.reset( new ::comphelper::OfficeResourceBundle( m_aContext, "sdberr" ) );
-        return m_pResources.get() != nullptr;
+        m_xResources.reset(new std::locale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag())));
+        return m_xResources.get() != nullptr;
     }
 
     SQLError::SQLError( const Reference<XComponentContext> & _rxContext )
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 9f5e819f022f..0361972e48a1 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -29,7 +29,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <algorithm>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::ado;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 8c1431cf6c01..b7c39c7e5550 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -31,7 +31,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace dbtools;
 using namespace connectivity::ado;
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index efda9a97820d..741dc13878da 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 #include <objbase.h>
 
 #include "resource/sharedresources.hxx"
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 2611ace16372..3b5df3c5e486 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -27,7 +27,7 @@
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 5bf8937af21f..732c0a0b4ffe 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -26,7 +26,8 @@
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
+
 using namespace ::comphelper;
 
 
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index 63a45cc6d31f..e12e7379c66f 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -28,7 +28,7 @@
 #include "ado/Awrapado.hxx"
 #include <comphelper/property.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 4d8206a93508..497a721de03d 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 #include <limits>
 
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 6f0a502642fb..0c848f21de78 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -31,7 +31,7 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace ::cppu;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index 74c22bd520d5..d9948573a426 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -26,7 +26,7 @@
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index d15fbf631657..a67e072cc30b 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -26,7 +26,7 @@
 #include "TConnection.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index f7ac7b5f5694..319b02ad6f52 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include "resource/sharedresources.hxx"
-#include "resource/ado_res.hrc"
+#include "strings.hrc"
 #include <com/sun/star/bridge/oleautomation/Date.hpp>
 #include <com/sun/star/bridge/oleautomation/Currency.hpp>
 #include <com/sun/star/bridge/oleautomation/SCode.hpp>
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 52177bff82ac..e82aafc6df23 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -21,7 +21,6 @@
 #include "calc/CDatabaseMetaData.hxx"
 #include "calc/CCatalog.hxx"
 #include "calc/CDriver.hxx"
-#include "resource/calc_res.hrc"
 #include "resource/sharedresources.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
@@ -33,6 +32,7 @@
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
+#include "strings.hrc"
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 4ac9899e5042..67247c1e789d 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -22,8 +22,8 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/calc_res.hrc"
 #include <comphelper/processfactory.hxx>
+#include "strings.hrc"
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 39a672f35840..d99efd817622 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -21,7 +21,7 @@
 #include "dbase/DConnection.hxx"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 
 using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 4063c79576bb..0c80d1c82a59 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include "dbase/DResultSet.hxx"
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <unotools/sharedunocomponent.hxx>
 
 using namespace ::comphelper;
@@ -475,12 +475,12 @@ bool ODbaseIndex::DropImpl()
     return true;
 }
 
-void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile)
+void ODbaseIndex::impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile)
 {
     closeImpl();
     if(UCBContentHelper::Exists(_sFile))
         UCBContentHelper::Kill(_sFile);
-    m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
+    m_pTable->getConnection()->throwGenericSQLException(pErrorId, *this);
 }
 
 bool ODbaseIndex::CreateImpl()
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index f1a722615335..aa772d66b5ab 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -22,7 +22,7 @@
 #include <connectivity/dbexception.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/types.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index af17e616f5fa..0f544ed70cca 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -26,7 +26,7 @@
 #include "dbase/DIndexIter.hxx"
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 9d452e66b85b..d2a0476728f5 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -50,7 +50,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbconversion.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <rtl/strbuf.hxx>
 
 #include <algorithm>
@@ -1106,7 +1106,7 @@ bool ODbaseTable::CreateImpl()
     return true;
 }
 
-void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUString& _sColumnName)
+void ODbaseTable::throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName)
 {
     try
     {
@@ -1118,7 +1118,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUStr
     }
 
     const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
-            _nErrorId,
+            pErrorId,
             "$columnname$", _sColumnName
          ) );
     ::dbtools::throwGenericSQLException( sError, *this );
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 787226e2ed84..57e7abbd9878 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include "dbase/DCatalog.hxx"
 #include <comphelper/types.hxx>
-#include "resource/dbase_res.hrc"
+#include "strings.hrc"
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 661071b3c773..2b661ac21663 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/content.hxx>
 #include <signal.h>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace osl;
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index e656737eef90..aca19f300e72 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -27,7 +27,7 @@
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index d33c8f2a4512..83b05ef3fb18 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -22,7 +22,7 @@
 #include "NConnection.hxx"
 #include "NResultSet.hxx"
 #include "propertyids.hxx"
-#include "resource/evoab2_res.hrc"
+#include "strings.hrc"
 #include "TSortIndex.hxx"
 #include <algorithm>
 
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 8e0fda36dcbc..5f7f297bb8ca 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -21,7 +21,7 @@
 #include "NDatabaseMetaData.hxx"
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "resource/evoab2_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 361eafcfc1bf..58225437ace1 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -30,9 +30,8 @@
 #include "NConnection.hxx"
 #include "NDatabaseMetaData.hxx"
 #include "NResultSet.hxx"
-#include "resource/evoab2_res.hrc"
 #include "sqlbison.hxx"
-#include <resource/common_res.hrc>
+#include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index dfcfada4cbe8..84a56e529225 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -40,7 +40,7 @@
 #include <connectivity/dbexception.hxx>
 #include <osl/thread.h>
 #include <osl/nlsupport.h>
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::file;
 using namespace dbtools;
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 2a99cb1b02ce..2fc1f1d7b1f3 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index c5382afe218d..d1d126bc8f7c 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -33,7 +33,7 @@
 #include <connectivity/PColumn.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace comphelper;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 95d06a06fb3c..96ea61692aa8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -46,9 +46,8 @@
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/types.hxx>
-#include "resource/file_res.hrc"
 #include "resource/sharedresources.hxx"
-
+#include "strings.hrc"
 
 using namespace ::comphelper;
 using namespace connectivity;
@@ -64,10 +63,10 @@ using namespace com::sun::star::container;
 
 namespace
 {
-    void lcl_throwError(sal_uInt16 _nErrorId,const css::uno::Reference< css::uno::XInterface>& _xContext)
+    void lcl_throwError(const char* pErrorId, const css::uno::Reference< css::uno::XInterface>& _xContext)
     {
         ::connectivity::SharedResources aResources;
-        const OUString sMessage = aResources.getResourceString(_nErrorId);
+        const OUString sMessage = aResources.getResourceString(pErrorId);
         ::dbtools::throwGenericSQLException(sMessage ,_xContext);
     }
 }
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 8be612d01b1e..ec86d0a28603 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -34,7 +34,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 #include <algorithm>
 
 namespace connectivity
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 6aadc6319381..4e7d5f16175d 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -24,7 +24,7 @@
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/dbexception.hxx>
 #include "file/FConnection.hxx"
-#include "resource/file_res.hrc"
+#include "strings.hrc"
 
 using namespace ::connectivity;
 using namespace ::connectivity::file;
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 65d6e400e1ca..1853b8caeca7 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -29,12 +29,12 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
-#include "resource/file_res.hrc"
 #include "file/FStringFunctions.hxx"
 #include "file/FDateFunctions.hxx"
 #include "file/FNumericFunctions.hxx"
 #include "file/FConnection.hxx"
 #include "sqlbison.hxx"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 9ab99a1b530e..f6807cf2bbe1 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -43,8 +43,7 @@
 
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlparse.hxx>
-#include <resource/common_res.hrc>
-#include <resource/hsqldb_res.hrc>
+#include <strings.hrc>
 #include <resource/sharedresources.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 399afad3ddb5..99eafb987168 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -21,8 +21,7 @@
 #include "Driver.hxx"
 
 #include <connectivity/dbexception.hxx>
-#include <resource/common_res.hrc>
-#include <resource/hsqldb_res.hrc>
+#include <strings.hrc>
 #include <resource/sharedresources.hxx>
 
 #include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 8c1681a8cd26..7f5c66f6b262 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <comphelper/processfactory.hxx>
 
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index fbb86796442f..056b888d1fea 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -41,7 +41,7 @@
 #include <tools/diagnose_ex.h>
 
 #include "resource/sharedresources.hxx"
-#include "resource/hsqldb_res.hrc"
+#include "strings.hrc"
 
 using ::com::sun::star::util::XFlushListener;
 using ::com::sun::star::lang::EventObject;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index d86826fc6504..6acb9a6c35d9 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -49,7 +49,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include "resource/hsqldb_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index a73df49dec7a..55b636b48211 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include "TConnection.hxx"
-#include "resource/hsqldb_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace connectivity::hsqldb;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index d451148fc988..0f9ba8fb8f9e 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -42,7 +42,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <jni.h>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <unotools/confignode.hxx>
 #include "strings.hxx"
 
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 6bd2dd22ebd1..74513dd5ed76 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -27,7 +27,7 @@
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.hxx>
 #include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 2dab49c56ebb..6763c985283c 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -31,7 +31,7 @@
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbexception.hxx>
 #include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include "java/LocalRef.hxx"
 #include "strings.hxx"
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 9f64d1bd6680..94af450a1c2e 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -41,7 +41,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 #include "java/LocalRef.hxx"
 
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 26d6dc812f1a..8b8e97c3fb20 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index e7e770d2a8fe..49d5ec92cfd8 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -23,7 +23,7 @@
 #include "propertyids.hxx"
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace connectivity::macab;
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index ec72d269a7a8..eaf74c2776b0 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -31,7 +31,7 @@
 #include "TConnection.hxx"
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::macab;
 using namespace cppu;
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 65ff01364635..6cdccdd9c460 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -23,7 +23,7 @@
 #include "MacabRecords.hxx"
 #include "MacabAddressBook.hxx"
 #include "macabutilities.hxx"
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::macab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 208c75cc0130..53a58d4950c8 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -30,7 +30,7 @@
 #include "TConnection.hxx"
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/macab_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity::macab;
 using namespace com::sun::star::uno;
@@ -46,10 +46,10 @@ namespace connectivity
 {
     namespace macab
     {
-    void impl_throwError(sal_uInt16 _nErrorId)
+    void impl_throwError(const char* pErrorId)
     {
         ::connectivity::SharedResources aResources;
-        const OUString sError( aResources.getResourceString(_nErrorId) );
+        const OUString sError( aResources.getResourceString(pErrorId) );
         ::dbtools::throwGenericSQLException(sError,nullptr);
     }
     }
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 6d401bc548ba..c384604e3514 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -134,7 +134,7 @@ namespace connectivity
             return dataType;
         }
 
-        void impl_throwError(sal_uInt16 _nErrorId);
+        void impl_throwError(const char* pErrorId);
     }
 }
 
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 06f21b944074..9c421095232a 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -16,8 +16,7 @@
 
 #include <connectivity/dbexception.hxx>
 
-#include "resource/mork_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 
@@ -354,7 +353,6 @@ void OConnection::disposing()
     m_xCatalog.clear();
 }
 
-
 Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -368,10 +366,9 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
     return xTab;
 }
 
-
 void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext )
 {
-    if ( _rError.getResId() != 0 )
+    if (_rError.getResId() != nullptr)
     {
         OSL_ENSURE( ( _rError.getErrorCondition() == 0 ),
             "OConnection::throwSQLException: unsupported error code combination!" );
@@ -405,12 +402,11 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
     throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext );
 }
 
-
-void OConnection::throwSQLException( const sal_uInt16 _nErrorResourceId, const Reference< XInterface >& _rxContext )
+void OConnection::throwSQLException( const char* pErrorResourceId, const Reference< XInterface >& _rxContext )
 {
     ErrorDescriptor aError;
-    aError.setResId( _nErrorResourceId );
-    throwSQLException( aError, _rxContext );
+    aError.setResId(pErrorResourceId);
+    throwSQLException(aError, _rxContext);
 }
 
 } } // namespace connectivity::mork
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index d53b5671cb99..7c30b17ae098 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -97,7 +97,7 @@ namespace connectivity
             css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog();
 
             void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext );
-            void throwSQLException( const sal_uInt16 _nErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext );
+            void throwSQLException( const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext );
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 69f1fa1f9fbe..af42e314c41b 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -12,7 +12,7 @@
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <vector>
 
 #include "MDatabaseMetaDataHelper.hxx"
diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx
index 6c1e6596de29..aa4c7c201572 100644
--- a/connectivity/source/drivers/mork/MErrorResource.hxx
+++ b/connectivity/source/drivers/mork/MErrorResource.hxx
@@ -27,33 +27,33 @@ namespace connectivity
         class ErrorDescriptor
         {
         private:
-            sal_uInt16      m_nErrorResourceId;
+            const char* m_pErrorResourceId;
             sal_Int32       m_nErrorCondition;
             OUString m_sParameter;
 
         public:
             ErrorDescriptor()
-                :m_nErrorResourceId(0)
+                :m_pErrorResourceId(nullptr)
                 ,m_nErrorCondition(0)
                 ,m_sParameter()
             {
             }
 
-            void setResId( const sal_uInt16 _nErrorResourceId )
+            void setResId(const char* pErrorResourceId)
             {
-                m_nErrorResourceId = _nErrorResourceId;
+                m_pErrorResourceId = pErrorResourceId;
             }
             void reset()
             {
-                m_nErrorResourceId = 0;
+                m_pErrorResourceId = nullptr;
                 m_nErrorCondition = 0;
             }
 
-            sal_uInt16 getResId() const                  { return m_nErrorResourceId; }
+            const char* getResId() const                  { return m_pErrorResourceId; }
             sal_Int32  getErrorCondition() const         { return m_nErrorCondition; }
             const OUString& getParameter() const  { return m_sParameter; }
 
-            bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); }
+            bool is() const { return ( m_pErrorResourceId != nullptr ) || ( m_nErrorCondition != 0 ); }
         };
     }
 }
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 0d363249b63d..5e93429349b3 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <string.h>
 
-#include "resource/mork_res.hrc"
+#include "strings.hrc"
 
 #include <unotools/textsearch.hxx>
 
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index d6edffaac63a..b3bf3b790fc4 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -30,8 +30,7 @@
 #include "MResultSetMetaData.hxx"
 #include "FDatabaseMetaDataResultSet.hxx"
 
-#include "resource/mork_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 2a43e7b1323f..965fa5f2acc5 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -30,8 +30,7 @@
 #include "sqlbison.hxx"
 #include "MResultSet.hxx"
 
-#include "resource/mork_res.hrc"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 static ::osl::Mutex m_ThreadMutex;
 
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index a23b2ccd1aeb..68a29c2e7c9b 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -27,10 +27,9 @@
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include "TConnection.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
-
 namespace connectivity
 {
 
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 977b5bb0ea50..846f41ba8269 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include "TConnection.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 
 using namespace connectivity;
 using namespace connectivity::mysql;
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index 83b795fbbe4c..72ae9593c783 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -23,7 +23,7 @@
 #include "odbc/OTools.hxx"
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace connectivity::odbc;
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index ca487c78bcef..b5e9ed498f52 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -35,7 +35,7 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/FValue.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <connectivity/sqlparse.hxx>
 #include <memory>
 #include <type_traits>
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 6a038b66c1a9..795aad1c51b0 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -35,7 +35,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <algorithm>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 24963cce7f32..70fae3a0d04f 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -22,7 +22,7 @@
 #include "writer/WCatalog.hxx"
 #include "writer/WDriver.hxx"
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index 3406d8589434..ae6a08157390 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include "resource/sharedresources.hxx"
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include <comphelper/processfactory.hxx>
 
 using namespace connectivity::file;
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index cc9ad49b1544..2a18da132d04 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -62,7 +62,7 @@ namespace connectivity
         rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; }
         const OUString&         getURL() const  { return m_sURL; }
         void             setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; }
-        void                    throwGenericSQLException( sal_uInt16 _nErrorResourceId,const css::uno::Reference< css::uno::XInterface>& _xContext  );
+        void                    throwGenericSQLException(const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface>& _xContext);
         const SharedResources& getResources() const { return m_aResources;}
 
         void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; }
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 9753c05a617c..47b157e21cfd 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -86,7 +86,7 @@ namespace connectivity
             OUString getCompletePath();
             void closeImpl();
             // Closes and kills the index file and throws an error
-            void impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile);
+            void impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile);
         protected:
             virtual ~ODbaseIndex() override;
         public:
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 1166b691af1e..a80c0686c7d4 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -134,7 +134,7 @@ namespace connectivity
             /// @throws css::container::ElementExistException
             /// @throws css::uno::RuntimeException
             void SAL_CALL renameImpl( const OUString& newName );
-            void throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName);
+            void throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName);
 
         protected:
             virtual void FileClose() override;
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
deleted file mode 100644
index 8144bce7ea3d..000000000000
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ /dev/null
@@ -1,41 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_ADO_HRC
-#define CONNECTIVITY_RESOURCE_ADO_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the ado driver's resource strings
-
-#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR     ( STR_ADO_BASE +  1 )
-#define STR_INVALID_GROUP_DESCRIPTOR_ERROR      ( STR_ADO_BASE +  2 )
-#define STR_INVALID_INDEX_DESCRIPTOR_ERROR      ( STR_ADO_BASE +  3 )
-#define STR_INVALID_KEY_DESCRIPTOR_ERROR        ( STR_ADO_BASE +  4 )
-#define STR_INVALID_TABLE_DESCRIPTOR_ERROR      ( STR_ADO_BASE +  5 )
-#define STR_INVALID_USER_DESCRIPTOR_ERROR       ( STR_ADO_BASE +  6 )
-#define STR_INVALID_VIEW_DESCRIPTOR_ERROR       ( STR_ADO_BASE +  7 )
-#define STR_VIEW_NO_COMMAND_ERROR               ( STR_ADO_BASE +  8 )
-#define STR_TYPE_NOT_CONVERT                    ( STR_ADO_BASE +  9 )
-#define STR_NO_CONNECTION                       ( STR_ADO_BASE + 10 )
-
-#endif // CONNECTIVITY_RESOURCE_ADO_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
deleted file mode 100644
index 343c983a99a7..000000000000
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ /dev/null
@@ -1,32 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_CALC_HRC
-#define CONNECTIVITY_RESOURCE_CALC_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the calc driver's resource strings
-
-#define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE +    0 )
-
-#endif // CONNECTIVITY_RESOURCE_CALC_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
deleted file mode 100644
index 842e1cc4724a..000000000000
--- a/connectivity/source/inc/resource/common_res.hrc
+++ /dev/null
@@ -1,66 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_COMMON_HRC
-#define CONNECTIVITY_RESOURCE_COMMON_HRC
-
-#include "resource/conn_shared_res.hrc"
-
-// = common strings
-
-#define STR_STRING_LENGTH_EXCEEDED              ( STR_COMMON_BASE +  1 )
-#define STR_CANNOT_CONVERT_STRING               ( STR_COMMON_BASE +  2 )
-#define STR_URI_SYNTAX_ERROR                    ( STR_COMMON_BASE +  3 )
-#define STR_COULD_NOT_LOAD_FILE                 ( STR_COMMON_BASE +  4 )
-#define STR_QUERY_TOO_COMPLEX                   ( STR_COMMON_BASE +  5 )
-#define STR_OPERATOR_TOO_COMPLEX                ( STR_COMMON_BASE +  6 )
-#define STR_QUERY_INVALID_LIKE_COLUMN           ( STR_COMMON_BASE +  7 )
-#define STR_QUERY_INVALID_LIKE_STRING           ( STR_COMMON_BASE +  8 )
-#define STR_QUERY_NOT_LIKE_TOO_COMPLEX          ( STR_COMMON_BASE +  9 )
-#define STR_QUERY_LIKE_WILDCARD                 ( STR_COMMON_BASE + 10 )
-#define STR_QUERY_LIKE_WILDCARD_MANY            ( STR_COMMON_BASE + 11 )
-#define STR_INVALID_COLUMNNAME                  ( STR_COMMON_BASE + 12 )
-#define STR_NO_CLASSNAME                        ( STR_COMMON_BASE + 13 )
-#define STR_NO_CLASSNAME_PATH                   ( STR_COMMON_BASE + 14 )
-#define STR_UNKNOWN_PARA_TYPE                   ( STR_COMMON_BASE + 15 )
-#define STR_INVALID_COLUMN_SELECTION            ( STR_COMMON_BASE + 16 )
-#define STR_PARA_ONLY_PREPARED                  ( STR_COMMON_BASE + 17 )
-#define STR_COLUMN_NOT_UPDATEABLE               ( STR_COMMON_BASE + 18 )
-#define STR_ROW_ALREADY_DELETED                 ( STR_COMMON_BASE + 19 )
-#define STR_UNKNOWN_COLUMN_TYPE                 ( STR_COMMON_BASE + 20 )
-#define STR_FORMULA_WRONG                       ( STR_COMMON_BASE + 21 )
-#define STR_NO_JAVA                             ( STR_COMMON_BASE + 22 )
-#define STR_NO_RESULTSET                        ( STR_COMMON_BASE + 23 )
-#define STR_NO_ROWCOUNT                         ( STR_COMMON_BASE + 24 )
-#define STR_ERRORMSG_SEQUENCE                   ( STR_COMMON_BASE + 25 )
-#define STR_INVALID_INDEX                       ( STR_COMMON_BASE + 26 )
-#define STR_UNSUPPORTED_FUNCTION                ( STR_COMMON_BASE + 27 )
-#define STR_UNSUPPORTED_FEATURE                 ( STR_COMMON_BASE + 28 )
-#define STR_INVALID_PARA_COUNT                  ( STR_COMMON_BASE + 30 )
-#define STR_PRIVILEGE_NOT_GRANTED               ( STR_COMMON_BASE + 31 )
-#define STR_PRIVILEGE_NOT_REVOKED               ( STR_COMMON_BASE + 32 )
-#define STR_INVALID_BOOKMARK                    ( STR_COMMON_BASE + 33 )
-#define STR_NO_ELEMENT_NAME                     ( STR_COMMON_BASE + 34 )
-#define STR_NO_INPUTSTREAM                      ( STR_COMMON_BASE + 35 )
-#define STR_WRONG_PARAM_INDEX                   ( STR_COMMON_BASE + 37 )
-#define STR_NO_CONNECTION_GIVEN                 ( STR_COMMON_BASE + 38 )
-
-#endif // CONNECTIVITY_RESOURCE_COMMON_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
deleted file mode 100644
index 54f0232825df..000000000000
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ /dev/null
@@ -1,52 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_DBASE_HRC
-#define CONNECTIVITY_RESOURCE_DBASE_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the calc driver's resource strings
-
-#define STR_COULD_NOT_DELETE_INDEX              ( STR_DBASE_BASE +    0 )
-#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE   ( STR_DBASE_BASE +    1 )
-#define STR_SQL_NAME_ERROR                      ( STR_DBASE_BASE +    2 )
-#define STR_COULD_NOT_DELETE_FILE               ( STR_DBASE_BASE +    3 )
-#define STR_INVALID_COLUMN_TYPE                 ( STR_DBASE_BASE +    4 )
-#define STR_INVALID_COLUMN_PRECISION            ( STR_DBASE_BASE +    5 )
-#define STR_INVALID_PRECISION_SCALE             ( STR_DBASE_BASE +    6 )
-#define STR_INVALID_COLUMN_NAME_LENGTH          ( STR_DBASE_BASE +    7 )
-#define STR_DUPLICATE_VALUE_IN_COLUMN           ( STR_DBASE_BASE +    8 )
-#define STR_INVALID_COLUMN_DECIMAL_VALUE        ( STR_DBASE_BASE +    9 )
-#define STR_COLUMN_NOT_ALTERABLE                ( STR_DBASE_BASE +   10 )
-#define STR_COLUMN_NOT_ADDABLE                  ( STR_DBASE_BASE +   11 )
-#define STR_COLUMN_NOT_DROP                     ( STR_DBASE_BASE +   12 )
-#define STR_COULD_NOT_ALTER_TABLE               ( STR_DBASE_BASE +   13 )
-#define STR_INVALID_DBASE_FILE                  ( STR_DBASE_BASE +   14 )
-#define STR_ONL_ONE_COLUMN_PER_INDEX            ( STR_DBASE_BASE +   15 )
-#define STR_COULD_NOT_CREATE_INDEX              ( STR_DBASE_BASE +   16 )
-#define STR_COULD_NOT_CREATE_INDEX_NAME         ( STR_DBASE_BASE +   17 )
-#define STR_INVALID_COLUMN_VALUE                ( STR_DBASE_BASE +   18 )
-#define STR_TABLE_NOT_DROP                      ( STR_DBASE_BASE +   19 )
-#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE      ( STR_DBASE_BASE +   20 )
-
-#endif // CONNECTIVITY_RESOURCE_DBASE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
deleted file mode 100644
index 6cb16db7e14f..000000000000
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ /dev/null
@@ -1,33 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_EVOAB2_HRC
-#define CONNECTIVITY_RESOURCE_EVOAB2_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the calc driver's resource strings
-
-#define STR_CANNOT_OPEN_BOOK    ( STR_EVOAB2_BASE +    0 )
-#define STR_SORT_BY_COL_ONLY    ( STR_EVOAB2_BASE +    1 )
-
-#endif // CONNECTIVITY_RESOURCE_CALC_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
deleted file mode 100644
index f7072f684974..000000000000
--- a/connectivity/source/inc/resource/file_res.hrc
+++ /dev/null
@@ -1,40 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_FILE_HRC
-#define CONNECTIVITY_RESOURCE_FILE_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the file driver's resource strings
-
-#define STR_QUERY_COMPLEX_COUNT         ( STR_FILE_BASE +    0 )
-#define STR_QUERY_INVALID_BETWEEN       ( STR_FILE_BASE +    1 )
-#define STR_TABLE_READONLY              ( STR_FILE_BASE +    2 )
-#define STR_DELETE_ROW                  ( STR_FILE_BASE +    3 )
-#define STR_NO_VALID_FILE_URL           ( STR_FILE_BASE +    4 )
-#define STR_QUERY_MORE_TABLES           ( STR_FILE_BASE +    5 )
-#define STR_QUERY_NO_TABLE              ( STR_FILE_BASE +    6 )
-#define STR_QUERY_NO_COLUMN             ( STR_FILE_BASE +    7 )
-#define STR_QUERY_FUNCTION_NOT_SUPPORTED ( STR_FILE_BASE +    8 )
-
-#endif // CONNECTIVITY_RESOURCE_FILE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
deleted file mode 100644
index 6065e6f8fb03..000000000000
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ /dev/null
@@ -1,37 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_HSQLDB_HRC
-#define CONNECTIVITY_RESOURCE_HSQLDB_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the hsqldb driver's resource strings
-
-#define STR_NO_STORAGE              ( STR_HSQLDB_BASE +    0 )
-#define STR_INVALID_FILE_URL        ( STR_HSQLDB_BASE +    1 )
-#define STR_NO_TABLE_CONTAINER      ( STR_HSQLDB_BASE +    2 )
-#define STR_NO_TABLENAME            ( STR_HSQLDB_BASE +    4 )
-#define STR_NO_DOCUMENTUI           ( STR_HSQLDB_BASE +    5 )
-#define STR_ERROR_NEW_VERSION       ( STR_HSQLDB_BASE +    6 )
-
-#endif // CONNECTIVITY_RESOURCE_HSQLDB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
deleted file mode 100644
index 188372b78512..000000000000
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ /dev/null
@@ -1,33 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_MACAB_HRC
-#define CONNECTIVITY_RESOURCE_MACAB_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the macab driver's resource strings
-
-#define STR_NO_TABLE                    ( STR_MACAB_BASE +    0 )
-#define STR_NO_MAC_OS_FOUND             ( STR_MACAB_BASE +    1 )
-
-#endif // CONNECTIVITY_RESOURCE_MACAB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc
deleted file mode 100644
index f69c136733be..000000000000
--- a/connectivity/source/inc/resource/mork_res.hrc
+++ /dev/null
@@ -1,41 +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 .
- */
-
-#ifndef CONNECTIVITY_RESOURCE_MORK_HRC
-#define CONNECTIVITY_RESOURCE_MORK_HRC
-
-#include "resource/conn_shared_res.hrc"
-
-// = the mozab driver's resource strings
-
-    // FREE
-#define STR_ERR_EXECUTING_QUERY             ( STR_MORK_BASE +   10 )
-#define STR_QUERY_INVALID_IS_NULL_COLUMN    ( STR_MORK_BASE +   15 )
-#define STR_ERROR_REFRESH_ROW               ( STR_MORK_BASE +   19 )
-#define STR_ILLEGAL_MOVEMENT                ( STR_MORK_BASE +   20 )
-#define STR_ERROR_GET_ROW                   ( STR_MORK_BASE +   21 )
-#define STR_COMMIT_ROW                      ( STR_MORK_BASE +   22 )
-#define STR_QUERY_AT_LEAST_ONE_TABLES       ( STR_MORK_BASE +   27 )
-#define STR_NO_COUNT_SUPPORT                ( STR_MORK_BASE +   28 )
-#define STR_STMT_TYPE_NOT_SUPPORTED         ( STR_MORK_BASE +   29 )
-#define STR_UNSPECIFIED_ERROR               ( STR_MORK_BASE +   31 )
-
-#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index f0cbaec43784..c284b4a9e59a 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -41,20 +41,20 @@ namespace connectivity
         ~SharedResources();
 
         /** loads a string from the shared resource file
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string
             @return
                 the string from the resource file
         */
         OUString
             getResourceString(
-                ResourceId _nResId
+                const char* pResId
             ) const;
 
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pAsciiPatternToReplace
                 the ASCII string which is to search in the string. Must not be <NULL/>.
@@ -66,7 +66,7 @@ namespace connectivity
         */
         OUString
             getResourceStringWithSubstitution(
-                ResourceId _nResId,
+                const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace,
                 const OUString& _rStringToSubstitute
             ) const;
@@ -74,7 +74,7 @@ namespace connectivity
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pAsciiPatternToReplace1
                 the ASCII string (1) which is to search in the string. Must not be <NULL/>.
@@ -90,7 +90,7 @@ namespace connectivity
         */
         OUString
             getResourceStringWithSubstitution(
-                ResourceId _nResId,
+                const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1,
                 const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2,
@@ -100,7 +100,7 @@ namespace connectivity
         /** loads a string from the shared resource file, and replaces
             a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _pAsciiPatternToReplace1
                 the ASCII string (1) which is to search in the string. Must not be <NULL/>.
@@ -120,7 +120,7 @@ namespace connectivity
         */
         OUString
             getResourceStringWithSubstitution(
-                ResourceId _nResId,
+                const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1,
                 const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2,
@@ -131,7 +131,7 @@ namespace connectivity
 
         /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string
 
-            @param  _nResId
+            @param  pResId
                 the resource ID of the string to load
             @param  _aStringToSubstitutes
                 A list of substitutions.
@@ -139,7 +139,7 @@ namespace connectivity
             @return
                 the string from the resource file, with applied string substitution
         */
-        OUString getResourceStringWithSubstitution( ResourceId _nResId,
+        OUString getResourceStringWithSubstitution( const char* pResId,
                     const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const;
     };
 
diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
deleted file mode 100644
index 13212649e40e..000000000000
--- a/connectivity/source/resource/conn_error_message.src
+++ /dev/null
@@ -1,92 +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 .
- */
-
-// note: the resource IDs of the strings herein *must* correspond to the
-// com::sun::star::sdb::ErrorCondition values.
-//
-// For a given error condition value n, the message string must have ID
-// <code>256 + 2*n</code>, and the SQL state string (if applicable) must
-// have ID <code>256 + 2*n + 1</code>.
-//
-// The messages must be localized, the SQL states must *not*.
-
-// ROW_SET_OPERATION_VETOED = 100
-String 256 + 2*100 + 0
-{
-    Text [ en-US ] = "The record operation has been vetoed.";
-};
-
-// PARSER_CYCLIC_SUB_QUERIES = 200
-String 256 + 2*200 + 0
-{
-    Text [ en-US ] = "The statement contains a cyclic reference to one or more sub queries.";
-};
-
-// DB_OBJECT_NAME_WITH_SLASHES = 300
-String 256 + 2*300 + 0
-{
-    Text [ en-US ] = "The name must not contain any slashes ('/').";
-};
-
-// DB_INVALID_SQL_NAME = 301
-String 256 + 2*301 + 0
-{
-    Text [ en-US ] = "$1$ is no SQL conform identifier.";
-};
-
-// DB_QUERY_NAME_WITH_QUOTES = 302
-String 256 + 2*302 + 0
-{
-    Text [ en-US ] = "Query names must not contain quote characters.";
-};
-
-// DB_OBJECT_NAME_IS_USED = 303
-String 256 + 2*303 + 0
-{
-    Text [ en-US ] = "The name '$1$' is already in use in the database.";
-};
-
-// DB_NOT_CONNECTED = 304
-String 256 + 2*304 + 0
-{
-    Text [ en-US ] = "No connection to the database exists.";
-};
-
-String 256 + 2*304 + 1
-{
-    Text = "08003";
-};
-
-String 256 + 2*500 + 0
-{
-    Text [ en-US ] = "No $1$ exists.";
-};
-
-// DATA_CANNOT_SELECT_UNFILTERED = 550
-String 256 + 2*550 + 0
-{
-    Text [ en-US ] = "Unable to display the complete table content. Please apply a filter.";
-};
-
-String 256 + 2*550 + 1
-{
-    Text = "IM001";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
deleted file mode 100644
index f199414aa1f4..000000000000
--- a/connectivity/source/resource/conn_shared_res.src
+++ /dev/null
@@ -1,493 +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/mork_res.hrc"
-#include "resource/macab_res.hrc"
-#include "resource/calc_res.hrc"
-#include "resource/ado_res.hrc"
-#include "resource/dbase_res.hrc"
-#include "resource/file_res.hrc"
-#include "resource/evoab2_res.hrc"
-#include "resource/kab_res.hrc"
-#include "resource/hsqldb_res.hrc"
-
-// = the mozab driver's resource strings
-
-String STR_ERR_EXECUTING_QUERY
-{
-    Text [ en-US ] = "An error occurred while executing the query.";
-};
-
-String STR_QUERY_AT_LEAST_ONE_TABLES
-{
-    Text [ en-US ] = "The query can not be executed. It needs at least one table.";
-};
-
-String STR_NO_COUNT_SUPPORT
-{
-    Text [ en-US ] = "The driver does not support the 'COUNT' function.";
-};
-
-String STR_STMT_TYPE_NOT_SUPPORTED
-{
-    Text [ en-US ] = "This statement type not supported by this database driver.";
-};
-
-String STR_UNSPECIFIED_ERROR
-{
-    Text [ en-US ] = "An unknown error occurred.";
-};
-
-String STR_ERROR_REFRESH_ROW
-{
-    Text [ en-US ] = "An error occurred while refreshing the current row.";
-};
-
-String STR_ERROR_GET_ROW
-{
-    Text [ en-US ] = "An error occurred while getting the current row.";
-};
-
-String STR_QUERY_INVALID_IS_NULL_COLUMN
-{
-    Text [ en-US ] = "The query can not be executed. The 'IS NULL' can only be used with a column name.";
-};
-
-String STR_ILLEGAL_MOVEMENT
-{
-    Text [ en-US ] = "Illegal cursor movement occurred.";
-};
-
-String STR_COMMIT_ROW
-{
-    Text [ en-US ] = "Please commit row '$position$' before update rows or insert new rows.";
-};
-
-// = common strings
-
-String STR_NO_CONNECTION_GIVEN
-{
-    Text [ en-US ] = "It doesn't exist a connection to the database.";
-};
-String STR_WRONG_PARAM_INDEX
-{
-    Text [ en-US ] = "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source.";
-};
-String STR_NO_INPUTSTREAM
-{
-    Text [ en-US ] = "The input stream was not set.";
-};
-String STR_NO_ELEMENT_NAME
-{
-    Text [ en-US ] = "There is no element named '$name$'.";
-};
-String STR_INVALID_BOOKMARK
-{
-    Text [ en-US ] = "Invalid bookmark value";
-};
-String STR_PRIVILEGE_NOT_GRANTED
-{
-    Text [ en-US ] = "Privilege not granted: Only table privileges can be granted.";
-};
-String STR_PRIVILEGE_NOT_REVOKED
-{
-    Text [ en-US ] = "Privilege not revoked: Only table privileges can be revoked.";
-};
-
-String STR_ERRORMSG_SEQUENCE
-{
-    Text [ en-US ] = "Function sequence error.";
-};
-String STR_INVALID_INDEX
-{
-    Text [ en-US ] = "Invalid descriptor index.";
-};
-String STR_UNSUPPORTED_FUNCTION
-{
-    Text [ en-US ] = "The driver does not support the function '$functionname$'.";
-};
-String STR_UNSUPPORTED_FEATURE
-{
-    Text [ en-US ] = "The driver does not support the functionality for '$featurename$'. It is not implemented.";
-};
-String STR_FORMULA_WRONG
-{
-    Text [ en-US ] = "The formula for TypeInfoSettings is wrong!";
-};
-String STR_STRING_LENGTH_EXCEEDED
-{
-    Text [ en-US ] = "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'.";
-};
-
-String STR_CANNOT_CONVERT_STRING
-{
-    Text [ en-US ] = "The string '$string$' cannot be converted using the encoding '$charset$'.";
-};
-
-String STR_URI_SYNTAX_ERROR
-{
-    Text [ en-US ] = "The connection URL is invalid.";
-};
-
-String STR_QUERY_TOO_COMPLEX
-{
-    Text [ en-US ] = "The query can not be executed. It is too complex.";
-};
-String STR_OPERATOR_TOO_COMPLEX
-{
-    Text [ en-US ] = "The query can not be executed. The operator is too complex.";
-};
-String STR_QUERY_INVALID_LIKE_COLUMN
-{
-    Text [ en-US ] = "The query can not be executed. You cannot use 'LIKE' with columns of this type.";
-};
-String STR_QUERY_INVALID_LIKE_STRING
-{
-    Text [ en-US ] = "The query can not be executed. 'LIKE' can be used with a string argument only.";
-};
-String STR_QUERY_NOT_LIKE_TOO_COMPLEX
-{
-    Text [ en-US ] = "The query can not be executed. The 'NOT LIKE' condition is too complex.";
-};
-String STR_QUERY_LIKE_WILDCARD
-{
-    Text [ en-US ] = "The query can not be executed. The 'LIKE' condition contains wildcard in the middle.";
-};
-String STR_QUERY_LIKE_WILDCARD_MANY
-{
-    Text [ en-US ] = "The query can not be executed. The 'LIKE' condition contains too many wildcards.";
-};
-String STR_INVALID_COLUMNNAME
-{
-    Text [ en-US ] = "The column name '$columnname$' is not valid.";
-};
-String STR_INVALID_COLUMN_SELECTION
-{
-    Text [ en-US ] = "The statement contains an invalid selection of columns.";
-};
-String STR_COLUMN_NOT_UPDATEABLE
-{
-    Text [ en-US ] = "The column at position '$position$' could not be updated.";
-};
-
-String STR_COULD_NOT_LOAD_FILE
-{
-    Text [ en-US ] = "The file $filename$ could not be loaded.";
-};
-
-String STR_LOAD_FILE_ERROR_MESSAGE
-{
-    Text [ en-US ] = "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$";
-};
-
-// = the ado driver's resource strings
-
-String STR_TYPE_NOT_CONVERT
-{
-    Text [ en-US ] = "The type could not be converted.";
-};
-String STR_INVALID_COLUMN_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not append column: invalid column descriptor.";
-};
-
-String STR_INVALID_GROUP_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create group: invalid object descriptor.";
-};
-String STR_INVALID_INDEX_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create index: invalid object descriptor.";
-};
-String STR_INVALID_KEY_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create key: invalid object descriptor.";
-};
-
-String STR_INVALID_TABLE_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create table: invalid object descriptor.";
-};
-
-String STR_INVALID_USER_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create user: invalid object descriptor.";
-};
-
-String STR_INVALID_VIEW_DESCRIPTOR_ERROR
-{
-    Text [ en-US ] = "Could not create view: invalid object descriptor.";
-};
-
-String STR_VIEW_NO_COMMAND_ERROR
-{
-    Text [ en-US ] = "Could not create view: no command object.";
-};
-
-String STR_NO_CONNECTION
-{
-    Text [ en-US ] = "The connection could not be created. May be the necessary data provider is not installed.";
-};
-
-// dbase
-String STR_COULD_NOT_DELETE_INDEX
-{
-    Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred.";
-};
-String STR_ONL_ONE_COLUMN_PER_INDEX
-{
-    Text [ en-US ] = "The index could not be created. Only one column per index is allowed.";
-};
-String STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE
-{
-    Text [ en-US ] = "The index could not be created. The values are not unique.";
-};
-
-String STR_COULD_NOT_CREATE_INDEX
-{
-    Text [ en-US ] = "The index could not be created. An unknown error appeared.";
-};
-String STR_COULD_NOT_CREATE_INDEX_NAME
-{
-    Text [ en-US ] = "The index could not be created. The file '$filename$' is used by an other index.";
-};
-String STR_COULD_NOT_CREATE_INDEX_KEYSIZE
-{
-    Text [ en-US ] = "The index could not be created. The size of the chosen column is too big.";
-};
-
-String STR_SQL_NAME_ERROR
-{
-    Text [ en-US ] = "The name '$name$' doesn't match SQL naming constraints.";
-};
-
-String STR_COULD_NOT_DELETE_FILE
-{
-    Text [ en-US ] = "The file $filename$ could not be deleted.";
-};
-
-String STR_INVALID_COLUMN_TYPE
-{
-    Text [ en-US ] = "Invalid column type for column '$columnname$'.";
-};
-String STR_INVALID_COLUMN_PRECISION
-{
-    Text [ en-US ] = "Invalid precision for column '$columnname$'.";
-};
-
-String STR_INVALID_PRECISION_SCALE
-{
-    Text [ en-US ] = "Precision is less than scale for column '$columnname$'.";
-};
-
-String STR_INVALID_COLUMN_NAME_LENGTH
-{
-    Text [ en-US ] = "Invalid column name length for column '$columnname$'.";
-};
-
-String STR_DUPLICATE_VALUE_IN_COLUMN
-{
-    Text [ en-US ] = "Duplicate value found in column '$columnname$'.";
-};
-
-String STR_INVALID_COLUMN_DECIMAL_VALUE
-{
-    Text [ en-US ] = "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n\nThe specified value \"$value$ is longer than the number of digits allowed.";
-};
-
-String STR_COLUMN_NOT_ALTERABLE
-{
-    Text [ en-US ] = "The column '$columnname$' could not be altered. May be the file system is write protected.";
-};
-String STR_INVALID_COLUMN_VALUE
-{
-    Text [ en-US ] = "The column '$columnname$' could not be updated. The value is invalid for that column.";
-};
-String STR_COLUMN_NOT_ADDABLE
-{
-    Text [ en-US ] = "The column '$columnname$' could not be added. May be the file system is write protected.";
-};
-String STR_COLUMN_NOT_DROP
-{
-    Text [ en-US ] = "The column at position '$position$' could not be dropped. May be the file system is write protected.";
-};
-String STR_TABLE_NOT_DROP
-{
-    Text [ en-US ] = "The table '$tablename$' could not be dropped. May be the file system is write protected.";
-};
-String STR_COULD_NOT_ALTER_TABLE
-{
-    Text [ en-US ] = "The table could not be altered.";
-};
-
-String STR_INVALID_DBASE_FILE
-{
-    Text [ en-US ] = "The file '$filename$' is an invalid (or unrecognized) dBase file.";
-};
-
-// Evoab2
-
-String STR_CANNOT_OPEN_BOOK
-{
-    Text [ en-US ] = "Cannot open Evolution address book.";
-};
-
-String STR_SORT_BY_COL_ONLY
-{
-    Text [ en-US ] = "Can only sort by table columns.";
-};
-
-// File
-String STR_QUERY_COMPLEX_COUNT
-{
-    Text [ en-US ] = "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported.";
-};
-String STR_QUERY_INVALID_BETWEEN
-{
-    Text [ en-US ] = "The query can not be executed. The 'BETWEEN' arguments are not correct.";
-};
-String STR_QUERY_FUNCTION_NOT_SUPPORTED
-{
-    Text [ en-US ] = "The query can not be executed. The function is not supported.";
-};
-String STR_TABLE_READONLY
-{
-    Text [ en-US ] = "The table can not be changed. It is read only.";
-};
-String STR_DELETE_ROW
-{
-    Text [ en-US ] = "The row could not be deleted. The option \"Display inactive records\" is set.";
-};
-String STR_ROW_ALREADY_DELETED
-{
-    Text [ en-US ] = "The row could not be deleted. It is already deleted.";
-};
-String STR_QUERY_MORE_TABLES
-{
-    Text [ en-US ] = "The query can not be executed. It contains more than one table.";
-};
-String STR_QUERY_NO_TABLE
-{
-    Text [ en-US ] = "The query can not be executed. It contains no valid table.";
-};
-String STR_QUERY_NO_COLUMN
-{
-    Text [ en-US ] = "The query can not be executed. It contains no valid columns.";
-};
-String STR_INVALID_PARA_COUNT
-{
-    Text [ en-US ] = "The count of the given parameter values doesn't match the parameters.";
-};
-String STR_NO_VALID_FILE_URL
-{
-    Text [ en-US ] = "The URL '$URL$' is not valid. A connection can not be created.";
-};
-
-String STR_NO_CLASSNAME
-{
-    Text [ en-US ] = "The driver class '$classname$' could not be loaded.";
-};
-String STR_NO_JAVA
-{
-    Text [ en-US ] = "No Java installation could be found. Please check your installation.";
-};
-String STR_NO_RESULTSET
-{
-    Text [ en-US ] = "The execution of the query doesn't return a valid result set.";
-};
-String STR_NO_ROWCOUNT
-{
-    Text [ en-US ] = "The execution of the update statement doesn't effect any rows.";
-};
-
-String STR_NO_CLASSNAME_PATH
-{
-    Text [ en-US ] = "The additional driver class path is '$classpath$'.";
-};
-String STR_UNKNOWN_PARA_TYPE
-{
-    Text [ en-US ] = "The type of parameter at position '$position$' is unknown.";
-};
-String STR_UNKNOWN_COLUMN_TYPE
-{
-    Text [ en-US ] = "The type of column at position '$position$' is unknown.";
-};
-
-// KAB
-
-String STR_NO_KDE_INST
-{
-    Text [ en-US ] = "No suitable KDE installation was found.";
-};
-
-String STR_KDE_VERSION_TOO_OLD
-{
-    Text [ en-US ] = "KDE version $major$.$minor$ or higher is required to access the KDE Address Book.";
-};
-String STR_KDE_VERSION_TOO_NEW
-{
-    Text [ en-US ] = "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n";
-};
-String STR_KDE_VERSION_TOO_NEW_WORK_AROUND
-{
-    Text [ en-US ] = "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n";
-};
-String STR_PARA_ONLY_PREPARED
-{
-    Text [ en-US ] = "Parameters can appear only in prepared statements.";
-};
-
-// MACAB
-String STR_NO_TABLE
-{
-    Text [ en-US ] = "No such table!";
-};
-
-String STR_NO_MAC_OS_FOUND
-{
-    Text [ en-US ] = "No suitable Mac OS installation was found.";
-};
-
-// hsqldb
-String STR_NO_STORAGE
-{
-    Text [ en-US ] = "The connection can not be established. No storage or URL was given.";
-};
-String STR_INVALID_FILE_URL
-{
-    Text [ en-US ] = "The given URL contains no valid local file system path. Please check the location of your database file.";
-};
-String STR_NO_TABLE_CONTAINER
-{
-    Text [ en-US ] = "An error occurred while obtaining the connection's table container.";
-};
-String STR_NO_TABLENAME
-{
-    Text [ en-US ] = "There is no table named '$tablename$'.";
-};
-String STR_NO_DOCUMENTUI
-{
-    Text [ en-US ] = "The provided DocumentUI is not allowed to be NULL.";
-};
-String STR_ERROR_NEW_VERSION
-{
-    Text [ en-US ] = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 5f6e76e55969..1767bfaec8a0 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -20,14 +20,13 @@
 #include <memory>
 #include "resource/sharedresources.hxx"
 
-#include <comphelper/processfactory.hxx>
-#include <comphelper/officeresourcebundle.hxx>
-
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <tools/diagnose_ex.h>
+#include <tools/resmgr.hxx>
 #include <osl/diagnose.h>
-
+#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
 
 namespace connectivity
 {
@@ -44,8 +43,7 @@ namespace connectivity
         static  oslInterlockedCount     s_nClients;
 
     private:
-        std::unique_ptr< ::comphelper::OfficeResourceBundle >
-                                        m_pResourceBundle;
+        std::locale                     m_aLocale;
 
     public:
         static void     registerClient();
@@ -54,7 +52,7 @@ namespace connectivity
         static SharedResources_Impl&
                         getInstance();
 
-        OUString getResourceString( ResourceId _nId );
+        OUString getResourceString(const char* pId);
 
     private:
         SharedResources_Impl();
@@ -66,43 +64,24 @@ namespace connectivity
         }
     };
 
-
     SharedResources_Impl*   SharedResources_Impl::s_pInstance( nullptr );
     oslInterlockedCount     SharedResources_Impl::s_nClients( 0 );
 
-
     SharedResources_Impl::SharedResources_Impl()
+        : m_aLocale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag()))
     {
-        try
-        {
-            Reference< XComponentContext > xContext(
-                comphelper::getProcessComponentContext() );
-            m_pResourceBundle.reset( new ::comphelper::OfficeResourceBundle( xContext, "cnr" ) );
-        }
-        catch( const Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-        }
     }
 
-
-    OUString SharedResources_Impl::getResourceString( ResourceId _nId )
+    OUString SharedResources_Impl::getResourceString(const char* pId)
     {
-        if ( m_pResourceBundle.get() == nullptr )
-            // this should never happen, but we gracefully ignore it. It has been reported
-            // in the constructor in non-product builds.
-            return OUString();
-
-        return m_pResourceBundle->loadString( _nId );
+        return Translate::get(pId, m_aLocale);
     }
 
-
     void SharedResources_Impl::registerClient()
     {
         osl_atomic_increment( &s_nClients );
     }
 
-
     void SharedResources_Impl::revokeClient()
     {
         ::osl::MutexGuard aGuard( getMutex() );
@@ -156,48 +135,48 @@ namespace connectivity
     }
 
 
-    OUString SharedResources::getResourceString( ResourceId _nResId ) const
+    OUString SharedResources::getResourceString(const char* pResId) const
     {
-        return SharedResources_Impl::getInstance().getResourceString( _nResId );
+        return SharedResources_Impl::getInstance().getResourceString(pResId);
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace, _rStringToSubstitute ) );
         return sString;
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2 ) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) );
         return sString;
     }
 
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                 const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2,
                 const sal_Char* _pAsciiPatternToReplace3, const OUString& _rStringToSubstitute3 ) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) );
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace3, _rStringToSubstitute3 ) );
         return sString;
     }
 
-    OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
+    OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
                     const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const
     {
-        OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) );
+        OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
         std::list< std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin();
         std::list< std::pair<const sal_Char* , OUString > >::const_iterator aEnd  = _rStringToSubstitutes.end();
         for(;aIter != aEnd; ++aIter)
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 8cf535c40cd3..4e0e3a557c22 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -30,7 +30,7 @@
 #include <comphelper/property.hxx>
 #include "TConnection.hxx"
 #include <rtl/ustrbuf.hxx>
-#include "resource/common_res.hrc"
+#include "strings.hrc"
 #include "resource/sharedresources.hxx"
 
 using namespace connectivity::sdbcx;
author	Caolán McNamara <caolanm@redhat.com>	2017-06-11 20:56:30 +0100
committer	Caolán McNamara <caolanm@redhat.com>	2017-07-21 08:20:50 +0100
commit	00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
tree	fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /connectivity
parent	fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)