Repository.mk | 3 ---
compilerplugins/clang/staticmethods.cxx | 2 --
compilerplugins/clang/unusedmethods.results | 2 --
connectivity/inc/strings.hrc | 16 +---------------
include/sal/log-areas.dox | 2 --
5 files changed, 1 insertion(+), 24 deletions(-)
New commits:
commit c1625e807ff7d94d0598b2aa86735fb94b829288
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Dec 14 14:22:01 2020 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Dec 14 16:16:09 2020 +0100
tdf#138715 remove mork strings and install targets
Hopefully fixes the package build. Regression from commit
ee9ed2192b56c98e5b8ee9890ddb4c533117332a ("tdf#138715 remove mork
driver").
Change-Id: I0faad65af834e3668c9845eadfe3439ae57b3699
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107692
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/Repository.mk b/Repository.mk
index 9dea44f7db9c..5311a5d1b84b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
localize \
makedepend \
mbsdiff \
- mork_helper \
osl_process_child \
pdf2xml \
pdfunzip \
@@ -384,8 +383,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(MERGELIBS),merged) \
migrationoo2 \
migrationoo3 \
- mork \
- mozbootstrap \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index 86206022496f..06afc3d92584 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -150,8 +150,6 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
.Class("OleEmbeddedObject").GlobalNamespace())
|| (fdc.Function("GetRidOfComponent").Class("OleEmbeddedObject")
.GlobalNamespace())
- || (fdc.Function("isProfileLocked").Class("ProfileAccess")
- .Namespace("mozab").Namespace("connectivity").GlobalNamespace())
|| cdc.Class("SbxDecimal").GlobalNamespace()
|| fdc.Function("Call").Class("SbiDllMgr").GlobalNamespace()
|| fdc.Function("FreeDll").Class("SbiDllMgr").GlobalNamespace()
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index 56846f836155..cb8303fbb3d8 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -54,8 +54,6 @@ connectivity/source/drivers/firebird/Util.hxx:72
short connectivity::firebird::ColumnTypeInfo::getSubType() const
connectivity/source/drivers/firebird/Util.hxx:74
const class rtl::OUString &
connectivity::firebird::ColumnTypeInfo::getCharacterSet() const
-connectivity/source/drivers/mork/mork_helper.cxx:37
- int main(int,char **)
connectivity/source/drivers/mysqlc/mysqlc_connection.hxx:176
class rtl::OUString
connectivity::mysqlc::OConnection::transFormPreparedStatement(const class
rtl::OUString &)
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:94
diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
index c1b4fa30b977..ce4177493bd9 100644
--- a/connectivity/inc/strings.hrc
+++ b/connectivity/inc/strings.hrc
@@ -17,22 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CONNECTIVITY_STRINGS_HRC
-#define CONNECTIVITY_STRINGS_HRC
+#pragma once
#define NC_(Context, String) reinterpret_cast<char const *>(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",
"No connection to the database exists.")
#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.")
@@ -139,6 +127,4 @@
#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/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 53ff9f485bc3..4a602a604e9e 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -82,8 +82,6 @@ certain functionality.
@li @c connectivity.kab
@li @c connectivity.macab
@li @c connectivity.manager
-@li @c connectivity.mork
-@li @c connectivity.mozab
@li @c connectivity.mysqlc
@li @c connectivity.odbc
@li @c connectivity.parse
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
