officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs | 6 ++++++ sfx2/source/dialog/infobar.cxx | 2 ++ 2 files changed, 8 insertions(+)
New commits: commit 2d5e0e038f4e04ff7aa330e72d7358d5335a6f3a Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> AuthorDate: Mon Jan 30 14:59:06 2023 +0100 Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> CommitDate: Thu Feb 2 08:38:40 2023 +0000 Add missing macro infobar to isInfobarEnabled Change-Id: I7b9ddc0adfed2b7c27150d2d126f83e6a5ecf19d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146360 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs index 6b29f0b47e6a..6235c575c5d0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs @@ -60,6 +60,12 @@ </info> <value>true</value> </prop> + <prop oor:name="MacrosDisabled" oor:type="xs:boolean" oor:nillable="false"> + <info> + <desc>Whether an Infobar is shown macros were blocked due to Macro Security settings.</desc> + </info> + <value>true</value> + </prop> </group> </component> </oor:component-schema> diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index aca75bffadd1..3eeb41b98e32 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -435,6 +435,8 @@ bool SfxInfoBarContainerWindow::isInfobarEnabled(std::u16string_view sId) return officecfg::Office::UI::Infobar::Enabled::WhatsNew::get(); if (sId == u"hiddentrackchanges") return officecfg::Office::UI::Infobar::Enabled::HiddenTrackChanges::get(); + if (sId == u"macro") + return officecfg::Office::UI::Infobar::Enabled::MacrosDisabled::get(); return true; }