core.git: Branch 'distro/collabora/co-24.04' - configmgr/source

[Caolán McNamara (via logerrit)]

 configmgr/source/partial.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a980e930d0fe0b5e93750afb141ae216543339c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 16 14:09:12 2024 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Dec 17 11:29:07 2024 +0100

    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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

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;
             }