summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2024-12-16 14:09:12 +0000
committerMiklos Vajna <vmiklos@collabora.com>2024-12-17 11:29:07 +0100
commit7a980e930d0fe0b5e93750afb141ae216543339c (patch)
tree63a436a576773e8be8e77400e51e70fbe0e5b3d8
parente82eb7f2aa998ebd841f3533884c2f6f642c73e4 (diff)
let insertModificationXcuFile accept "/" to indicate all nodes
insertModificationXcuFile takes a set of paths to include and a set of paths to ignore from a given .xcu files adapt this to allow an include path of "/" to match all contents of the xcu. insertModificationXcuFile is more useful than insertExtensionXcuFile for the intended use case, because the latter inserts as an extension level layer, and cannot override higher layers. Change-Id: I8eabd9fb91184146a75b087cc31cee44f378d96d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178595 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--configmgr/source/partial.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index f31e98549684..9ab65ada7b00 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -71,7 +71,7 @@ Partial::Partial(
for (Node * p = &root_;;) {
OUString seg;
bool end = parseSegment(includedPath, &n, &seg);
- p = &p->children[seg];
+ p = !seg.isEmpty() ? &p->children[seg] : p;
if (p->startInclude) {
break;
}