configmgr/source/partial.cxx | 2 +- sw/source/uibase/config/usrpref.cxx | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-)
New commits: commit 4a584493db8b920637b664459e7519b6eef458a4 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Dec 16 14:09:12 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 20 20:29:35 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/+/178603 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx index 89643cb7ceb9..b7eecfefd632 100644 --- a/configmgr/source/partial.cxx +++ b/configmgr/source/partial.cxx @@ -72,7 +72,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; } commit d355682ba1799eb42069f4095e321db95fc2f540 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 20 14:21:48 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 20 20:29:22 2024 +0100 make SwFmtAidsAutoComplConfig ConfigItem listen to the config changes. Change-Id: I92f57f9ea8a0ea109fbec9e18665adeb3c6d2837 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178931 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 88c456ed2264..2904cd62abed 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -81,8 +81,6 @@ SwMasterUsrPref::SwMasterUsrPref(bool bWeb) : m_nDefTabInMm100 = 1250; return; } - - m_aFmtAidsAutoComplConfig.Load(); } SwMasterUsrPref::~SwMasterUsrPref() @@ -647,9 +645,11 @@ Sequence<OUString> SwFmtAidsAutoComplConfig::GetPropertyNames() } SwFmtAidsAutoComplConfig::SwFmtAidsAutoComplConfig(SwMasterUsrPref& rPar) - : ConfigItem(u"Office.Writer/FmtAidsAutocomplete"_ustr, ConfigItemMode::ReleaseTree) + : ConfigItem(u"Office.Writer/FmtAidsAutocomplete"_ustr) , m_rParent(rPar) { + Load(); + EnableNotification(GetPropertyNames()); } SwFmtAidsAutoComplConfig::~SwFmtAidsAutoComplConfig() {} @@ -700,7 +700,10 @@ void SwFmtAidsAutoComplConfig::Load() } } -void SwFmtAidsAutoComplConfig::Notify(const css::uno::Sequence<OUString>&) {} +void SwFmtAidsAutoComplConfig::Notify(const css::uno::Sequence<OUString>&) +{ + Load(); +} SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) : ConfigItem(u"Office.WriterWeb/Background"_ustr)
