extensions/source/propctrlr/formcomponenthandler.cxx | 2 +-
helpcontent2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ff22a3ff99da3abc0531c5a4eeccc25d45b61adb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Nov 3 16:39:30 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Nov 3 20:56:08 2021 +0100
Add back `== 2`
...that got lost in 23c8da878529f85ba5045db6f7ea7956a64dfc72 "put the
message
into static_assert" (causing a loplugin:consttobool warning)
Change-Id: I8f2a97bd61edbfad0c871c0d2d0e25f1ce9f9f98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124658
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index ebb30470a6db..5d4625db8f10 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -519,7 +519,7 @@ namespace pcr
if( ! (_rControlValue >>= sControlValue) )
SAL_WARN("extensions.propctrlr", "convertToControlValue:
unable to get property for Show/Hide");
- static_assert(SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE),
"FormComponentPropertyHandler::convertToPropertyValue: broken resource for
Show/Hide!");
+ static_assert(SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE) == 2,
"FormComponentPropertyHandler::convertToPropertyValue: broken resource for
Show/Hide!");
bool bShow = sControlValue == PcrRes(RID_RSC_ENUM_SHOWHIDE[1]);
aPropertyValue <<= bShow;
commit 913c9aa8f5bb681b3437d21b0d18c02627e99ad6
Author: Johnny_M <kla...@partyheld.de>
AuthorDate: Wed Nov 3 20:56:00 2021 +0100
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Wed Nov 3 20:56:00 2021 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to d267338da14c3d505dcb2245e4fd4501b3351963
- tdf#132643 Translate German section IDs
Remove unused.
Change-Id: Ib70cf57c351c2342a3cebdd9052b42d134bb9e53
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124516
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/helpcontent2 b/helpcontent2
index 7a6242adb760..d267338da14c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7a6242adb760c8f8603d9dd4af880e5a9ebae2a0
+Subproject commit d267338da14c3d505dcb2245e4fd4501b3351963
