Repository.mk | 2 +- extras/Module_extras.mk | 2 +- extras/Package_tplpresnt.mk | 9 +++++++++ sw/source/core/swg/SwXMLTextBlocks1.cxx | 4 ++++ 4 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 55baaa526c301d86d09400a9a50d482fb14dd2c2 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Nov 26 16:33:49 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Nov 27 12:33:43 2024 +0100 for --without-templates still generate the template/common/presnt dir but leave it empty Change-Id: Ie7f95f6d01c669598305e24472c357c1b92ad1f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177353 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Rashesh Padia <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit e393a739fa890aeb77f189b62de4356043211490) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177392 Tested-by: Jenkins diff --git a/Repository.mk b/Repository.mk index c90c56880147..fc2e071ccc26 100644 --- a/Repository.mk +++ b/Repository.mk @@ -981,10 +981,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ extras_persona_pink \ extras_persona_sand \ extras_persona_white \ + extras_tplpresnt \ extras_tplwizdesktop \ $(if $(WITH_TEMPLATES),\ extras_templates \ - extras_tplpresnt \ extras_tplwizbitmap \ extras_tplwizard \ ) \ diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 0c04202e8a20..f78c226cd401 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_labels \ $(if $(filter WNT,$(OS)),Package_newfiles) \ Package_palettes \ + Package_tplpresnt \ Package_tplwizdesktop \ Package_wordbook \ )) @@ -51,7 +52,6 @@ endif ifneq ($(WITH_TEMPLATES),) $(eval $(call gb_Module_add_targets,extras,\ Package_templates \ - Package_tplpresnt \ Package_tplwizard \ Package_tplwizbitmap \ )) diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk index cb3cf2562245..a9e0b723cbf8 100644 --- a/extras/Package_tplpresnt.mk +++ b/extras/Package_tplpresnt.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt)) +ifneq ($(WITH_TEMPLATES),) + $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\ Candy.otp \ DNA.otp \ @@ -35,4 +37,11 @@ $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/templat Yellow_Idea.otp \ )) +else + +# For without-templates, still include the empty directory +$(eval $(call gb_Package_add_empty_directory,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt)) + +endif + # vim: set noet sw=4 ts=4: commit 7dfa6d794d52e275b43da82cce2ed86a5621a4c5 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Nov 12 16:47:27 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Nov 27 12:33:30 2024 +0100 disable autotext atevent.xml in kit mode Change-Id: Ie6e3e38768124e256a31c343a10cbc30262708e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176492 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit afc7f61f6a87f2daf3b9e3cba2ecd4a70578793d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177394 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index 3f3005eb9996..89517d652c24 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -26,6 +26,7 @@ #include <comphelper/diagnose_ex.hxx> #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> +#include <comphelper/lok.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/io/IOException.hpp> @@ -179,6 +180,9 @@ ErrCode SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx, if ( OpenFile() != ERRCODE_NONE ) return ERR_SWG_READ_ERROR; + if (comphelper::LibreOfficeKit::isActive()) + return ERR_SWG_READ_ERROR; + try { m_xRoot = m_xBlkRoot->openStorageElement( m_aPackageName, embed::ElementModes::READ );
