configmgr/source/components.cxx | 7 -------
configmgr/source/components.hxx | 2 --
2 files changed, 9 deletions(-)
New commits:
commit 8c93e2c280536ba3acf9553aa199c752c8ca23f6
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed May 6 09:25:57 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 6 14:50:23 2020 +0200
Remove support for "module" layers
f4d8090a484f99970f00bab2aa9b9f8d6cbe4fdc "Drop support for long-gone
share/registry/modules layer" stated: "Support for 'module' layers in
configmgr/source/components.cxx is still needed for
gb_CppunitTest_use_filter_configuration in solenv/gbuild/CppunitTest.mk."
But
that need is meanwhile gone since e1b51e7beb7f9cfa7b574b9c2a69799e62963a09
"gbuild: use .xcd configuration files from instdir" removed
gb_CppunitTest_use_filter_configuration.
Change-Id: Ide8d69e79272df7c450edfb1e763e3dcc8f257e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93546
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 57cf0840b1bf..5dfb8c281cb7 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -516,9 +516,6 @@ Components::Components(
userExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
- } else if (type == "module") {
- parseModuleLayer(layer, url);
- ++layer; //TODO: overflow
} else if (type == "res") {
sal_uInt32 nStartTime = osl_getGlobalTimer();
parseResLayer(layer, url);
@@ -856,10 +853,6 @@ void Components::parseXcsXcuIniLayer(
}
}
-void Components::parseModuleLayer(int layer, OUString const & url) {
- parseFiles(layer, ".xcu", &parseXcuFile, url, false);
-}
-
void Components::parseResLayer(int layer, OUString const & url) {
OUString resUrl(url + "/res");
parseXcdFiles(layer, resUrl);
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 6aec76bd1aad..8db06909b192 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -132,8 +132,6 @@ private:
void parseXcsXcuIniLayer(
int layer, OUString const & url, bool recordAdditions);
- void parseModuleLayer(int layer, OUString const & url);
-
void parseResLayer(int layer, OUString const & url);
void parseModificationLayer(int layer, OUString const & url);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
