[Libreoffice-commits] core.git: sw/qa

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 4094e07ea738b47a99e30cbf70cdf943a5088355
Author: Miklos Vajna 
AuthorDate: Tue Sep 26 19:48:04 2023 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 27 08:43:50 2023 +0200

CppunitTest_sw_ooxmlimport: fix comment in testFdo87488

I forgot to do this in commit 566370dc3754ed3f858f1617e776ec0bc3399499
(sw: rework to avoid the DECLARE_OOXMLIMPORT_TEST macro, 2021-06-01).

Change-Id: I0ec080d4921a400422771188df9060a35b13feda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157295
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6b2b2243c3b8..e31dc1222e52 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1370,9 +1370,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo87488)
 {
 // The shape on the right (index 0, CustomShape within a
 // GroupShape) is rotated 90 degrees clockwise and contains text
-// rotated 90 degrees anticlockwise.  Must be read with SmartArt
-// enabled in preTest above, otherwise it gets converted to a
-// StarView MetaFile.
+// rotated 90 degrees anticlockwise.
 SvtFilterOptions::Get().SetSmartArt2Shape(true);
 comphelper::ScopeGuard g([] { 
SvtFilterOptions::Get().SetSmartArt2Shape(false); });
 createSwDoc("fdo87488.docx");

[Libreoffice-commits] core.git: sw/source

[László Németh (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   34 
 1 file changed, 34 insertions(+)

New commits:
commit dc748d7dbd114fbf663752258dbaf003af2926c3
Author: László Németh 
AuthorDate: Wed Sep 27 00:41:22 2023 +0200
Commit: László Németh 
CommitDate: Wed Sep 27 08:22:11 2023 +0200

tdf#141198 sw: fix cycle case with change tracking

Fix cycle case with change tracking by rejecting
changes of the word, and setting the cursor inside
the original word.

Previously the cycle case resulted only in a tracked
deletion and tracked insertion, putting the text
cursor at after the word, so it was not possible to
cycle on the different cases e.g. by pressing Shift-F3
multiple times (and moving the text cursor inside
the tracked insertion didn't help, because resulted
in broken text at asking for the next cycle).

A regression from commit 2d3c77e9b10f20091ef338e262ba7756eb280ce9
"tdf#109266 sw change tracking: track transliteration".

Change-Id: I819cf0ec722d54852bfc31f7765e0f06e2a07fd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157303
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 091da2714e02..8516a43485dd 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -3000,6 +3002,38 @@ void DocumentContentOperationsManager::TransliterateText(
 }
 } else {
 /* Cursor is not inside of a word. Nothing should happen. */
+/* Except in the case of change tracking, when the cursor is at 
the end of the change */
+/* Recognize and reject the previous deleted and inserted words to 
allow to cycle */
+IDocumentRedlineAccess& rIDRA = m_rDoc.getIDocumentRedlineAccess();
+if ( IDocumentRedlineAccess::IsShowChanges( 
rIDRA.GetRedlineFlags() ) &&
+pStt->GetContentIndex() > 0 )
+{
+SwPosition aPos(*pStt->GetContentNode(), 
pStt->GetContentIndex() - 1);
+SwRedlineTable::size_type n = 0;
+
+const SwRangeRedline* pFnd =
+rIDRA.GetRedlineTable().FindAtPosition( 
aPos, n );
+if ( pFnd && RedlineType::Insert == pFnd->GetType() && n > 0 )
+{
+const SwRangeRedline* pFnd2 = rIDRA.GetRedlineTable()[n-1];
+if ( RedlineType::Delete == pFnd2->GetType() &&
+  
m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() &&
+  *pFnd2->End() == *pFnd->Start() &&
+  pFnd->GetAuthor() == pFnd2->GetAuthor() )
+{
+SwPosition aPos2(*pFnd2->End());
+rIDRA.RejectRedline(*pFnd, true);
+rIDRA.RejectRedline(*pFnd2, true);
+// positionate the text cursor inside the changed word 
to allow to cycle
+if ( SwWrtShell *pWrtShell = dynamic_cast(
+
m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()) )
+{
+pWrtShell->GetCursor()->GetPoint()->
+Assign(*aPos2.GetContentNode(), 
aPos2.GetContentIndex() - 1);
+}
+}
+}
+}
 return;
 }
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/tool/numformat.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 79e723cde11d2eba6d45d6c89a3d3109062e675c
Author: Noel Grandin 
AuthorDate: Tue Jun 13 22:04:09 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 27 08:00:21 2023 +0200

tdf#151946 cache LocaleDataWrapper

because it is a little more expensive these days to create it, since I
made it an immutable type (which is also why we can safely cache it)

Reduces load time from 7s to 1.5s for me

Change-Id: I583381f0ee5494b8edf746b2329ac5751a9e5d86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153006
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157301
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/source/core/tool/numformat.cxx 
b/sc/source/core/tool/numformat.cxx
index 8240c1ac6e4f..8b8512339d43 100644
--- a/sc/source/core/tool/numformat.cxx
+++ b/sc/source/core/tool/numformat.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace sc {
 
@@ -51,9 +52,13 @@ bool NumFmtUtil::isLatinScript( sal_uLong nFormat, 
ScDocument& rDoc )
 aDecSep = ScGlobal::getLocaleData().getNumDecimalSep();
 else
 {
-LocaleDataWrapper aLocaleData(
-comphelper::getProcessComponentContext(), 
LanguageTag(nFormatLang));
-aDecSep = aLocaleData.getNumDecimalSep();
+// LocaleDataWrapper can be expensive to construct, so cache the 
result for
+// repeated calls
+static std::optional localeCache;
+if (!localeCache || localeCache->getLanguageTag().getLanguageType() != 
nFormatLang)
+localeCache.emplace(
+comphelper::getProcessComponentContext(), 
LanguageTag(nFormatLang));
+aDecSep = localeCache->getNumDecimalSep();
 }
 
 SvtScriptType nScript = rDoc.GetStringScriptType(aDecSep);

[Libreoffice-commits] core.git: vcl/source

[Jim Raykowski (via logerrit)]

 vcl/source/window/menu.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit a0955317900075371d6adb7f924af24c22f02d09
Author: Jim Raykowski 
AuthorDate: Fri Sep 15 21:26:32 2023 -0800
Commit: Jim Raykowski 
CommitDate: Wed Sep 27 07:12:30 2023 +0200

tdf#139935 Part B: Show all menu items possible/potential actions,

but grey-out and deactivate, when not applicable

This patch makes VCL PopupMenu respect the
officecfg::Office::Common::View::Menu::DontHideDisabledEntry setting.

Change-Id: I4df0de82585b602e12481ae46bc4f94c2588970d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156979
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 9a90b03ef93b..60673fbe434e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -57,6 +57,8 @@
 #include 
 #include 
 
+#include 
+
 namespace vcl
 {
 
@@ -2872,8 +2874,12 @@ bool PopupMenu::PrepareRun(const VclPtr& 
pParentWin, tools::Rectang
 nMenuFlags &= ~MenuFlags::HideDisabledEntries;
 }
 else
-// #102790# context menus shall never show disabled entries
-nMenuFlags |= MenuFlags::HideDisabledEntries;
+{
+ if 
(officecfg::Office::Common::View::Menu::DontHideDisabledEntry::get())
+ nMenuFlags &= ~MenuFlags::HideDisabledEntries;
+ else
+ nMenuFlags |= MenuFlags::HideDisabledEntries;
+}
 
 sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount();
 if ( !nVisibleEntries )

[Libreoffice-commits] core.git: download.lst external/curl

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 ++--
 external/curl/ExternalProject_curl.mk|   26 +-
 external/curl/UnpackedTarball_curl.mk|   12 
 external/curl/asan-poison-nsspem.patch.0 |   11 ---
 external/curl/curl-nss.patch.1   |   17 -
 5 files changed, 7 insertions(+), 63 deletions(-)

New commits:
commit c2930ebff82c4f7ffe8377ab82627131f8544226
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 18:25:13 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Sep 27 06:08:20 2023 +0200

curl: upgrade to release 8.3.0

Fixes CVE-2023-38039

* NSS support was removed in this release, so NSS related patches are not 
necessary now.
* add configure options for curl.

Change-Id: I71e09bac3c69ce4b13deee770a32225f39f79c46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156917
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 20b9e5d754aa..7ded51ff5450 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894
-CURL_TARBALL := curl-8.2.1.tar.xz
+CURL_SHA256SUM := 
376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63
+CURL_TARBALL := curl-8.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index a4029c2fc4b2..5f72e4807394 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -10,21 +10,10 @@
 $(eval $(call gb_ExternalProject_ExternalProject,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
+   $(if $(ENABLE_OPENSSL),openssl) \
zlib \
 ))
 
-ifeq ($(TLS),NSS)
-$(eval $(call gb_ExternalProject_use_externals,curl,\
-   nss3 \
-))
-else
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_ExternalProject_use_externals,curl,\
-   openssl \
-))
-endif
-endif
-
 $(eval $(call gb_ExternalProject_register_targets,curl,\
build \
 ))
@@ -41,18 +30,14 @@ curl_LDFLAGS += -L$(SYSBASE)/usr/lib
 endif
 endif
 
-# there are 2 include paths, the other one is passed to --with-nss below
-ifeq ($(SYSTEM_NSS),)
-curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
-endif
-
 # use --with-secure-transport on macOS >10.5 and iOS to get a native UI for 
SSL certs for CMIS usage
-# use --with-nss/--with-openssl only on platforms other than macOS and iOS
+# use --with-openssl only on platforms other than macOS and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_Trace_StartRange,curl,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(gb_RUN_CONFIGURE) ./configure \
-   --without-nss --without-openssl --without-gnutls 
--without-mbedtls \
+   --without-amissl --without-bearssl --without-gnutls \
+   --without-mbedtls --without-rustls --without-wolfssl \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-nghttp2 \
@@ -66,8 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--disable-tftp  \
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
-   $(if $(filter NSS,$(TLS)),--with-nss$(if 
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out") 
--with-nss-deprecated)) \
-   $(if $(filter 
OPENSSL,$(TLS)),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(call 
gb_UnpackedTarball_get_dir,openssl)")) \
+   $(if $(ENABLE_OPENSSL),--with-openssl$(if 
$(SYSTEM_OPENSSL),,="$(call gb_UnpackedTarball_get_dir,openssl)"))) \
$(if $(filter LINUX,$(OS)),--without-ca-bundle 
--without-ca-path) \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index e78adabb8d07..4412857d36a0 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -27,22 +27,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/configurable-z-option.patch.0 \
 ))
 
-ifeq ($(SYSTEM_NSS),)
-$(eval $(call gb_UnpackedTarball_add_patches,curl,\
-   external/curl/curl-nss.patch.1 \
-))
-endif
-
 ifeq ($(OS)-$(COM_IS_CLANG),WNT-TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches

[Libreoffice-commits] core.git: extras/source

[Laurent Balland (via logerrit)]

 extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml |3 
 extras/source/templates/presnt/Growing_Liberty/content.xml   |  466 
--
 2 files changed, 1 insertion(+), 468 deletions(-)

New commits:
commit c76678bbe9c3f835e0fd3dc2ec2381ec821dd548
Author: Laurent Balland 
AuthorDate: Fri Jun 2 13:12:54 2023 +0200
Commit: Heiko Tietze 
CommitDate: Wed Sep 27 05:39:32 2023 +0200

tdf#155390 Impress template Growing Liberty update

Remove last page
Remove styles only used by this page
Update manifest.xml to get conformant ODF 1.3 extended

Change-Id: I6a4227498909b8dc1fb546d2c9c82b30f55ca204
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153295
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git 
a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml 
b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
index eb36d11d72de..bdc5b9b3272c 100644
--- a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
@@ -18,7 +18,6 @@
  
  
  
- 
  
  
-
\ No newline at end of file
+
diff --git a/extras/source/templates/presnt/Growing_Liberty/content.xml 
b/extras/source/templates/presnt/Growing_Liberty/content.xml
index 1058159decb9..7f9072dea369 100644
--- a/extras/source/templates/presnt/Growing_Liberty/content.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/content.xml
@@ -149,18 +149,6 @@
   
   
 
-
-  
-
-
-  
-
-
-  
-
-
-  
-
 
   
   
@@ -615,49 +603,6 @@
   
   
 
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
 
   
 
@@ -736,15 +681,6 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
 
   
 
@@ -2161,408 +2097,6 @@
   
 
   
-  
-
-
-  
-Fully Editable Icon 
Sets
-  
-  
-
-
-
-
-  
-
-
-  
-by Garik Barseghyan from 
Pixabay
-  
-  
-
-
-
-
-  
-
-
-  
-https://pixabay.com/users/insspirito-1851261/
-  
-  
-
-
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-   

[Libreoffice-commits] core.git: cui/uiconfig officecfg/registry sc/uiconfig svx/uiconfig

[Adam Eric Fallon (via logerrit)]

 cui/uiconfig/ui/borderpage.ui|2 +-
 cui/uiconfig/ui/linestyletabpage.ui  |2 +-
 cui/uiconfig/ui/linetabpage.ui   |2 +-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 sc/uiconfig/scalc/ui/sparklinedialog.ui  |2 +-
 svx/uiconfig/ui/floatinglineproperty.ui  |2 +-
 svx/uiconfig/ui/sidebarline.ui   |2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3f20d1dad1b84367f8ec322690dae20b0defbb08
Author: Adam Eric Fallon 
AuthorDate: Wed Sep 20 18:23:16 2023 +0100
Commit: Heiko Tietze 
CommitDate: Wed Sep 27 05:32:29 2023 +0200

tdf#146609 Renamed line width to thickness.

Change-Id: Ib1977bef8cf0f5cba91c37fd80871f1d64bb49fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157104
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index af57dbcb09a0..c642c8d97b5f 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -209,7 +209,7 @@
   
 True
 False
-_Width:
+_Thickness:
 True
 0
 
diff --git a/cui/uiconfig/ui/linestyletabpage.ui 
b/cui/uiconfig/ui/linestyletabpage.ui
index 3c1ca1da79b3..cfadd456ddb2 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -248,7 +248,7 @@
 
 
   
-_Fit to line width
+_Fit to line thickness
 True
 True
 False
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index a5f9b178fe1d..a7138e2ebd9b 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -260,7 +260,7 @@
   
 True
 False
-_Width:
+T_hickness:
 True
 MTR_FLD_LINE_WIDTH
 0
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b31c153d6dc5..89c2ee97bca5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3176,7 +3176,7 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Line Width
+  Line Thickness
 
 
   1
diff --git a/sc/uiconfig/scalc/ui/sparklinedialog.ui 
b/sc/uiconfig/scalc/ui/sparklinedialog.ui
index 1a0f4c6f85cd..40d817b8bea8 100644
--- a/sc/uiconfig/scalc/ui/sparklinedialog.ui
+++ b/sc/uiconfig/scalc/ui/sparklinedialog.ui
@@ -548,7 +548,7 @@
   
 True
 False
-Line width:
+Line thickness:
 True
 seLineWidth
 0
diff --git a/svx/uiconfig/ui/floatinglineproperty.ui 
b/svx/uiconfig/ui/floatinglineproperty.ui
index d47e10b363d0..9fd191aa51bd 100644
--- a/svx/uiconfig/ui/floatinglineproperty.ui
+++ b/svx/uiconfig/ui/floatinglineproperty.ui
@@ -55,7 +55,7 @@
   
 True
 False
-Custom Line Width:
+Custom Line Thickness:
 True
 spin
 end
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 9fdd6b79e43d..577786ac02b0 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -76,7 +76,7 @@
   
 True
 False
-_Width:
+T_hickness:
 True
 width
 0

[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch vcl/qa

[Khaled Hosny (via logerrit)]

 Makefile.fetch   |3 +-
 download.lst |9 ++-
 external/more_fonts/ExternalPackage_noto_kufi_arabic.mk  |7 --
 external/more_fonts/ExternalPackage_noto_naskh_arabic.mk |   17 +++
 external/more_fonts/Module_more_fonts.mk |6 +++--
 external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk  |4 +--
 external/more_fonts/UnpackedTarball_noto_naskh_arabic.mk |   14 
 vcl/qa/cppunit/complextext.cxx   |   14 ++--
 8 files changed, 54 insertions(+), 20 deletions(-)

New commits:
commit 2902ab24ecc5ffbf4907ea83b2028508b9de6364
Author: Khaled Hosny 
AuthorDate: Tue Sep 26 16:11:27 2023 +0300
Commit: خالد حسني 
CommitDate: Tue Sep 26 22:00:56 2023 +0200

tdf#124591: Rename *noto.mk to *noto_kufi_arabic.mk

Since it is the only one left in this package. Still using the old
tarball, though, since there does not exist any releases upstream (yet):
https://github.com/notofonts/arabic

Change-Id: I9a21fda5519bbf184af9b2e70b8cf65e3046a724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157283
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/Makefile.fetch b/Makefile.fetch
index 1a91c7f785c9..41d6a85d13c0 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -179,7 +179,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_NOTO_KUFI_ARABIC_TARBALL) 
\
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) 
\
diff --git a/download.lst b/download.lst
index e06dbad101f6..20b9e5d754aa 100644
--- a/download.lst
+++ b/download.lst
@@ -157,8 +157,8 @@ FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-201
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-FONT_NOTO_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
-FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
+FONT_NOTO_KUFI_ARABIC_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
+FONT_NOTO_KUFI_ARABIC_TARBALL := noto-fonts-20171024.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/more_fonts/ExternalPackage_noto.mk 
b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
similarity index 96%
rename from external/more_fonts/ExternalPackage_noto.mk
rename to external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
index c9b25163b888..ed6b9fea3f85 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto_kufi_arabic.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto))
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_kufi_arabic))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
NotoKufiArabic-Bold.ttf \
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index f37a5c34fbc0..e17af9a15141 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
ExternalPackage_libre_hebrew \
-   ExternalPackage_noto \
+   ExternalPackage_noto_kufi_arabic \
ExternalPackage_noto_naskh_arabic \
ExternalPackage_noto_sans \
ExternalPackage_noto_sans_arabic \
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
UnpackedTarball_libre_hebrew \
-   UnpackedTarball_noto \
+   UnpackedTarball_noto_kufi_arabic \
UnpackedTarball_noto_naskh_arabic \
UnpackedTarball_noto_sans \
UnpackedTarball_noto_sans_arabic \
diff --git a/external/more_fonts/UnpackedTarball_noto.mk 
b/external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
similarity index 66%
rename from external/more_fonts/UnpackedTarball_noto.mk
rename to external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk
index ee6f223f8cad..482727dd6246 100644
--- a/external/more_fonts/UnpackedTarball_noto.mk
+++ b/external/more_fonts/UnpackedTarball_noto_kufi_ara

[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch

[Khaled Hosny (via logerrit)]

 Makefile.fetch|3 +++
 download.lst  |   15 +++
 external/more_fonts/ExternalPackage_noto.mk   |5 -
 external/more_fonts/ExternalPackage_noto_sans_lao.mk  |   17 +
 external/more_fonts/ExternalPackage_noto_sans_lisu.mk |   17 +
 external/more_fonts/ExternalPackage_noto_serif_lao.mk |   17 +
 external/more_fonts/Module_more_fonts.mk  |6 ++
 external/more_fonts/UnpackedTarball_noto_sans_lao.mk  |   14 ++
 external/more_fonts/UnpackedTarball_noto_sans_lisu.mk |   14 ++
 external/more_fonts/UnpackedTarball_noto_serif_lao.mk |   14 ++
 10 files changed, 117 insertions(+), 5 deletions(-)

New commits:
commit 00db8423d18d75f982b337744ec39c4b7269a433
Author: Khaled Hosny 
AuthorDate: Tue Sep 26 13:15:29 2023 +0300
Commit: خالد حسني 
CommitDate: Tue Sep 26 22:00:38 2023 +0200

tdf#124591: Update Noto Sans Lisu to v2.102

from:
  https://github.com/notofonts/lisu/releases/tag/NotoSansLisu-v2.102

Change-Id: I205cf05d6f33e1083e30193d7ed775d9775af2f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157280
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/Makefile.fetch b/Makefile.fetch
index 7d089de612ed..c8ea14b3a6bc 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -191,6 +191,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LAO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_LAO_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_LISU_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
diff --git a/download.lst b/download.lst
index 06a7ac8e2f52..b470064253a0 100644
--- a/download.lst
+++ b/download.lst
@@ -217,6 +217,11 @@ FONT_NOTO_SERIF_LAO_TARBALL := NotoSerifLao-v2.003.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+FONT_NOTO_SANS_LISU_SHA256SUM := 
b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268
+FONT_NOTO_SANS_LISU_TARBALL := NotoSansLisu-v2.102.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 FONT_CULMUS_SHA256SUM := 
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
 # three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk 
b/external/more_fonts/ExternalPackage_noto.mk
index f953ec31646a..d5bfe4cf8b88 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -17,7 +17,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoNaskhArabic-Regular.ttf \
NotoNaskhArabicUI-Bold.ttf \
NotoNaskhArabicUI-Regular.ttf \
-   NotoSansLisu-Regular.ttf \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/ExternalPackage_noto_sans_lisu.mk 
b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk
new file mode 100644
index ..9200e5698741
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_sans_lisu.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_lisu))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+   NotoSansLisu/full/ttf/NotoSansLisu-Bold.ttf \
+   NotoSansLisu/full/ttf/NotoSansLisu-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index ac4031bedcf6..12bcabcc604d 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_noto_sans_georgian \
ExternalPackage_noto_sans_hebrew \
ExternalPackage_noto_sans_lao \
+   ExternalPackage_noto_sans_lisu \
ExternalPackage_noto_serif \
ExternalPackage_noto_serif_armenian \
ExternalPackage_noto_serif_georgian \
@@ -53,6 +54,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
UnpackedTarball_noto_sans_georgian \
UnpackedTarball_noto_sans_hebrew \
UnpackedTarball_not

[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch

[Khaled Hosny (via logerrit)]

 Makefile.fetch |3 ++
 download.lst   |   15 +++
 external/more_fonts/ExternalPackage_noto.mk|6 
 external/more_fonts/ExternalPackage_noto_sans_georgian.mk  |   17 +
 external/more_fonts/ExternalPackage_noto_serif_armenian.mk |   17 +
 external/more_fonts/ExternalPackage_noto_serif_georgian.mk |   17 +
 external/more_fonts/Module_more_fonts.mk   |6 
 external/more_fonts/UnpackedTarball_noto_sans_georgian.mk  |   14 ++
 external/more_fonts/UnpackedTarball_noto_serif_armenian.mk |   14 ++
 external/more_fonts/UnpackedTarball_noto_serif_georgian.mk |   14 ++
 10 files changed, 117 insertions(+), 6 deletions(-)

New commits:
commit 0d49ac1ba30e2cb6247a77e75383176a4624adfd
Author: Khaled Hosny 
AuthorDate: Tue Sep 26 12:56:53 2023 +0300
Commit: خالد حسني 
CommitDate: Tue Sep 26 21:54:19 2023 +0200

tdf#124591: Update Noto Serif Georgian to v2.003

from:
   
https://github.com/notofonts/georgian/releases/tag/NotoSerifGeorgian-v2.003

Change-Id: I230b8eed49f024e2361e27df963424d7113e52fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157277
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/Makefile.fetch b/Makefile.fetch
index 6f1e8a8b4bdc..52b272a2f31f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -188,6 +188,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \
$(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_ARMENIAN_TARBALL) \
$(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_GEORGIAN_TARBALL) \
+   $(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_GEORGIAN_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
diff --git a/download.lst b/download.lst
index d89d86fbe62f..b1797173b71f 100644
--- a/download.lst
+++ b/download.lst
@@ -202,6 +202,11 @@ FONT_NOTO_SANS_GEORGIAN_TARBALL := 
NotoSansGeorgian-v2.003.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+FONT_NOTO_SERIF_GEORGIAN_SHA256SUM := 
cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4
+FONT_NOTO_SERIF_GEORGIAN_TARBALL := NotoSerifGeorgian-v2.003.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 FONT_CULMUS_SHA256SUM := 
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
 # three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk 
b/external/more_fonts/ExternalPackage_noto.mk
index 3b622aa65114..76e6dab93ebb 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -20,8 +20,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSansLao-Bold.ttf \
NotoSansLao-Regular.ttf \
NotoSansLisu-Regular.ttf \
-   NotoSerifGeorgian-Bold.ttf \
-   NotoSerifGeorgian-Regular.ttf \
NotoSerifLao-Bold.ttf \
NotoSerifLao-Regular.ttf \
 ))
diff --git a/external/more_fonts/ExternalPackage_noto_serif_georgian.mk 
b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk
new file mode 100644
index ..8210e620bbc8
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_serif_georgian.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_serif_georgian))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+   NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Bold.ttf \
+   NotoSerifGeorgian/full/ttf/NotoSerifGeorgian-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index 00f65930408f..d99dcaf618a6 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_noto_sans_hebrew \
ExternalPackage_noto_serif \
ExternalPackage_noto_serif_armenian \
+   ExternalPackage_noto_serif_georgian \
ExternalPackage_noto_serif_hebrew \
ExternalPackage_reem \
ExternalPackage_scheherazade \
@@ -51,6 +52,7 

[Libreoffice-commits] core.git: 3 commits - download.lst external/more_fonts Makefile.fetch

[Khaled Hosny (via logerrit)]

 Makefile.fetch|3 ++
 download.lst  |   15 
 external/more_fonts/ExternalPackage_noto.mk   |6 
 external/more_fonts/ExternalPackage_noto_sans_armenian.mk |   17 ++
 external/more_fonts/ExternalPackage_noto_sans_hebrew.mk   |   17 ++
 external/more_fonts/ExternalPackage_noto_serif_hebrew.mk  |   17 ++
 external/more_fonts/Module_more_fonts.mk  |6 
 external/more_fonts/UnpackedTarball_noto_sans_armenian.mk |   14 +++
 external/more_fonts/UnpackedTarball_noto_sans_hebrew.mk   |   14 +++
 external/more_fonts/UnpackedTarball_noto_serif_hebrew.mk  |   14 +++
 10 files changed, 117 insertions(+), 6 deletions(-)

New commits:
commit d69317ca8f4b39c7fe62e9404f93d5d43e5495d6
Author: Khaled Hosny 
AuthorDate: Tue Sep 26 12:28:42 2023 +0300
Commit: خالد حسني 
CommitDate: Tue Sep 26 21:54:00 2023 +0200

tdf#124591: Update Noto Sans Armenian to v2.008

from:
   
https://github.com/notofonts/armenian/releases/tag/NotoSansArmenian-v2.008

Change-Id: I92bd6f05e9022b6c1f25ac460e64b12209016297
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157274
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/Makefile.fetch b/Makefile.fetch
index 1f7306941de6..3daedcb32695 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -185,6 +185,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) 
\
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_HEBREW_TARBALL) 
\
$(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_HEBREW_TARBALL) \
+   $(call 
fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARMENIAN_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
diff --git a/download.lst b/download.lst
index 1a3a1f2e0af3..f62fedfcddcf 100644
--- a/download.lst
+++ b/download.lst
@@ -187,6 +187,11 @@ FONT_NOTO_SANS_HEBREW_TARBALL := NotoSansHebrew-v2.003.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+FONT_NOTO_SANS_ARMENIAN_SHA256SUM := 
eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac
+FONT_NOTO_SANS_ARMENIAN_TARBALL := NotoSansArmenian-v2.008.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 FONT_CULMUS_SHA256SUM := 
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
 # three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk 
b/external/more_fonts/ExternalPackage_noto.mk
index dfb3b170e187..514b17933e43 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -17,8 +17,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoNaskhArabic-Regular.ttf \
NotoNaskhArabicUI-Bold.ttf \
NotoNaskhArabicUI-Regular.ttf \
-   NotoSansArmenian-Bold.ttf \
-   NotoSansArmenian-Regular.ttf \
NotoSansGeorgian-Bold.ttf \
NotoSansGeorgian-Regular.ttf \
NotoSansLao-Bold.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_sans_armenian.mk 
b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk
new file mode 100644
index ..d6b7a12753c2
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_sans_armenian.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_armenian))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+   NotoSansArmenian/full/ttf/NotoSansArmenian-Bold.ttf \
+   NotoSansArmenian/full/ttf/NotoSansArmenian-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index 464b8ab74142..d5ed948db7ff 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_noto \
ExternalPackage_noto_sans \
ExternalPackage_noto_sans_arabic \
+   ExternalPackage_noto_sans_armenian \
ExternalPackage_noto_sans_hebrew \
ExternalPackage_noto_serif \
ExternalPackage_noto_serif_hebrew \
@@

[Libreoffice-commits] core.git: 4 commits - download.lst external/more_fonts Makefile.fetch svgio/qa svgio/source

[Khaled Hosny (via logerrit)]

 Makefile.fetch  |3 ++
 download.lst|   15 ++
 external/more_fonts/ExternalPackage_noto.mk |   24 
 external/more_fonts/ExternalPackage_noto_sans.mk|   19 
 external/more_fonts/ExternalPackage_noto_sans_arabic.mk |   17 +++
 external/more_fonts/ExternalPackage_noto_serif.mk   |   19 
 external/more_fonts/Module_more_fonts.mk|6 
 external/more_fonts/UnpackedTarball_noto_sans.mk|   14 +
 external/more_fonts/UnpackedTarball_noto_sans_arabic.mk |   14 +
 external/more_fonts/UnpackedTarball_noto_serif.mk   |   14 +
 svgio/qa/cppunit/SvgImportTest.cxx  |   24 
 svgio/qa/cppunit/data/tdf97710.svg  |8 +
 svgio/source/svgreader/svgstyleattributes.cxx   |3 --
 13 files changed, 154 insertions(+), 26 deletions(-)

New commits:
commit 9998c242c6c2ece5f240db2f6ffdf04e7ca7cbb4
Author: Khaled Hosny 
AuthorDate: Tue Sep 26 11:47:19 2023 +0300
Commit: خالد حسني 
CommitDate: Tue Sep 26 21:53:36 2023 +0200

tdf#124591: Update Noto Sans Arabic to v2.010

from:
  https://github.com/notofonts/arabic/releases/tag/NotoSansArabic-v2.010

Change-Id: Icb4a2932c84884180eed7f391ecd7285311299b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157270
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/Makefile.fetch b/Makefile.fetch
index 829323fa8496..efb24f1b1280 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -182,6 +182,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_SERIF_TARBALL) \
+   $(call fetch_Optional,MORE_FONTS,FONT_NOTO_SANS_ARABIC_TARBALL) 
\
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
diff --git a/download.lst b/download.lst
index 4aec2aed751b..1de6ee0cb02c 100644
--- a/download.lst
+++ b/download.lst
@@ -172,6 +172,11 @@ FONT_NOTO_SERIF_TARBALL := NotoSerif-v2.012.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
+FONT_NOTO_SANS_ARABIC_SHA256SUM := 
a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2
+FONT_NOTO_SANS_ARABIC_TARBALL := NotoSansArabic-v2.010.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
 FONT_CULMUS_SHA256SUM := 
c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05
 FONT_CULMUS_TARBALL := culmus-0.133.tar.gz
 # three static lines
diff --git a/external/more_fonts/ExternalPackage_noto.mk 
b/external/more_fonts/ExternalPackage_noto.mk
index 1b66ef631857..14af61b6221a 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -17,10 +17,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoNaskhArabic-Regular.ttf \
NotoNaskhArabicUI-Bold.ttf \
NotoNaskhArabicUI-Regular.ttf \
-   NotoSansArabic-Bold.ttf \
-   NotoSansArabic-Regular.ttf \
-   NotoSansArabicUI-Bold.ttf \
-   NotoSansArabicUI-Regular.ttf \
NotoSansArmenian-Bold.ttf \
NotoSansArmenian-Regular.ttf \
NotoSansGeorgian-Bold.ttf \
diff --git a/external/more_fonts/ExternalPackage_noto_sans_arabic.mk 
b/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
new file mode 100644
index ..259167b72673
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_noto_sans_arabic.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto_sans_arabic))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+   NotoSansArabic/full/ttf/NotoSansArabic-Bold.ttf \
+   NotoSansArabic/full/ttf/NotoSansArabic-Regular.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/Module_more_fonts.mk 
b/external/more_fonts/Module_more_fonts.mk
index 9114dd7ae7b5..335a2bc6c3af 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_libre_hebrew \
ExternalPackage_noto \
Ex

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - sw/inc sw/source vcl/qa

[Michael Stahl (via logerrit)]

 sw/inc/EnhancedPDFExportHelper.hxx   |2 
 sw/source/core/text/EnhancedPDFExportHelper.cxx  |   96 ++--
 vcl/qa/cppunit/pdfexport/data/nestedsection.fodt |  132 ++
 vcl/qa/cppunit/pdfexport/pdfexport.cxx   |  137 +++
 4 files changed, 332 insertions(+), 35 deletions(-)

New commits:
commit 033e37b49b5712df19dbfd2c307a102bce620de1
Author: Michael Stahl 
AuthorDate: Thu Aug 31 19:50:55 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 21:13:18 2023 +0200

sw: PDF/UA export: produce nested Sect SEs for nested sections

Change-Id: I5b142acf00629ffd00562e2c8791587b7a7761df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156357
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit d5f68529a79c615f989fcfeef248d887a6e10f5a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157229
Reviewed-by: Caolán McNamara 

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index 53fbbbe4bab1..1ab0f8868af4 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -146,6 +146,7 @@ class SwTaggedPDFHelper
 const Frame_Info* mpFrameInfo;
 const Por_Info* mpPorInfo;
 
+void OpenTagImpl(void const* pKey);
 sal_Int32 BeginTagImpl(void const* pKey,vcl::PDFWriter::StructElement 
aTagRole, const OUString& rTagName);
 void BeginTag( vcl::PDFWriter::StructElement aTagRole, const OUString& 
rTagName );
 void EndTag();
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 315c2e1b7429..3cd5176cb786 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -452,13 +452,7 @@ bool SwTaggedPDFHelper::CheckReopenTag()
 
 if (pReopenKey)
 {
-sal_Int32 const id = 
mpPDFExtOutDevData->EnsureStructureElement(pReopenKey);
-mpPDFExtOutDevData->BeginStructureElement(id);
-++m_nEndStructureElement;
-
-#if OSL_DEBUG_LEVEL > 1
-aStructStack.push_back( 99 );
-#endif
+OpenTagImpl(pReopenKey);
 
 bRet = true;
 }
@@ -479,6 +473,17 @@ void SwTaggedPDFHelper::CheckRestoreTag() const
 }
 }
 
+void SwTaggedPDFHelper::OpenTagImpl(void const*const pKey)
+{
+sal_Int32 const id = mpPDFExtOutDevData->EnsureStructureElement(pKey);
+mpPDFExtOutDevData->BeginStructureElement(id);
+++m_nEndStructureElement;
+
+#if OSL_DEBUG_LEVEL > 1
+aStructStack.push_back( 99 );
+#endif
+}
+
 sal_Int32 SwTaggedPDFHelper::BeginTagImpl(void const*const pKey,
 vcl::PDFWriter::StructElement const eType, const OUString& rString)
 {
@@ -1228,7 +1233,30 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
 {
 const SwSection* pSection =
 static_cast(pFrame)->GetSection();
-if ( SectionType::ToxContent == pSection->GetType() )
+
+// open all parent sections, so that the SEs of sections
+// are nested in the same way as their SwSectionNodes
+std::vector parents;
+for (SwSection const* pParent = pSection->GetParent();
+ pParent != nullptr; pParent = pParent->GetParent())
+{
+parents.push_back(pParent);
+}
+for (auto it = parents.rbegin(); it != parents.rend(); ++it)
+{
+// key is the SwSection - see lcl_GetKeyFromFrame()
+OpenTagImpl(*it);
+}
+
+FrameTagSet& 
rFrameTagSet(mpPDFExtOutDevData->GetSwPDFState()->m_FrameTagSet);
+if (rFrameTagSet.find(pSection) != rFrameTagSet.end())
+{
+// special case: section may have *multiple* master frames,
+// when it is interrupted by nested section - reopen!
+OpenTagImpl(pSection);
+break;
+}
+else if (SectionType::ToxContent == pSection->GetType())
 {
 const SwTOXBase* pTOXBase = pSection->GetTOXBase();
 if ( pTOXBase )
diff --git a/vcl/qa/cppunit/pdfexport/data/nestedsection.fodt 
b/vcl/qa/cppunit/pdfexport/data/nestedsection.fodt
new file mode 100644
index ..ab743058f5e7
--- /dev/null
+++ b/vcl/qa/cppunit/pdfexport/data/nestedsection.fodt
@@ -0,0 +1,132 @@
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xml

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/docnode/nodes.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 18ccdfc248fdc9d7f17f84c1067fee27a62b0772
Author: Michael Stahl 
AuthorDate: Tue Sep 19 11:00:15 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 17:39:24 2023 +0200

tdf#157131 sw: only check for table in same top-level section

The problem is that SwNodes::FindPrvNxtFrameNode() is called with the
first node in the body and moves backwards to a node that is in a table
in a text frame.

(regression from commit faf2d9e2cb13c3750ac359338f8f31fc1afce368)

Change-Id: I9bd353f07ea6361b332134186a6a4462119b597c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157045
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 655874489a13af50b763b75c188b2a8db52c7fc0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157053
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 9f9c516e8f3b..c6ecb9ccf974 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -2250,7 +2250,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( const SwNode& 
rFrameNd,
 {
 pFrameNd = GoPrevSection( &aIdx, true, false );
 // did we move *into* a table?
-if (pFrameNd)
+if (pFrameNd && ::CheckNodesRange(aIdx.GetNode(), rFrameNd, true))
 {
 for (SwTableNode * pTable = pFrameNd->FindTableNode();
 pTable && pTable->EndOfSectionIndex() < 
rFrameNd.GetIndex();
@@ -2328,7 +2328,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( const SwNode& 
rFrameNd,
 {
 pFrameNd = GoNextSection( &aIdx, true, false );
 // did we move *into* a table?
-if (pFrameNd)
+if (pFrameNd && ::CheckNodesRange(aIdx.GetNode(), rFrameNd, true))
 {
 for (SwTableNode * pTable = pFrameNd->FindTableNode();
 pTable && pEnd->GetIndex() < pTable->GetIndex();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/core/layout/data/floattable-move-master.docx |binary
 sw/qa/core/layout/flycnt.cxx   |   42 
++
 sw/source/core/inc/rootfrm.hxx |1 
 sw/source/core/inc/txtfrm.hxx  |2 
 sw/source/core/layout/calcmove.cxx |   13 +++
 sw/source/core/layout/flycnt.cxx   |   27 
++
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |6 +
 sw/source/core/text/itratr.cxx |   10 +-
 8 files changed, 95 insertions(+), 6 deletions(-)

New commits:
commit 93a646ddf74ada0bc96107310d50c3da3a4343bc
Author: Miklos Vajna 
AuthorDate: Thu Sep 21 08:31:01 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 26 17:38:01 2023 +0200

tdf#157119 sw floattable: fix moving master of split fly to next page

The problem with the bugdoc is that in case you split the text frame
hosting the start of the anchor text, then the fly will be split in a
broken way on pages 1 -> 4 -> 2, while we want a split on just pages 2
-> 3.

There were several problems here:

1) We created an unnecessary follow fly in SwFrame::GetNextFlyLeaf():
   when page 1 wanted to split, we discarded the flys on page 2 and 3,
   because the original anchor was in the body text and the flys on page
   2/3 was in a fly, so that's rejected. This resulted in a follow fly on
   page 4, which is not correct. Fix this by using an existing follow if
   possible, this is similar to what SwFrame::GetNextSctLeaf() does.

2) SwFlyAtContentFrame::DelEmpty() broke the invariant that in case the
   fly is split to N pieces then the anchor chain's first N frame is
   matching that. Fix this by joining the unwanted anchor with its
   follow right before unlinking the to-be-deleted fly from the fly chain.

3) SwToContentAnchoredObjectPosition::CalcOverlap() tried to shift down
   flys due to overlapping with the to-be-deleted frames, fix this by
   ignoring flys which are already in the to-delete list.

4) SwContentFrame::ShouldBwdMoved() tried to move the master fly back
   from page 2 to page 1, which makes no sense, since there is not
   enough space there to lay out the fly master correctly there.

   Normally we only check if the paragraph fits the remaining space on
   the previous page, and this is wanted: if there is a normal to-para
   anchored image that would not fit, we simply shift up the image. But
   this is not wanted to floating tables, since here the anchor's only
   purpose is to host the start of the fly chain at a correct position.

   Fix this by checking not only for the text frame height vs the
   available space, but also the height of our (only) anchored object.

Note that 3) is not a huge problem, it just causes some extra cycles for
the layout (erase the to-delete flys, then position flys once more), do
it because things are complicated enough already.

Change-Id: I6f2c9d479125309d16b95df0236715c9353e8ba0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157133
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit cfe9c68a7a19dd77d1fcbde3a7dd75730634becc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157215
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/core/layout/data/floattable-move-master.docx 
b/sw/qa/core/layout/data/floattable-move-master.docx
new file mode 100644
index ..03087eb358a8
Binary files /dev/null and b/sw/qa/core/layout/data/floattable-move-master.docx 
differ
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index 73a107c4bc5e..f5f5fb094a37 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -1103,6 +1103,48 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyNestedOverlap)
 SwSortedObjs& rPage2Objs = *pPage2->GetSortedObjs();
 CPPUNIT_ASSERT_EQUAL(static_cast(2), rPage2Objs.size());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testSplitFlyMoveMaster)
+{
+// Given a document with a multi-page floating table on pages 1 -> 2 -> 3:
+createSwDoc("floattable-move-master.docx");
+
+// When adding an empty para before the table, so the table gets shifted 
to pages 2 -> 3:
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+pWrtShell->SttEndDoc(/*bStt=*/true);
+pWrtShell->Down(/*bSelect=*/false, /*nCount=*/4);
+pWrtShell->SplitNode();
+
+// Then make sure page 1 has no flys, page 2 and 3 has the split fly and 
no flys on page 4:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = pLayout->Lower()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage1);
+// Without the accompanying fix in place, this tes

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - include/vcl svx/source

[Caolán McNamara (via logerrit)]

 include/vcl/formatter.hxx  |6 ++
 svx/source/fmcomp/gridcell.cxx |   14 --
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 6f2dda05b8808729716a22e9f98ae28b03094ecb
Author: Caolán McNamara 
AuthorDate: Tue Sep 26 10:42:06 2023 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 26 17:31:06 2023 +0200

Resolves: tdf#151919 mark blanked fields as requiring a reformat

the next time a format is requested, even if the value of the
Formatter is the same, otherwise if the value is the same it
will remain blank.

Change-Id: Iec77e6d9f792b51a83a9e289cbdb197605ab1a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157224
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/vcl/formatter.hxx b/include/vcl/formatter.hxx
index 4aa81ea1be30..54d6745587e1 100644
--- a/include/vcl/formatter.hxx
+++ b/include/vcl/formatter.hxx
@@ -186,6 +186,12 @@ public:
 // If the current String is invalid, GetValue() returns this value
 double  GetDefaultValue() const { return m_dDefaultValue; }
 
+// Make the formatter recreate the output text from the value on the next
+// format attempt even if the value is the same as the current value.
+// Needed if the associated widget had its text changed by something other
+// that this Formatter (typically blanked out) since the last formatting
+voidInvalidateValueState(){ m_ValueState = valueDirty; }
+
 void SetLastSelection(const Selection& rSelection) { m_aLastSelection = 
rSelection; }
 
 // Settings for the format
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2bf339a19135..cb8ccf91955f 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2067,15 +2067,16 @@ void DbNumericField::updateFromModel( Reference< 
XPropertySet > _rxModel )
 OSL_ENSURE( _rxModel.is() && m_pWindow, "DbNumericField::updateFromModel: 
invalid call!" );
 
 FormattedControlBase* pControl = 
static_cast(m_pWindow.get());
+Formatter& rFormatter = pControl->get_formatter();
 
 double dValue = 0;
 if ( _rxModel->getPropertyValue( FM_PROP_VALUE ) >>= dValue )
-{
-Formatter& rFormatter = pControl->get_formatter();
 rFormatter.SetValue(dValue);
-}
 else
+{
 pControl->get_widget().set_text(OUString());
+rFormatter.InvalidateValueState();
+}
 }
 
 bool DbNumericField::commitControl()
@@ -2187,15 +2188,16 @@ void DbCurrencyField::updateFromModel( Reference< 
XPropertySet > _rxModel )
 OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCurrencyField::updateFromModel: 
invalid call!" );
 
 FormattedControlBase* pControl = 
static_cast(m_pWindow.get());
+Formatter& rFormatter = pControl->get_formatter();
 
 double dValue = 0;
 if ( _rxModel->getPropertyValue( FM_PROP_VALUE ) >>= dValue )
-{
-Formatter& rFormatter = pControl->get_formatter();
 rFormatter.SetValue(dValue);
-}
 else
+{
 pControl->get_widget().set_text(OUString());
+rFormatter.InvalidateValueState();
+}
 }
 
 bool DbCurrencyField::commitControl()

[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - 3 commits - include/xmloff sd/source sfx2/source sw/source xmloff/qa xmloff/source

[Michael Stahl (via logerrit)]

 include/xmloff/xmlimp.hxx   |1 
 sd/source/filter/xml/sdxmlwrp.cxx   |2 
 sfx2/source/doc/docfile.cxx |   15 --
 sw/source/core/unocore/unostyle.cxx |   15 ++
 xmloff/qa/unit/uxmloff.cxx  |   65 +++--
 xmloff/source/core/xmlimp.cxx   |   80 ++--
 xmloff/source/meta/xmlmetai.cxx |4 -
 7 files changed, 115 insertions(+), 67 deletions(-)

New commits:
commit 1988c5d4f8e511663d927c85c570bcae2b1aee40
Author: Michael Stahl 
AuthorDate: Tue Jun 6 16:20:45 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 26 15:57:01 2023 +0200

sfx2: SfxMedium::Transfer_Impl() ignore exceptions when getting props

Somehow (bisected to commit bc48f2656c9a7bc1f41541bff66ec2c4496466a4)
this throws an exception now when getting "Title" when storing a
new file to a WebDAV server (the server naturally replies with 404).

There is already a fallback to get the filename, so just ignore
exceptions here so the transfer can succeed.

Change-Id: Ic609f2a4f5a67670b2d8eeb74680730053a7d3a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152678
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a1393ab3766c2f010115931a6c4edc01240c5c6e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152654
Reviewed-by: László Németh 
(cherry picked from commit 83aee9f7a56403a5222a605e4063c25a4c38ecb9)

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index fafe05d150b4..d46c3260a788 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2377,11 +2377,18 @@ void SfxMedium::Transfer_Impl()
 // LongName wasn't defined anywhere, only used here... get the Title 
instead
 // as it's less probably empty
 OUString aFileName;
-Any aAny = aDestContent.getPropertyValue("Title");
-aAny >>= aFileName;
-aAny = aDestContent.getPropertyValue( "ObjectId" );
 OUString sObjectId;
-aAny >>= sObjectId;
+try
+{
+Any aAny = aDestContent.getPropertyValue("Title");
+aAny >>= aFileName;
+aAny = aDestContent.getPropertyValue("ObjectId");
+aAny >>= sObjectId;
+}
+catch (uno::Exception const&)
+{
+SAL_INFO("sfx.doc", "exception while getting Title or ObjectId");
+}
 if ( aFileName.isEmpty() )
 aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, 
true, INetURLObject::DecodeMechanism::WithCharset );
 
commit dd4eac5d8fdd04d64a22827d2ed15e20fe099256
Author: Michael Stahl 
AuthorDate: Tue Jun 27 14:50:02 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 26 15:53:41 2023 +0200

xmloff: ODF import: adapt generator parsing to 2-digit major versions

DocumentInfo currently assumes that a LO version encoded in "BuildId"
property has only 1 digit major version, which is now wrong and would
start to give incorrect results when major version "30" will be detected
as LO_3x.

Add the dots as separators into the BuildId because it's not going to
work without.

Change-Id: I8918afe3642cbefa8488c57658f1505c9a20eddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153649
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b1ce8bb078904db1df542f7a1c2ed527dde1a2d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153689
Reviewed-by: Christian Lohmaier 
(cherry picked from commit b963e5b2007790213c370f781f0872b256fe77a3)

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 1a77317393dd..ba35e896f2cd 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -559,6 +559,7 @@ public:
 static const sal_uInt16 LO_6x = 60 | LO_flag;
 static const sal_uInt16 LO_63x = 63 | LO_flag;
 static const sal_uInt16 LO_7x = 70 | LO_flag;
+static const sal_uInt16 LO_New = 100 | LO_flag;
 static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
 
 /** depending on whether the generator version indicates LO, compare
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 90ef68e3552e..450dbe6dbc0a 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -693,7 +693,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
 if( !sBuildId.isEmpty() )
 {
 sal_Int32 nIndex = sBuildId.indexOf('$');
-if( nIndex != -1 )
+if (sBuildId.indexOf(';') == -1 && nIndex != -1)
 {
 sal_Int32 nUPD = o3tl::toInt32(sBuildId.subView( 0, 
nIndex ));
 
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index 9cad246f976e..2155532e27b1 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.c

[Libreoffice-commits] help.git: source/text

[Olivier Hallot (via logerrit)]

 source/text/shared/menu/submenu_image.xhp |2 +-
 source/text/shared/menu/submenu_text.xhp  |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b3f86b2bea5e047e1f4d88dc66f4c42fb433eed9
Author: Olivier Hallot 
AuthorDate: Tue Sep 26 14:02:05 2023 +0200
Commit: Olivier Hallot 
CommitDate: Tue Sep 26 17:03:06 2023 +0200

Mute L10n

Change-Id: Ic74894ba6b6d5dfc0e3e64075d293f0bd2478836
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157226
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/menu/submenu_image.xhp 
b/source/text/shared/menu/submenu_image.xhp
index 984e226e24..badfaad034 100644
--- a/source/text/shared/menu/submenu_image.xhp
+++ b/source/text/shared/menu/submenu_image.xhp
@@ -65,7 +65,7 @@
 
 
 Properties
-
+
 
 
 
diff --git a/source/text/shared/menu/submenu_text.xhp 
b/source/text/shared/menu/submenu_text.xhp
index d7d8d9ada3..17f6ac4654 100644
--- a/source/text/shared/menu/submenu_text.xhp
+++ b/source/text/shared/menu/submenu_text.xhp
@@ -123,7 +123,7 @@
 
 Capitalize 
Every Word
 
-
+
 
 
 
@@ -137,7 +137,7 @@
 
 Small capitals
 
-
+
 
 
 
@@ -145,7 +145,7 @@
 
 Small capitals
 
-
+
 
 
 
@@ -153,7 +153,7 @@
 
 Small capitals
 
-
+
 
 
 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit defc3dd75ff8ff937d2161237b281284240b86f0
Author: Olivier Hallot 
AuthorDate: Tue Sep 26 17:03:07 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Sep 26 17:03:07 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b3f86b2bea5e047e1f4d88dc66f4c42fb433eed9
  - Mute L10n

Change-Id: Ic74894ba6b6d5dfc0e3e64075d293f0bd2478836
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157226
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index a83574c07332..b3f86b2bea5e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a83574c073321df45582cce99d7b811774438723
+Subproject commit b3f86b2bea5e047e1f4d88dc66f4c42fb433eed9

[Libreoffice-commits] core.git: include/IwyuFilter_include.yaml include/o3tl

[Gabor Kelemen (via logerrit)]

 include/IwyuFilter_include.yaml  |   25 -
 include/o3tl/lru_map.hxx |2 --
 include/o3tl/unit_conversion.hxx |1 -
 3 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 2b153ad42904e433d41b630fc80daf4a57112681
Author: Gabor Kelemen 
AuthorDate: Fri Sep 15 18:25:24 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 26 16:28:17 2023 +0200

tdf#146619 Recheck include/o3tl with IWYU

Change-Id: I25833a776b4b7f2055805159583f363b860bc4cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156987
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index c0b87cd559c8..e0a5b159fd79 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -218,25 +218,35 @@ excludelist:
 - com/sun/star/lang/XServiceInfo.hpp
 - com/sun/star/rendering/XBezierPolyPolygon2D.hpp
 - com/sun/star/rendering/XLinePolyPolygon2D.hpp
+include/o3tl/char16_t2wchar_t.hxx:
+# Needed on WIN32
+- string_view
 include/o3tl/deleter.hxx:
 # Needed for __COVERITY__
 - com/sun/star/uno/Exception.hpp
 - sal/log.hxx
-include/o3tl/lru_map.hxx:
-# Needed for std::min
-- algorithm
+include/o3tl/intcmp.hxx:
+# Needed for C++20 mode
+- type_traits
+- utility
 include/o3tl/make_shared.hxx:
 # Needed for __COVERITY__
 - o3tl/deleter.hxx
 include/o3tl/safeint.hxx:
 # Needed for std::min
 - algorithm
+include/o3tl/unreachable.hxx:
+# Needed for C++23 mode
+- utility
+include/o3tl/vector_pool.hxx:
+# Needed for std::move
+- utility
+include/o3tl/vector_utils.hxx:
+# Needed for std::copy_if
+- algorithm
 include/sot/exchange.hxx:
 # Used in a macro #define
 - com/sun/star/datatransfer/dnd/DNDConstants.hpp
-include/tools/color.hxx:
-# OSL_BIGENDIAN is being checked
-- osl/endian.h
 include/tools/debug.hxx:
 # Used behind #ifndef
 - tools/toolsdllapi.h
@@ -882,9 +892,6 @@ excludelist:
 include/svx/svdtext.hxx:
 # TODO too many replacements would be needed
 - tools/weakbase.hxx
-include/oox/helper/helper.hxx:
-# OSL_BIGENDIAN is being checked
-- osl/endian.h
 include/codemaker/global.hxx:
 # Don't propose hxx -> h change in URE libs
 - osl/file.hxx
diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 859617e5d988..7e046fd1dbda 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -11,12 +11,10 @@
 #ifndef INCLUDED_O3TL_LRU_MAP_HXX
 #define INCLUDED_O3TL_LRU_MAP_HXX
 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 
 namespace o3tl
 {
diff --git a/include/o3tl/unit_conversion.hxx b/include/o3tl/unit_conversion.hxx
index 7f0053627f50..54eb8cd246eb 100644
--- a/include/o3tl/unit_conversion.hxx
+++ b/include/o3tl/unit_conversion.hxx
@@ -10,7 +10,6 @@
 #pragma once
 
 #include 
-#include 
 #include 
 
 #include 

[Libreoffice-commits] core.git: cui/uiconfig

[Gabor Kelemen (via logerrit)]

 cui/uiconfig/ui/optuserpage.ui |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e0021031f6cb0c52892142d5753b222d571acf49
Author: Gabor Kelemen 
AuthorDate: Mon Sep 25 18:13:25 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 26 16:27:44 2023 +0200

tdf#85263 Resolve accelerator collision in Options - User Data page

Set explicit accelerators for labels missing them, to not rely on
automatic assignment

Change-Id: I97356b06136a1688cfaa96c94f11564c5ce0d7a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157257
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 159db4742f37..1de038bbe158 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -28,7 +28,7 @@
 False
 True
 start
-_Company:
+Co_mpany:
 True
 company
 0
@@ -452,7 +452,7 @@
 
 
   
-Use data for document properties
+_Use data for document properties
 True
 True
 False
@@ -929,7 +929,7 @@
   
 True
 False
-OpenPGP signing key:
+_OpenPGP signing key:
 True
 signingkey
 0
@@ -943,7 +943,7 @@
   
 True
 False
-OpenPGP encryption key:
+OpenPGP encryption _key:
 True
 encryptionkey
 0
@@ -993,7 +993,7 @@
 
 
   
-When encrypting documents, always encrypt 
to self
+When _encrypting documents, always encrypt 
to self
 True
 True
 False

[Libreoffice-commits] core.git: cui/uiconfig

[Gabor Kelemen (via logerrit)]

 cui/uiconfig/ui/optuserpage.ui |  644 -
 1 file changed, 322 insertions(+), 322 deletions(-)

New commits:
commit 8d7a27a3e4b71e6be44e7fc07f370e18bf475b4c
Author: Gabor Kelemen 
AuthorDate: Mon Sep 25 18:08:08 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 26 16:27:10 2023 +0200

Resave in newer Glade version

Change-Id: Ib531c114e0167f48f5e9e1ee3ab61a99a161519c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157256
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 25c6438f2e24..159db4742f37 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1,126 +1,126 @@
 
-
+
 
   
   
 True
-False
-6
+False
+6
 vertical
 12
 
   
 True
-False
-0
-none
+False
+0
+none
 
-  
+  
   
 True
-False
-6
-6
+False
 12
 6
+6
+6
 
   
-False
-True
+False
+True
 start
 _Company:
-True
-company
+True
+company
 0
   
   
-0
-0
+0
+0
   
 
 
   
-False
-True
+False
+True
 start
 First/last _name/initials:
-True
-firstname
+True
+firstname
 0
   
   
-0
-1
+0
+1
   
 
 
   
-False
-True
+False
+True
 start
 _Street:
-True
-street
+True
+street
 0
   
   
-0
-4
+0
+4
   
 
 
   
-False
-True
+False
+True
 start
 City/state/_zip:
-True
-city
+True
+city
 0
   
   
-0
-7
+0
+7
   
 
 
   
-False
-True
+False
+True
 start
 Country/re_gion:
-True
-country
+True
+country
 0
   
   
-0
-8
+0
+8
   
 
 
   
-False
-True
+False
+True
 start
 _Title/position:
-True
-title
+True
+title
 0
   
   
-0
-9
+0
+9
   
 
 
   
-False
-True
+False
+True
 start
 Telephone (home/_work):
-True
-home
+True
+home
 0
 
   
@@ -129,38 +129,38 @@
 
   
   
-0
-10
+0
+10
   
 
 
   
-False
-True
+False
+True
 start
 Fa_x/email:
-True
-fax
+True
+fax
 0
   
   
-0
-11
+0
+11
   
 
 
-  
+  
   
-False
-True
-6
+False
+True
+6
 
   
-True
-True
+True
+True
 center
   

[Libreoffice-commits] core.git: sd/inc

[Gabor Kelemen (via logerrit)]

 sd/inc/strings.hrc |   30 --
 1 file changed, 30 deletions(-)

New commits:
commit e53a99c4bbf09763ecfb05a0926e7957b31c1fff
Author: Gabor Kelemen 
AuthorDate: Mon Sep 25 10:14:09 2023 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Sep 26 16:26:44 2023 +0200

tdf#105303 (related) Drop unused translation strings

Obsoleted by
commit 28b6480c6bdd179f3943f768926b7f196226c768
commit c5cff66335ca162b52270059e57214c4065caf66

found with simple script:
for i in $( grep "^\#define" sd/inc/strings.hrc | cut -d " " -f 2 ) ; do if 
[ $(gg -l "$i" sd | wc -l ) -eq 1 ] ; then echo "$i: appears once" ; fi; done

Change-Id: I1f07ebc275b8ee9a165c5e1f5ad1d1e68f9eaa81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157239
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Reviewed-by: Thorsten Behrens 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index a3501bfc50a1..8438a9262a95 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -178,9 +178,6 @@
 #define STR_GLUE_ESCDIR_VERT
NC_("STR_GLUE_ESCDIR_VERT", "Vertical")
 #define STR_GLUE_ESCDIR_ALL 
NC_("STR_GLUE_ESCDIR_ALL", "All?")
 #define STR_CANT_PERFORM_IN_LIVEMODE
NC_("STR_CANT_PERFORM_IN_LIVEMODE", "This action can't be run in the live 
mode.")
-#define STR_PUBLISH_BACK
NC_("STR_PUBLISH_BACK", "Back")
-#define STR_PUBLISH_NEXT
NC_("STR_PUBLISH_NEXT", "Continue")
-#define STR_PUBLISH_OUTLINE 
NC_("STR_PUBLISH_OUTLINE", "Overview")
 #define STR_EYEDROPPER  NC_("STR_EYEDROPPER", 
"Color Replacer")
 #define STR_UNDO_MORPHING   
NC_("STR_UNDO_MORPHING", "Cross-fading")
 #define STR_UNDO_EXPAND_PAGE
NC_("STR_UNDO_EXPAND_PAGE", "Expand Slide")
@@ -205,28 +202,6 @@
 #define STR_IMPRESS_DOCUMENT_FULLTYPE_80
NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_80", "%PRODUCTNAME %PRODUCTVERSION 
Presentation")
 #define STR_GRAPHIC_DOCUMENT_FULLTYPE_80
NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_80", "%PRODUCTNAME %PRODUCTVERSION Drawing")
 
-// HtmlExport
-#define STR_PUBDLG_SAMENAME 
NC_("STR_PUBDLG_SAMENAME", "A design already exists with this name.\nDo you 
want to replace it?")
-#define STR_HTMLATTR_TEXT   
NC_("STR_HTMLATTR_TEXT", "Text")
-#define STR_HTMLATTR_LINK   
NC_("STR_HTMLATTR_LINK", "Hyperlink")
-#define STR_HTMLATTR_VLINK  
NC_("STR_HTMLATTR_VLINK", "Visited link")
-#define STR_HTMLATTR_ALINK  
NC_("STR_HTMLATTR_ALINK", "Active link")
-#define STR_HTMLEXP_NOTES   
NC_("STR_HTMLEXP_NOTES", "Notes")
-#define STR_HTMLEXP_CONTENTS
NC_("STR_HTMLEXP_CONTENTS", "Table of contents")
-#define STR_HTMLEXP_CLICKSTART  
NC_("STR_HTMLEXP_CLICKSTART", "Click here to start")
-#define STR_HTMLEXP_AUTHOR  
NC_("STR_HTMLEXP_AUTHOR", "Author")
-#define STR_HTMLEXP_EMAIL   
NC_("STR_HTMLEXP_EMAIL", "Email")
-#define STR_HTMLEXP_HOMEPAGE
NC_("STR_HTMLEXP_HOMEPAGE", "Homepage")
-#define STR_HTMLEXP_INFO
NC_("STR_HTMLEXP_INFO", "Further information")
-#define STR_HTMLEXP_DOWNLOAD
NC_("STR_HTMLEXP_DOWNLOAD", "Download presentation")
-#define STR_HTMLEXP_NOFRAMES
NC_("STR_HTMLEXP_NOFRAMES", "Unfortunately your browser does not support 
floating frames.")
-#define STR_HTMLEXP_FIRSTPAGE   
NC_("STR_HTMLEXP_FIRSTPAGE", "First page")
-#define STR_HTMLEXP_LASTPAGE
NC_("STR_HTMLEXP_LASTPAGE", "Last page")
-#define STR_HTMLEXP_SETTEXT 
NC_("STR_HTMLEXP_SETTEXT", "Text")
-#define STR_HTMLEXP_SETGRAPHIC  
NC_("STR_HTMLEXP_SETGRAPHIC", "Image")
-#define STR_HTMLEXP_OUTLINE 
NC_("STR_HTMLEXP_OUTLINE", "With contents")
-#define STR_HTMLEXP_NOOUTLINE   
NC_("STR_HTMLEXP_NOOUTLINE", "Without contents")
-#define STR_WEBVIEW_SAVE
NC_("STR_WEBVIEW_SAVE", "To given page")
 #define STR_UNDO_VECTORIZE  
NC_("STR_UNDO_VECTORIZE", "Convert bitmap to polygon" )
 #define STR_PRES_SOFTEND
NC_("STR_PRES_SOFTEND", "Click to exit presentation..." )
 #define STR_PRES_PAUSE  NC_("STR_PRES_PAUSE", 
"Pause..." )
@@ -235,9 +210,6 @@
 #define STR_WARNING_NOSOUNDFILE 
NC_("STR_WARNING_NOSOUNDFILE", "The file %\nis not a valid audio file !" )
 #define STR_UNDO_CONVERT_TO_METAFILE

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - oox/source

[Darshan-upadhyay1110 (via logerrit)]

 oox/source/export/drawingml.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1d7dc53f19d188ae12603ca3cd526eb0a5016cf4
Author: Darshan-upadhyay1110 
AuthorDate: Tue Sep 26 12:29:15 2023 +0530
Commit: Szymon Kłos 
CommitDate: Tue Sep 26 15:53:34 2023 +0200

tdf#51510 Blurry QR code after save/reload (docx)

- without GfxLinkType::NativeSvg CASE in writeToStorage method by default 
QR svg changes to low resolution image type and that is the why QR got blurry 
in doc or docx format
- added svg option when we change from odt to doc or docx format


Change-Id: I74aec0619992c1f455cc9cbf3c19e352c3037e04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157264
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2e8bf4129860..c2c633f90da3 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1429,6 +1429,10 @@ OUString GraphicExport::writeToStorage(const Graphic& 
rGraphic , bool bRelPathTo
 sMediaType = "image/png";
 pExtension = ".png";
 break;
+case GfxLinkType::NativeSvg:
+sMediaType = "image/svg";
+pExtension = ".svg";
+break;
 case GfxLinkType::NativeTif:
 sMediaType = "image/tiff";
 pExtension = ".tif";

[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - 6 commits - download.lst external/libtommath external/poppler ucb/source

[Michael Stahl (via logerrit)]

 download.lst  |   12 +-
 external/libtommath/README|2 
 external/libtommath/UnpackedTarball_libtommath.mk |2 
 external/libtommath/clang-cl.patch|   16 ---
 external/libtommath/libtommath-msvc.patch |   12 --
 external/poppler/ExternalPackage_poppler_data.mk  |   24 ++---
 external/poppler/README   |2 
 external/poppler/StaticLibrary_poppler.mk |   52 ++--
 external/poppler/UnpackedTarball_poppler.mk   |6 -
 external/poppler/disable-freetype.patch.1 |   18 ++--
 external/poppler/disable-nss-and-gpgmepp.patch.1  |   76 +
 external/poppler/gcc7-EntityInfo.patch.1  |   43 +-
 external/poppler/gcc7-GfxFont.patch.1 |   94 ++
 external/poppler/inc/pch/precompiled_poppler.hxx  |   30 ++-
 external/poppler/poppler-config.patch.1   |   42 +
 ucb/source/ucp/webdav-curl/CurlSession.cxx|4 
 16 files changed, 313 insertions(+), 122 deletions(-)

New commits:
commit 83eda1a8215d74b74011e51d63b95d909276e9d7
Author: Michael Stahl 
AuthorDate: Mon Sep 25 15:50:43 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 26 15:36:41 2023 +0200

poppler: upgrade to release 23.09.0

Fixes CVE-2023-34872

Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157253
Reviewed-by: Xisco Fauli 
(cherry picked from commit 6d1c0e802eaefa1c42051c1456be61cef2dc2e86)

diff --git a/download.lst b/download.lst
index d5cd4f8a3d61..8b42355795dc 100644
--- a/download.lst
+++ b/download.lst
@@ -474,8 +474,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
-POPPLER_TARBALL := poppler-23.06.0.tar.xz
+POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
+POPPLER_TARBALL := poppler-23.09.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index c8c2e47c43d1..7b6f958245ac 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,10 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
 
 $(eval $(call 
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
 
-$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
+$(eval $(call gb_StaticLibrary_use_externals,poppler,\
+   libjpeg \
+   zlib \
+))
 
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
 
@@ -92,6 +95,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/FDPDFDocBuilder \
UnpackedTarball/poppler/poppler/FILECacheLoader \
UnpackedTarball/poppler/poppler/FileSpec \
+   UnpackedTarball/poppler/poppler/FlateEncoder \
UnpackedTarball/poppler/poppler/FontEncodingTables \
UnpackedTarball/poppler/poppler/FontInfo \
UnpackedTarball/poppler/poppler/Form \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 77c643de40f5..3c4d1d0f7a8a 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -19,9 +19,9 @@ disable freetype dependent code
 -#include FT_FREETYPE_H
 +//#include 
 +//#include FT_FREETYPE_H
+ #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
- // to help get compile errors if one ever extends variants
 @@ -2760,6 +2760,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle, bool forceName)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index be8fc98556a7..8f71e987b2b9 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/CppunitTest_sw_core_layout.mk sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_core_layout.mk   |1 
 sw/qa/core/layout/data/table-missing-join.docx |binary
 sw/qa/core/layout/tabfrm.cxx   |   50 +
 sw/source/core/layout/tabfrm.cxx   |9 
 4 files changed, 60 insertions(+)

New commits:
commit 0fcd3fdd1a5899b11da42ee32bd1db0476dab31a
Author: Miklos Vajna 
AuthorDate: Mon Sep 25 08:38:28 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 15:04:20 2023 +0200

tdf#157263 sw floattable: prefer join over split after moving fwd

Regression from commit a4af5432753408c4eea8a8d56c2f48202160c5fe
(tdf#120262 sw floattable, legacy: fix text wrap around fly when no
content fits, 2023-07-17), the bugdoc was of 3 pages in both Word and
Writer, but is now of 4 pages in Writer.

The above commit fixed the layout, so the first row of the table around
the page 1 -> page 2 boundary goes to the start of page 2 instead of to
the end of page 1. This matches the Word layout, so a wanted change on
its own, but it regressed the page acount. The reason for this is that
the table has a single row on page 2 and its follow on page 3 is not
joined, even if there would be still space on page 2. A reduced bugdoc
appears to reproduce this problem even without floating tables, also
with old versions, so it's not a new problem, but it's now more visible.

Fix the problem by tweaking what to do in the next iteration in the loop
of SwTabFrame::MakeAll() after moving forward. Moving forward is
followed by a next iteration in that function, but it does both a
MakePos() and a Format(), so it'll be the last iteration in the "is the
postion / size of this tab frame valid" loop. We used to hit the "bSplit
== true" case, there we found that there is enough remaining space, so
no need to split and we quit the loop. This is now changed, so in case
we moved the table forward and there is still enough space for the
follow to be next to us, then the last iteration will try to join
instead of trying to split.

Note that probably split almost never makes sense after moving forward
in the !HasNext() && HasFollow() case, but let's stay on the safe side
and only do this when the follow definitely fits, which is enough for
our needs here.

(cherry picked from commit b8521d969ab5be4fc947e467d4afe969f9d3b563)

Conflicts:
sw/qa/core/layout/tabfrm.cxx

Change-Id: I64b0a7d257b0ab01353741506969a287b361c5ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157266
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Caolán McNamara 

diff --git a/sw/CppunitTest_sw_core_layout.mk b/sw/CppunitTest_sw_core_layout.mk
index 4bbfd23e0887..82f7dc87e695 100644
--- a/sw/CppunitTest_sw_core_layout.mk
+++ b/sw/CppunitTest_sw_core_layout.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sw_core_layout, \
 sw/qa/core/layout/layact \
 sw/qa/core/layout/layout \
 sw/qa/core/layout/paintfrm \
+sw/qa/core/layout/tabfrm \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_core_layout, \
diff --git a/sw/qa/core/layout/data/table-missing-join.docx 
b/sw/qa/core/layout/data/table-missing-join.docx
new file mode 100644
index ..1fabb9e5b27c
Binary files /dev/null and b/sw/qa/core/layout/data/table-missing-join.docx 
differ
diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx
new file mode 100644
index ..d7df701a3351
--- /dev/null
+++ b/sw/qa/core/layout/tabfrm.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+namespace
+{
+/// Covers sw/source/core/layout/tabfrm.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/core/layout/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testTableMissingJoin)
+{
+// Given a document with a table on page 2:
+// When laying out that document:
+createSwDoc("table-missing-join.docx");
+
+// Then make sure that the table fits page 2:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = pLayout->Lower()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage1);
+auto pPage2 = pPage1->GetNext()->DynCastPageFrame();
+CPPUNIT_ASSERT(pPage2);
+SwFrame* pBody = pPage2->FindBodyCont();
+auto pTab = pBody->GetLower()->DynCastTabFrame();
+// Without the accompanying fix in place, this test would have failed, the 
table continued on
+// page 3.
+  

Re: LO 24.2 C++20 baseline

[Stéphane Guillou]

On 25/09/2023 20:56, Stephan Bergmann wrote:

On 9/25/23 16:47, Caolán McNamara wrote:

I'm guessing that https://gerrit.libreoffice.org/c/core/+/157250 would
workaround this by just extending:

commit 5831d5f03a5ea5b89984574ffe436f38500726da
Date:   Tue Aug 1 15:37:45 2023 +0200

 Don't enable the requires clause for some Xcode Clang

which mentions the same error message, to extend from clang <= 14 to
clang <= 15


So my dim memories had not failed me :)  Thanks!

Now that the dust is settling, can I ask that the BuildingOn* wiki pages 
are checked and updated to reflect the new requirements? I'd give it a 
stab but am pretty much guaranteed to miss something, especially for 
Windows and macOS.


 * https://wiki.documentfoundation.org/Development/BuildingOnLinux
 * https://wiki.documentfoundation.org/Development/BuildingOnMac
 * https://wiki.documentfoundation.org/Development/BuildingOnWindows

Much appreciated!

--
Stéphane Guillou
Quality Assurance Analyst | The Document Foundation

Email:stephane.guil...@libreoffice.org
Mobile (France): +33 7 79 67 18 72
Matrix: @stragu:matrix.org
Fediverse: @str...@mastodon.indie.host
Web:https://stragu.gitlab.io/

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/core/layout/data/rtl-table.docx |binary
 sw/qa/core/layout/paintfrm.cxx|   41 ++
 sw/source/core/layout/paintfrm.cxx|4 ++-
 3 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 0721b09329f88c9206e02afaff832c71065618ee
Author: Miklos Vajna 
AuthorDate: Thu Sep 21 20:21:07 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:39:54 2023 +0200

tdf#154198 sw: fix lost vertical table cell borders for WordTableCell + RTL

This went wrong in commit 0dbecd2d2ebe18a262cfab96e105637840b5b7fe (sw:
fix too long inner borders intersecting with outer borders for Word
cells, 2022-01-06), the problem is that in its current form this assumes
that the first cell is on the left and the last cell is on the right,
which is not true for RTL, so only tweak the length of the borders in
the LTR case.

(cherry picked from commit 652ab50ce18d0ce7fa1209e6bcf3b10ac5c9a933)

Change-Id: I513af974855496e507134cf156f9ee5a937a46db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157166
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/core/layout/data/rtl-table.docx 
b/sw/qa/core/layout/data/rtl-table.docx
new file mode 100644
index ..a329229699e8
Binary files /dev/null and b/sw/qa/core/layout/data/rtl-table.docx differ
diff --git a/sw/qa/core/layout/paintfrm.cxx b/sw/qa/core/layout/paintfrm.cxx
index 2416c6b95f8c..ad09405fe3fb 100644
--- a/sw/qa/core/layout/paintfrm.cxx
+++ b/sw/qa/core/layout/paintfrm.cxx
@@ -68,6 +68,47 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitTableBorder)
 // missing.
 CPPUNIT_ASSERT_EQUAL(4, nHorizontalBorders);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testRTLBorderMerge)
+{
+// Given a document with an RTL table:
+createSwDoc("rtl-table.docx");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwDocShell* pShell = pTextDoc->GetDocShell();
+
+// When rendering that document:
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+
+// Then make sure the 5 columns all have left and right vertical borders:
+MetafileXmlDump aDumper;
+xmlDocUniquePtr pXmlDoc = dumpAndParse(aDumper, *xMetaFile);
+xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, 
"//polyline[@style='solid']/point");
+xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
+int nVerticalBorders = 0;
+// Count the vertical borders:
+for (int i = 0; i < xmlXPathNodeSetGetLength(pXmlNodes); i += 2)
+{
+xmlNodePtr pStart = pXmlNodes->nodeTab[i];
+xmlNodePtr pEnd = pXmlNodes->nodeTab[i + 1];
+xmlChar* pStartY = xmlGetProp(pStart, BAD_CAST("y"));
+xmlChar* pEndY = xmlGetProp(pEnd, BAD_CAST("y"));
+sal_Int32 nStartY = o3tl::toInt32(reinterpret_cast(pStartY));
+sal_Int32 nEndY = o3tl::toInt32(reinterpret_cast(pEndY));
+if (nStartY == nEndY)
+{
+// Horizontal border.
+continue;
+}
+
+++nVerticalBorders;
+}
+xmlXPathFreeObject(pXmlObj);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 6
+// - Actual  : 4
+// i.e. the 2nd and 5th vertical border was missing.
+CPPUNIT_ASSERT_EQUAL(6, nVerticalBorders);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 8f6347a2268e..bd07aa9e1675 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3123,11 +3123,13 @@ void SwTabFramePainter::Insert( SwLineEntry& rNew, bool 
bHori )
 const IDocumentSettingAccess& rIDSA = 
pShell->GetDoc()->getIDocumentSettingAccess();
 bWordTableCell = rIDSA.get(DocumentSettingId::TABLE_ROW_KEEP);
 }
+bool bR2L = mrTabFrame.IsRightToLeft();
 while ( aIter != pLineSet->end() && rNew.mnStartPos < rNew.mnEndPos )
 {
 const SwLineEntry& rOld = *aIter;
 
-if (rOld.mnLimitedEndPos || (bWordTableCell && (rOld.mbOuter != 
rNew.mbOuter)))
+// The bWordTableCell code only works for LTR at the moment, avoid it 
for RTL.
+if (rOld.mnLimitedEndPos || (bWordTableCell && (rOld.mbOuter != 
rNew.mbOuter) && !bR2L))
 {
 // Don't merge with this line entry as it ends sooner than 
mnEndPos.
 ++aIter;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/qa

[Michael Stahl (via logerrit)]

 sw/qa/extras/layout/data/tdf128966-2-min.odt |binary
 sw/qa/extras/layout/layout3.cxx  |   52 +++
 2 files changed, 52 insertions(+)

New commits:
commit 649a34759bfed74e500de735d7ff52b5e4a651d8
Author: Michael Stahl 
AuthorDate: Fri Aug 25 12:09:07 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:38:55 2023 +0200

tdf#128966 sw: add unit test

Reverting commit c303981cfd95ce1c3881366023d5495ae2edce97 it fails with:

  Test name: testTdf128966::TestBody
  assertion failed
  - Expression: nContentBottom > nCellCenter
  - Cell nr.: 80 id=207

So probably bfa81a200ab59971b69823f9a29d8ce222d655e6 was the wrong commit
to contain the bug id...

Change-Id: I69d309d5d5ddeacf66e865db4bb666d8120e717f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156092
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4aa8fea8ac515e55bf3542e2717a3d85f1354054)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156967
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/extras/layout/data/tdf128966-2-min.odt 
b/sw/qa/extras/layout/data/tdf128966-2-min.odt
new file mode 100644
index ..d741f3d9378f
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf128966-2-min.odt differ
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index 7d591e1bd3a4..9815c72adbd3 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -120,6 +120,58 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf120287)
 assertXPath(pXmlDoc, "/root/page/body/txt[1]/SwParaPortion/SwLineLayout", 
1);
 }
 
+static auto getXPathIntAttributeValue(xmlXPathContextPtr pXmlXpathCtx, char 
const* const pXPath)
+-> sal_Int32
+{
+xmlXPathObjectPtr pXmlXpathObj = xmlXPathEvalExpression(BAD_CAST(pXPath), 
pXmlXpathCtx);
+CPPUNIT_ASSERT(pXmlXpathObj->nodesetval);
+CPPUNIT_ASSERT_EQUAL(1, 
xmlXPathNodeSetGetLength(pXmlXpathObj->nodesetval));
+auto ret
+= 
sal_Int32(xmlXPathCastNodeToNumber(xmlXPathNodeSetItem(pXmlXpathObj->nodesetval,
 0)));
+xmlXPathFreeObject(pXmlXpathObj);
+return ret;
+}
+
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf128966)
+{
+createSwDoc("tdf128966-2-min.odt");
+
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+xmlXPathObjectPtr pXmlObj
+= getXPathNode(pXmlDoc, "/root/page/body/tab/row/cell[@rowspan > 
0][child::txt]");
+xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
+CPPUNIT_ASSERT(pXmlNodes);
+CPPUNIT_ASSERT_GREATER(300, xmlXPathNodeSetGetLength(pXmlNodes)); // 
many...
+
+xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pXmlDoc.get());
+registerNamespaces(pXmlXpathCtx);
+
+for (int i = 0; i < xmlXPathNodeSetGetLength(pXmlNodes); ++i)
+{
+xmlNodePtr pNode = xmlXPathNodeSetItem(pXmlNodes, i);
+xmlXPathSetContextNode(pNode, pXmlXpathCtx);
+
+OString msg("Cell nr.: " + OString::number(i)
++ " id=" + 
OString::number(getXPathIntAttributeValue(pXmlXpathCtx, "@id")));
+
+auto nCellTop = getXPathIntAttributeValue(pXmlXpathCtx, 
"infos/bounds/@top");
+auto nCellHeight = getXPathIntAttributeValue(pXmlXpathCtx, 
"infos/bounds/@height");
+auto nCellCenter = nCellTop + (nCellHeight / 2);
+
+auto nContentTop
+= getXPathIntAttributeValue(pXmlXpathCtx, 
"txt[position()=1]/infos/bounds/@top");
+auto nContentBottom = getXPathIntAttributeValue(
+pXmlXpathCtx, "txt[position()=last()]/infos/bounds/@bottom");
+
+CPPUNIT_ASSERT_MESSAGE(msg.getStr(), nContentTop < nCellCenter);
+CPPUNIT_ASSERT_MESSAGE(msg.getStr(), nContentBottom > nCellCenter);
+}
+
+xmlXPathFreeContext(pXmlXpathCtx);
+xmlXPathFreeObject(pXmlObj);
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf106234)
 {
 createSwDoc("tdf106234.fodt");

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/layact.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 7272d2c152424255437f8fbda5ed31737404d52c
Author: Michael Stahl 
AuthorDate: Wed Aug 23 15:52:51 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:38:39 2023 +0200

tdf#128437 tdf#128966 sw: layout: partially revert fix of tdf#124675

The tdf#128437 bugdoc works since LO 4.1 commit
84203fab20b7eb98f0d3667e6626f5c2139e5a7f "Resolves: #i120016# refine
condition for allowing split of a table row".

The non-obvious way in which commit cc5916cd314a27b0cc99560ab887480026630a95
changes the layout is the FlowFrameJoinLockGuard on the table frame.

While layouting page1, with LockJoin, formatting the content in the rows
of the table leaves the table follow valid.

Whereas without LockJoin, formatting the content in the rows grows the
table frame and this invalidates the position of the follow table frame.

 0  SwFrameAreaDefinition::setFrameAreaPositionValid(bool) (this=0x7c85390, 
bNew=false) at sw/source/core/layout/wsfrm.cxx:90
 1  SwFrame::ImplInvalidatePos() (this=0x7c85390) at 
sw/source/core/layout/wsfrm.cxx:2001
 2  SwFrame::InvalidatePos() (this=0x7c85390) at 
sw/source/core/inc/frame.hxx:1053
 3  SwFrame::ImplInvalidateNextPos(bool) (this=0x6edefb0, 
bNoFootnote=false) at sw/source/core/layout/findfrm.cxx:1368
 4  SwFrame::InvalidateNextPos(bool) (this=0x6edefb0, bNoFootnote=false) at 
sw/source/core/inc/frame.hxx:1083
 5  SwTabFrame::GrowFrame(long, bool, bool) (this=0x6edefb0, nDist=10, 
bTst=false, bInfo=false)
sw/source/core/layout/tabfrm.cxx:3428
 6  SwFrame::Grow(long, bool, bool) (this=0x6edefb0, nDist=10, bTst=false, 
bInfo=false) at sw/source/core/layout/wsfrm.cxx:1547
 7  SwTabFrame::Format(OutputDevice*, SwBorderAttrs const*) 
(this=0x6edefb0, pAttrs=0x6f74d00) at sw/source/core/layout/tabfrm.cxx:3357
 8  SwTabFrame::MakeAll(OutputDevice*) (this=0x6edefb0) at 
sw/source/core/layout/tabfrm.cxx:2157
 9  SwFrame::PrepareMake(OutputDevice*) (this=0x6edefb0) at 
sw/source/core/layout/calcmove.cxx:375
 10 SwFrame::Calc(OutputDevice*) const (this=0x6edefb0) at 
sw/source/core/layout/trvlfrm.cxx:1803
 11 SwFrame::PrepareMake(OutputDevice*) (this=0x6f118a0) at 
sw/source/core/layout/calcmove.cxx:253
 12 SwFrame::Calc(OutputDevice*) const (this=0x6f118a0) at 
sw/source/core/layout/trvlfrm.cxx:1803
 13 SwFrame::PrepareMake(OutputDevice*) (this=0x6f11a30) at 
sw/source/core/layout/calcmove.cxx:253
 14 SwFrame::Calc(OutputDevice*) const (this=0x6f11a30) at 
sw/source/core/layout/trvlfrm.cxx:1803
 15 SwFrame::OptPrepareMake() (this=0x6f14da0) at 
sw/source/core/layout/calcmove.cxx:386
 16 SwFrame::OptCalc() const (this=0x6f14da0) at 
sw/source/core/inc/frame.hxx:1090
 17 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) 
(this=0x7ffdabdf0c90, pLay=0x6f11a30, bAddRect=false)
sw/source/core/layout/layact.cxx:1461
 18 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) 
(this=0x7ffdabdf0c90, pLay=0x6f118a0, bAddRect=false)
sw/source/core/layout/layact.cxx:1455
 19 SwLayAction::FormatLayoutTab(SwTabFrame*, bool) (this=0x7ffdabdf0c90, 
pTab=0x6edefb0, bAddRect=false)
at sw/source/core/layout/layact.cxx:1679

Thus invalidated, the follow frame's first row will move back and split.

Unable to reproduce tdf#124675 with the FlowFrameLockGuard reverted -
let's assume that some change elsewhere prevents this kind of crash now.

The only problem with this is that some test fails (and i forgot which
one), that's why the 3 previous commits are needed.

What's amusing is that the layout with this fix is the same as the one
in Word 2013, whereas the layout without this fix is the same as the one
from exporting the bugdoc from Word 2013 in DOCX without compatibility
mode, so this will be a "regression" for DOCX layout but it was all an
accident anyway...

This also fixes the last case of tdf#128966 so every row is vertically
centered now; some previous commit improved it already.

Change-Id: I46d77930666a1762ae16af09525f0b23660beba1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155989
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
(cherry picked from commit bfa81a200ab59971b69823f9a29d8ce222d655e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156966
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index ae8295b43903..84481981fd6e 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1640,11 +1640,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, 
bool bAddRect )
 // format lowers, only if table frame is valid
 if ( pTab->isFrameAreaDefinitionVal

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/inc/tabfrm.hxx|2 -
 sw/source/core/layout/layact.cxx |5 ---
 sw/source/core/layout/tabfrm.cxx |   55 +++
 3 files changed, 52 insertions(+), 10 deletions(-)

New commits:
commit 5b3fcbf23773ea8d039185dec2b9704981833473
Author: Michael Stahl 
AuthorDate: Wed Aug 23 15:50:59 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:37:59 2023 +0200

tdf#156724 sw: layout: fix tables not splitting due to footnotes differently

Revert commit 610c6f02b11b4b4c555a78b0feb2a1eb35159e39 and
and 61a78a523a6131ff98b5d846368e5626fe58d99c instead do the
opposite: never calc content frames in FormatLayout().

There were a few cases where documents looked worse with the fix, such
as the somewhat pathological tdf120139-1.odt and tdf124474-1.odt, but
typically these went from a bad layout to a worse layout, e.g.
--convert-to pdf tdf120139-1.odt went from 11 minutes to 33 minutes
(dbgutil) with twice as many more half-empty pages.

Worse is that the previous fix appears to prevent tdf#128437 from
working.

It should also be less risky to never calc content frames in
FormatLayout(), because with IsPaintLocked() check that used to be done
led to doing it only for pages which were visible when loading the
document, so any regressions with this new approach would appear on few
pages at the start of the document, instead of many pages at the end.

Note that without the previous commit, this would cause
* CppunitTest_sw_core_layout CPPUNIT_TEST_NAME="testTablePrintAreaLeft"
  to fail
* tdf#137523 SwLayoutWriter3 testTdf137523 to fail,
  *only* on the last text frame

This also appears to fix tdf#125749.

Change-Id: I3d72f8e9d2b89aa3738e554308fd9dce12e92238
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155988
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
(cherry picked from commit c303981cfd95ce1c3881366023d5495ae2edce97)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156965
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index a249f6c1f845..4eba886c2385 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -108,7 +108,7 @@ class SW_DLLPUBLIC SwTabFrame final: public SwLayoutFrame, 
public SwFlowFrame
  * created and constructed and inserted directly after this.
  * Join() gets the Follow's content and destroys it.
  */
-bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep );
+bool Split(const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep, 
bool & rIsFootnoteGrowth);
 void Join();
 
 void UpdateAttr_(
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 52774e52f0fa..ae8295b43903 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1433,10 +1433,7 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrame *pLa
 PopFormatLayout();
 }
 }
-else if (!pLay->IsColBodyFrame())
-{   // tdf#156724 unconditionally for frames in tables, so their 
footnotes exist before trying to split
-pLow->OptCalc();
-}
+// else: don't calc content frames any more
 
 if ( IsAgain() )
 return false;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 1c3a878b85d2..049893e2850d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -646,7 +646,8 @@ inline void TableSplitRecalcLock( SwFlowFrame *pTab ) { 
pTab->LockJoin(); }
 inline void TableSplitRecalcUnlock( SwFlowFrame *pTab ) { pTab->UnlockJoin(); }
 
 static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, SwRowFrame& 
rFollowLine,
-  SwTwips nRemainingSpaceForLastRow, SwTwips 
nAlreadyFree )
+  SwTwips nRemainingSpaceForLastRow, SwTwips 
nAlreadyFree,
+  bool & rIsFootnoteGrowth)
 {
 bool bRet = true;
 
@@ -655,6 +656,34 @@ static bool lcl_RecalcSplitLine( SwRowFrame& rLastLine, 
SwRowFrame& rFollowLine,
 SwRectFnSet aRectFnSet(rTab.GetUpper());
 SwTwips nCurLastLineHeight = 
aRectFnSet.GetHeight(rLastLine.getFrameArea());
 
+SwTwips nFootnoteHeight(0);
+if (SwFootnoteBossFrame const*const pBoss = rTab.FindFootnoteBossFrame())
+{
+if (SwFootnoteContFrame const*const pCont = pBoss->FindFootnoteCont())
+{
+for (SwFootnoteFrame const* pFootnote = 
static_cast(pCont->Lower());
+ pFootnote != nullptr;
+ pFootnote = static_cast(pFootnote->GetNext()))
+{
+SwContentFrame const*const pAnchor = pFootnote->GetRef();
+SwTabFrame const* pTab = pAnchor->FindTabFrame();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/tabfrm.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit decade708924e8dbc416893734d2273fcc657dcf
Author: Michael Stahl 
AuthorDate: Wed Aug 23 15:51:32 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:37:32 2023 +0200

tdf#154775 sw: layout: avoid breaking this with following commits

The problem with commit 1b5bc2ae2f19a190bf588a5a26c4d125c3960991 is that
the fix only works in case the fly is invalid at the time when
SwTabFrame::CalcFlyOffsets() is called; if it is valid (which will be
the case with following commits, for non-obvious reasons) then the fix
does nothing, causing testTablePrintAreaLeft to fail.

In Word 2013, this fly causes the table to shift down, despite its
HoriOrient being LEFT; so adapt SwTabFrame::CalcFlyOffsets() to also
shift down in this case.

Likely it would be best not to check HoriOrient at all for ShiftDown
case, but needs checking first what Word does in other cases.

Change-Id: I465a55bbf1a783abce8b8d6d65099bd9df5695f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155987
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 7b1c03ed87f7a21606e09863b23074e6b96e26d1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156964
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index c386bf2ab9de..1c3a878b85d2 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2973,9 +2973,12 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 //   text frame has already changed its page.
 const SwTextFrame* pAnchorCharFrame = pFly->FindAnchorCharFrame();
 const SwFormatHoriOrient& rHori= pFly->GetFormat()->GetHoriOrient();
+// TODO: why not just ignore HoriOrient?
+bool isHoriOrientShiftDown =
+   rHori.GetHoriOrient() == text::HoriOrientation::NONE
+|| rHori.GetHoriOrient() == text::HoriOrientation::LEFT;
 // Only consider invalid Writer fly frames if they'll be shifted down.
-bool bIgnoreFlyValidity
-= bAddVerticalFlyOffsets && rHori.GetHoriOrient() == 
text::HoriOrientation::NONE;
+bool bIgnoreFlyValidity = bAddVerticalFlyOffsets && 
isHoriOrientShiftDown;
 bool bConsiderFly =
 // #i46807# - do not consider invalid
 // Writer fly frames.
@@ -3031,8 +3034,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 bool bShiftDown = css::text::WrapTextMode_NONE == nSurround;
 if (!bShiftDown && bAddVerticalFlyOffsets)
 {
-if (nSurround == text::WrapTextMode_PARALLEL
-&& rHori.GetHoriOrient() == text::HoriOrientation::NONE)
+if (nSurround == text::WrapTextMode_PARALLEL && 
isHoriOrientShiftDown)
 {
 // We know that wrapping was requested and the table frame 
overlaps with
 // the fly frame. Check if the print area overlaps with the 
fly frame as
@@ -3094,7 +3096,8 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
 
 if ((css::text::WrapTextMode_RIGHT == nSurround
  || css::text::WrapTextMode_PARALLEL == nSurround)
-&& text::HoriOrientation::LEFT == rHori.GetHoriOrient())
+&& text::HoriOrientation::LEFT == rHori.GetHoriOrient()
+&& !bShiftDown)
 {
 const tools::Long nWidth
 = aRectFnSet.XDiff(aRectFnSet.GetRight(aFlyRect),

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/layout/layout3.cxx   |2 +-
 sw/source/core/layout/frmtool.cxx |7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit fbf070f38d25de29de3b8d7192e96cb957852965
Author: Michael Stahl 
AuthorDate: Wed Aug 23 15:49:44 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:37:00 2023 +0200

tdf#137523 sw: layout: fix text below tables in footer differently

This fix is better than commit 027f8328eef1e149b6c99b478ed5df870291dc2d
because it turns out the last text frame had a height of 219 in 6.1.

One of the following commits would break this, so a different fix is
needed.

In SwFrameNotify::ImplDestroy(), if the frame changes its position the
next frame's position is invalidated; if the next frame is undersized
then also invalidate its size so that it will be formatted again, with
more space.

Change-Id: I8e6a3fe3127ebfa2246c440d2a3455b217476475
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155986
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 492ddef596c99a9c24d2778276025aafc612a7cb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156963
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index 8ce2ba090602..7d591e1bd3a4 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -106,7 +106,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf137523)
 // had wrong height and were not visible
 assertXPath(pXmlDoc, "/root/page/footer/txt[1]/infos/bounds", "height", 
"304");
 assertXPath(pXmlDoc, "/root/page/footer/txt[2]/infos/bounds", "height", 
"191");
-assertXPath(pXmlDoc, "/root/page/footer/txt[3]/infos/bounds", "height", 
"153");
+assertXPath(pXmlDoc, "/root/page/footer/txt[3]/infos/bounds", "height", 
"219");
 assertXPath(pXmlDoc, "/root/page/footer/tab/infos/bounds", "height", 
"1378");
 }
 
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index f3de2a7e201e..7f27932434c6 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -202,7 +202,14 @@ void SwFrameNotify::ImplDestroy()
 }
 
 if ( pNxt )
+{
 pNxt->InvalidatePos();
+if (pNxt->IsTextFrame() && 
static_cast(pNxt)->IsUndersized())
+{   // tdf#137523 it could have more space at new pos
+pNxt->InvalidateSize();
+pNxt->Prepare(PrepareHint::AdjustSizeWithoutFormatting);
+}
+}
 else
 {
 // #104100# - correct condition for setting retouche

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/inc sw/source vcl/qa

[Michael Stahl (via logerrit)]

 sw/inc/EnhancedPDFExportHelper.hxx  |5 
 sw/source/core/text/EnhancedPDFExportHelper.cxx |  129 ++--
 vcl/qa/cppunit/pdfexport/data/spanlist.fodt |  207 
 vcl/qa/cppunit/pdfexport/pdfexport.cxx  |  385 
 4 files changed, 704 insertions(+), 22 deletions(-)

New commits:
commit e8dda2f4c8f03c9fa0f9558b5d6ec4df81524682
Author: Michael Stahl 
AuthorDate: Wed Aug 30 16:24:50 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:36:33 2023 +0200

tdf#157028 sw: PDF/UA export: reduce the number of Span ILSEs

Currently every text portion produces its own Span ILSE, which means
there's at least one per line.

But that seems a bit excessive, let's try to merge the portions and
create new Spans only when needed, i.e. when the formatting properties
that are exported change.

ILSEs may even be nested, e.g. a Span may contain Link or Span.

This will only merge within one SwTextFrame; merging across split
SwTextFrames looks too difficult to implement.

Change-Id: Id9b02332c580266f78da048be80ecceff1b28eca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156299
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ee3c3fcf5c48964f7bc1d64484409f072c614866)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156962
Reviewed-by: Caolán McNamara 

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index 6a505ff7..8ae8d812b71a 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -42,6 +42,7 @@ class StringRangeEnumerator;
 class SwTextNode;
 class SwTable;
 class SwNumberTreeNode;
+class SwTextPaintInfo;
 
 /*
  * Mapping of OOo elements to tagged pdf elements:
@@ -156,6 +157,10 @@ class SwTaggedPDFHelper
 void BeginInlineStructureElements();
 void EndStructureElements();
 
+void EndCurrentSpan();
+void CreateCurrentSpan(SwTextPaintInfo const& rInf, OUString const& 
rStyleName);
+bool CheckContinueSpan(SwTextPaintInfo const& rInf, std::u16string_view 
rStyleName);
+
 bool CheckReopenTag();
 void CheckRestoreTag() const;
 
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 0b4fe669b7d8..ad025d96a7d0 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -91,6 +91,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -141,6 +142,20 @@ struct SwEnhancedPDFState
 
 LanguageType m_eLanguageDefault;
 
+struct Span
+{
+FontLineStyle eUnderline;
+FontLineStyle eOverline;
+FontStrikeout eStrikeout;
+FontEmphasisMark eFontEmphasis;
+short nEscapement;
+SwFontScript nScript;
+LanguageType nLang;
+OUString StyleName;
+};
+
+::std::optional m_oCurrentSpan;
+
 SwEnhancedPDFState(LanguageType const eLanguageDefault)
 : m_eLanguageDefault(eLanguageDefault)
 {
@@ -1530,6 +1545,15 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
 
 void SwTaggedPDFHelper::EndStructureElements()
 {
+if (mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan)
+{
+if (mpFrameInfo != nullptr)
+{   // close span at end of paragraph
+mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan.reset();
+++m_nEndStructureElement;
+}
+}
+
 while ( m_nEndStructureElement > 0 )
 {
 EndTag();
@@ -1539,6 +1563,53 @@ void SwTaggedPDFHelper::EndStructureElements()
 CheckRestoreTag();
 }
 
+void SwTaggedPDFHelper::EndCurrentSpan()
+{
+mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan.reset();
+EndTag(); // close span
+}
+
+void SwTaggedPDFHelper::CreateCurrentSpan(
+SwTextPaintInfo const& rInf, OUString const& rStyleName)
+{
+assert(!mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan);
+mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan.emplace(
+SwEnhancedPDFState::Span{
+rInf.GetFont()->GetUnderline(),
+rInf.GetFont()->GetOverline(),
+rInf.GetFont()->GetStrikeout(),
+rInf.GetFont()->GetEmphasisMark(),
+rInf.GetFont()->GetEscapement(),
+rInf.GetFont()->GetActual(),
+rInf.GetFont()->GetLanguage(),
+rStyleName});
+// leave it open to let next portion decide to merge or close
+--m_nEndStructureElement;
+}
+
+bool SwTaggedPDFHelper::CheckContinueSpan(
+SwTextPaintInfo const& rInf, std::u16string_view const rStyleName)
+{
+if (!mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan)
+return false;
+
+SwEnhancedPDFState::Span const& 
rCurrent(*mpPDFExtOutDevData->GetSwPDFState()->m_oCurrentSpan);
+
+bool const ret(rCurrent.eUnderline == rInf.GetFont()->GetUnderline()
+&& 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - include/vcl sw/inc sw/source

[Michael Stahl (via logerrit)]

 include/vcl/pdfextoutdevdata.hxx|6 +
 sw/inc/EnhancedPDFExportHelper.hxx  |   30 --
 sw/source/core/text/EnhancedPDFExportHelper.cxx |  105 +---
 3 files changed, 69 insertions(+), 72 deletions(-)

New commits:
commit 7c07574ca41792ed6b9f5b8c71f0dfc49baf923b
Author: Michael Stahl 
AuthorDate: Tue Aug 29 12:11:41 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:35:59 2023 +0200

vcl,sw: PDF export: move SwEnhancedPDFExportHelper statics to member

New struct SwEnhancedPDFState to contain the state; it is transported
from SwEnhancedPDFExportHelper instance to SwTaggedPDFHelper instances
via vcl::PDFExtOutDevData.

Change-Id: I0c0f10587ce8bc6f5f1125da4761b7504ad2b970
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156241
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 74b3a0fe9840c6076fd805db7cf8a66f056c5832)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156372
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 987e2a1020b2..3afec3bd934e 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -31,6 +31,7 @@
 class Graphic;
 class GDIMetaFile;
 class SdrObject;
+struct SwEnhancedPDFState;
 
 namespace vcl
 {
@@ -96,6 +97,8 @@ class VCL_DLLPUBLIC PDFExtOutDevData final : public 
ExtOutDevData
 // map from annotation SdrObject to annotation index
 ::std::map> m_ScreenAnnotations;
 
+SwEnhancedPDFState * m_pSwPDFState = nullptr;
+
 public:
 
 PDFExtOutDevData( const OutputDevice& rOutDev );
@@ -153,6 +156,9 @@ public:
 std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks() { return 
maBookmarks;}
 const std::vector& GetChapterNames() const { return 
maChapterNames; }
 
+SwEnhancedPDFState * GetSwPDFState() { return m_pSwPDFState; }
+void SetSwPDFState(SwEnhancedPDFState *const pSwPDFState) { m_pSwPDFState 
= pSwPDFState; }
+
 const Graphic& GetCurrentGraphic() const;
 
 /** Start a new group of render output
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index a6fad2594ae8..6a505ff7 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -24,10 +24,8 @@
 #include "swrect.hxx"
 #include "swtypes.hxx"
 
-#include 
 #include 
 #include 
-#include 
 
 namespace vcl
 {
@@ -176,7 +174,7 @@ class SwTaggedPDFHelper
 /*
  * Analyses the document structure and export Notes, Hyperlinks, References,
  * and Outline. Link ids created during pdf export are stored in
- * aReferenceIdMap and aHyperlinkIdMap, in order to use them during
+ * SwEnhancedPDFState, in order to use them during
  * tagged pdf output. Therefore the SwEnhancedPDFExportHelper is used
  * before painting. Unfortunately links from the EditEngine into the
  * Writer document require to be exported after they have been painted.
@@ -184,14 +182,6 @@ class SwTaggedPDFHelper
  * painting process, the parameter bEditEngineOnly indicated that only
  * the bookmarks from the EditEngine have to be processed.
  */
-typedef std::set< tools::Long, lt_TableColumn > TableColumnsMapEntry;
-typedef std::pair< SwRect, sal_Int32 > IdMapEntry;
-typedef std::vector< IdMapEntry > LinkIdMap;
-typedef std::map< const SwTable*, TableColumnsMapEntry > TableColumnsMap;
-typedef std::map< const SwNumberTreeNode*, sal_Int32 > NumListIdMap;
-typedef std::map< const SwNumberTreeNode*, sal_Int32 > NumListBodyIdMap;
-typedef std::set FrameTagSet;
-
 class SwEnhancedPDFExportHelper
 {
 private:
@@ -214,15 +204,7 @@ class SwEnhancedPDFExportHelper
 
 const SwPrintData& mrPrintData;
 
-static TableColumnsMap s_aTableColumnsMap;
-static LinkIdMap s_aLinkIdMap;
-static NumListIdMap s_aNumListIdMap;
-static NumListBodyIdMap s_aNumListBodyIdMap;
-static FrameTagSet s_FrameTagSet;
-
-static LanguageType s_eLanguageDefault;
-
-void EnhancedPDFExport();
+void EnhancedPDFExport(LanguageType const eLanguageDefault);
 
 /// Exports bibliography entry links.
 void ExportAuthorityEntryLinks();
@@ -246,14 +228,6 @@ class SwEnhancedPDFExportHelper
 
 ~SwEnhancedPDFExportHelper();
 
-static TableColumnsMap& GetTableColumnsMap() {return s_aTableColumnsMap; }
-static LinkIdMap& GetLinkIdMap() { return s_aLinkIdMap; }
-static NumListIdMap& GetNumListIdMap() {return s_aNumListIdMap; }
-static NumListBodyIdMap& GetNumListBodyIdMap() {return 
s_aNumListBodyIdMap; }
-static FrameTagSet & GetFrameTagSet() { return s_FrameTagSet; }
-
-static LanguageType GetDefaultLanguage() {return s_eLanguageDefault; }
-
 //scale and position rRectangle if we're scaling due to notes in margins.
 tools::Rectangle SwRectToPDFRect(const SwPageFrame* pCurrPage,
 const tools::Rectangle& rRectangle) const;
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/layout/data/tdf155177-1-min.odt |binary
 sw/qa/extras/layout/layout3.cxx  |   57 +++
 sw/source/core/text/txtfrm.cxx   |   23 --
 sw/source/core/text/widorp.cxx   |   44 ++--
 sw/source/core/text/widorp.hxx   |6 ++
 5 files changed, 94 insertions(+), 36 deletions(-)

New commits:
commit 6efc84525637ce4291d78033651cf21729baf86a
Author: Michael Stahl 
AuthorDate: Fri Aug 25 14:20:34 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:35:10 2023 +0200

tdf#155177 sw: fix 2-line bug in WidowsAndOrphans::WouldFit()

The problem is that the check if the line contains a non-fly portion
was only done in the loop, but the first line is already handled before
the loop, so its non-fly portions are ignored and never less than 2
lines are moved, regardless of widow/orphan settings.

(regression from commit 8c32cc17ce914188ea6783b0f79e19c5ddbf0b8d)

Change-Id: Ic017a17233fcd58e22d54386650328f00fb3e9f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156121
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit fe89122c15744afcaccaa6d6628fa0436adf12e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156143
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/extras/layout/data/tdf155177-1-min.odt 
b/sw/qa/extras/layout/data/tdf155177-1-min.odt
new file mode 100644
index ..68363860f05d
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf155177-1-min.odt differ
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index 1d570ca3f56f..8ce2ba090602 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -201,6 +201,63 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf120287c)
 assertXPath(pXmlDoc, "/root/page/body/txt[1]/SwParaPortion/SwLineLayout", 
3);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
+{
+createSwDoc("tdf155177-1-min.odt");
+
+uno::Reference 
xStyle(getStyles("ParagraphStyles")->getByName("Body Text"),
+   uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(210), getProperty(xStyle, 
"ParaTopMargin"));
+
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 6);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[6]/SwParaPortion/SwLineLayout", 2);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[6]/SwParaPortion/SwLineLayout[2]", "portion",
+"long as two lines.");
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 3);
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+"This paragraph is even longer so that ");
+discardDumpedLayout();
+}
+
+// this should bring one line back
+xStyle->setPropertyValue("ParaTopMargin", uno::Any(sal_Int32(200)));
+
+Scheduler::ProcessEventsToIdle();
+
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 7);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout", 1);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[1]", "portion",
+"This paragraph is even longer so that ");
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 2);
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+"it is now three lines long though ");
+discardDumpedLayout();
+}
+
+// this should bring second line back
+xStyle->setPropertyValue("ParaTopMargin", uno::Any(sal_Int32(120)));
+
+Scheduler::ProcessEventsToIdle();
+
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 7);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout", 2);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[1]", "portion",
+"This paragraph is even longer so that ");
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[2]", "portion",
+"it is now three lines long though ");
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 1);
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+"containing a single sentence.");
+discardDumpedLayout();
+}
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf122878)
 {
 createSwDoc("tdf122878.docx");
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index a495e312a60b..3405fc6167bf 100644
--- a/sw/source/co

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/layout/data/tdf155177-1-min.odt |binary
 sw/qa/extras/layout/layout2.cxx  |   57 +++
 sw/source/core/text/txtfrm.cxx   |   23 --
 sw/source/core/text/widorp.cxx   |   44 ++--
 sw/source/core/text/widorp.hxx   |6 ++
 5 files changed, 94 insertions(+), 36 deletions(-)

New commits:
commit f49f87f628197bd58e5a5411a77615a677c0ff83
Author: Michael Stahl 
AuthorDate: Fri Aug 25 14:20:34 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:35:20 2023 +0200

tdf#155177 sw: fix 2-line bug in WidowsAndOrphans::WouldFit()

The problem is that the check if the line contains a non-fly portion
was only done in the loop, but the first line is already handled before
the loop, so its non-fly portions are ignored and never less than 2
lines are moved, regardless of widow/orphan settings.

(regression from commit 8c32cc17ce914188ea6783b0f79e19c5ddbf0b8d)

Change-Id: Ic017a17233fcd58e22d54386650328f00fb3e9f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156121
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit fe89122c15744afcaccaa6d6628fa0436adf12e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156197
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/extras/layout/data/tdf155177-1-min.odt 
b/sw/qa/extras/layout/data/tdf155177-1-min.odt
new file mode 100644
index ..68363860f05d
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf155177-1-min.odt differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 1e715b17097b..a29664cf8a13 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -2468,6 +2468,63 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf109077)
 CPPUNIT_ASSERT_LESS(static_cast(15), nTextBoxTop - nShapeTop);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf155177)
+{
+createSwDoc("tdf155177-1-min.odt");
+
+uno::Reference 
xStyle(getStyles("ParagraphStyles")->getByName("Text Body"),
+   uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(210), getProperty(xStyle, 
"ParaTopMargin"));
+
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 6);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[6]/SwParaPortion/SwLineLayout", 2);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[6]/SwParaPortion/SwLineLayout[2]", "portion",
+"long as two lines.");
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 3);
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+"This paragraph is even longer so that ");
+discardDumpedLayout();
+}
+
+// this should bring one line back
+xStyle->setPropertyValue("ParaTopMargin", uno::Any(sal_Int32(200)));
+
+Scheduler::ProcessEventsToIdle();
+
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 7);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout", 1);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[1]", "portion",
+"This paragraph is even longer so that ");
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 2);
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+"it is now three lines long though ");
+discardDumpedLayout();
+}
+
+// this should bring second line back
+xStyle->setPropertyValue("ParaTopMargin", uno::Any(sal_Int32(120)));
+
+Scheduler::ProcessEventsToIdle();
+
+{
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[2]/body/txt", 7);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout", 2);
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[1]", "portion",
+"This paragraph is even longer so that ");
+assertXPath(pXmlDoc, 
"/root/page[2]/body/txt[7]/SwParaPortion/SwLineLayout[2]", "portion",
+"it is now three lines long though ");
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout", 1);
+assertXPath(pXmlDoc, 
"/root/page[3]/body/txt[1]/SwParaPortion/SwLineLayout[1]", "portion",
+"containing a single sentence.");
+discardDumpedLayout();
+}
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testUserFieldTypeLanguage)
 {
 // Set the system locale to German, the document will be English.
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 5906c9c9d1f3..90b0a9

[Libreoffice-commits] core.git: include/vcl svx/source

[Caolán McNamara (via logerrit)]

 include/vcl/formatter.hxx  |6 ++
 svx/source/fmcomp/gridcell.cxx |   14 --
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 9b7c732215f2dc34d1f0cfc08ea912a3925b13b0
Author: Caolán McNamara 
AuthorDate: Tue Sep 26 10:42:06 2023 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 13:32:28 2023 +0200

Resolves: tdf#151919 mark blanked fields as requiring a reformat

the next time a format is requested, even if the value of the
Formatter is the same, otherwise if the value is the same it
will remain blank.

Change-Id: Iec77e6d9f792b51a83a9e289cbdb197605ab1a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157267
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/formatter.hxx b/include/vcl/formatter.hxx
index 4aa81ea1be30..54d6745587e1 100644
--- a/include/vcl/formatter.hxx
+++ b/include/vcl/formatter.hxx
@@ -186,6 +186,12 @@ public:
 // If the current String is invalid, GetValue() returns this value
 double  GetDefaultValue() const { return m_dDefaultValue; }
 
+// Make the formatter recreate the output text from the value on the next
+// format attempt even if the value is the same as the current value.
+// Needed if the associated widget had its text changed by something other
+// that this Formatter (typically blanked out) since the last formatting
+voidInvalidateValueState(){ m_ValueState = valueDirty; }
+
 void SetLastSelection(const Selection& rSelection) { m_aLastSelection = 
rSelection; }
 
 // Settings for the format
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2bf339a19135..cb8ccf91955f 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2067,15 +2067,16 @@ void DbNumericField::updateFromModel( Reference< 
XPropertySet > _rxModel )
 OSL_ENSURE( _rxModel.is() && m_pWindow, "DbNumericField::updateFromModel: 
invalid call!" );
 
 FormattedControlBase* pControl = 
static_cast(m_pWindow.get());
+Formatter& rFormatter = pControl->get_formatter();
 
 double dValue = 0;
 if ( _rxModel->getPropertyValue( FM_PROP_VALUE ) >>= dValue )
-{
-Formatter& rFormatter = pControl->get_formatter();
 rFormatter.SetValue(dValue);
-}
 else
+{
 pControl->get_widget().set_text(OUString());
+rFormatter.InvalidateValueState();
+}
 }
 
 bool DbNumericField::commitControl()
@@ -2187,15 +2188,16 @@ void DbCurrencyField::updateFromModel( Reference< 
XPropertySet > _rxModel )
 OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCurrencyField::updateFromModel: 
invalid call!" );
 
 FormattedControlBase* pControl = 
static_cast(m_pWindow.get());
+Formatter& rFormatter = pControl->get_formatter();
 
 double dValue = 0;
 if ( _rxModel->getPropertyValue( FM_PROP_VALUE ) >>= dValue )
-{
-Formatter& rFormatter = pControl->get_formatter();
 rFormatter.SetValue(dValue);
-}
 else
+{
 pControl->get_widget().set_text(OUString());
+rFormatter.InvalidateValueState();
+}
 }
 
 bool DbCurrencyField::commitControl()

[Libreoffice-commits] core.git: sc/source

[Michael Weghorn (via logerrit)]

 sc/source/ui/Accessibility/AccessibleCell.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit c2d6ae1781ad4be5f9acefecce7e1504df02cf8f
Author: Michael Weghorn 
AuthorDate: Tue Sep 26 10:30:27 2023 +0200
Commit: Michael Weghorn 
CommitDate: Tue Sep 26 12:05:59 2023 +0200

tdf#157299 sc a11y: Limit amount of reported cell relations

For the cells referenced in formulae, the a11y `CONTROLLED_BY`
relation is reported.

Since formulae can reference a large amount of cells, creating
the a11y objects for each of these cells can result in Calc freezing,
e.g. for the tdf#157299 `SUMIF` example that was referencing a whole
column (containing 1048576 cells).

Prevent that by limiting the maximimum amount of cells to handle
here to 1000, and just printing a warning to the log otherwise
and ignore cell ranges having more cells.

If there's a need to increase the limit, that should be possible
within certain bounds. My test with a modified SUMIF that just
uses 999 cells wasn't causing any noticeable delay and the
relations were shown in Accerciser as expected.

From a quick look at the Orca and NVDA source code,
they currently don't seem to make use of the
`CONTROLLED_BY` relation for LibreOffice at all.

Change-Id: Ia74e0e88d9dbd7650832664b9c027262367b428e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157265
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 855bdf957546..27ac67611585 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -455,6 +455,15 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
 const sal_uInt32 nCount(static_cast(rRange.aEnd.Col() -
 rRange.aStart.Col() + 1) * (rRange.aEnd.Row() -
 rRange.aStart.Row() + 1));
+
+// tdf#157299 avoid handling a large amount of cells for performance 
reasons
+if (nCount > 1000)
+{
+SAL_WARN("sc", "ScAccessibleCell::AddRelation: Not setting relations "
+   "for cell range with more than 1000 cells for 
performance reasons.");
+return;
+}
+
 uno::Sequence < uno::Reference < uno::XInterface > > aTargetSet( nCount );
 uno::Reference < uno::XInterface >* pTargetSet = aTargetSet.getArray();
 sal_uInt32 nPos(0);

[Libreoffice-commits] core.git: sal/osl

[Mike Kaganski (via logerrit)]

 sal/osl/w32/file_dirvol.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d724b51c7da391c9afe5e47476d432aecf1c4c67
Author: Mike Kaganski 
AuthorDate: Tue Sep 26 09:52:29 2023 +0300
Commit: Mike Kaganski 
CommitDate: Tue Sep 26 11:59:54 2023 +0200

tdf#157448: ignore FILE_ATTRIBUTE_READONLY when FILE_ATTRIBUTE_DIRECTORY is 
set

Change-Id: I3fbcf15924b30e2c7fe5501e706cdaf32921e103
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157263
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index f9d821605e86..f0c03d0d0033 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -1553,6 +1553,10 @@ oslFileError SAL_CALL osl_getFileStatus(
 pStatus->uValidFields |= osl_FileStatus_Mask_Type;
 
 pStatus->uAttributes = pItemImpl->FindData.dwFileAttributes;
+// tdf#157448: RO attribute is ignored for directories on Windows:
+// 
https://learn.microsoft.com/en-us/windows/desktop/FileIO/file-attribute-constants
+if (pStatus->uAttributes & FILE_ATTRIBUTE_DIRECTORY)
+pStatus->uAttributes &= ~sal_uInt64(FILE_ATTRIBUTE_READONLY);
 pStatus->uValidFields |= osl_FileStatus_Mask_Attributes;
 
 pStatus->uFileSize = 
static_cast(pItemImpl->FindData.nFileSizeLow) + 
(static_cast(pItemImpl->FindData.nFileSizeHigh) << 32);

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/shared/optionen/01041000.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a83574c073321df45582cce99d7b811774438723
Author: Seth Chaiklin 
AuthorDate: Tue Sep 26 11:18:26 2023 +0200
Commit: Seth Chaiklin 
CommitDate: Tue Sep 26 11:49:00 2023 +0200

tdf#157006 update label change for "Expand word space..."

Change-Id: I0b552f127d86846180783a9013f73c9c0dbd6130
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157223
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/optionen/01041000.xhp 
b/source/text/shared/optionen/01041000.xhp
index 7f203f5513..0104904f7f 100644
--- a/source/text/shared/optionen/01041000.xhp
+++ b/source/text/shared/optionen/01041000.xhp
@@ -73,7 +73,7 @@
 Consider wrapping style when positioning 
objectsUFI: spec obj-pos-without-wrapping
 Specifies how the complex 
process of positioning floating objects that are anchored to a character or 
paragraph should work. In Writer versions prior to StarOffice 8 or 
OpenOffice.org 2.0, an iterative process was used, while in current versions a 
straightforward process is used, which is similar to the same process in 
Microsoft Word.
 If the option is off, the old 
%PRODUCTNAME iterative process of object positioning is used. If the option is 
on, the new straightforward process is used to ensure compatibility with 
Microsoft Word documents.
-Expand word space on lines with manual line breaks in 
justified paragraphsUFI: i79041
+Justify lines with a manual line break in justified 
paragraphsUFI: i79041
 If enabled, Writer adds spacing 
between words, in lines that end with Shift+Enter in justified paragraphs. If 
disabled, spacing between words will not be expanded to justify the 
lines.
 This setting is on by default 
for .odt text documents. It will be saved and loaded with the document in the 
.odt text document format. This setting cannot be saved in old .sxw text 
documents, so this setting is off for .sxw text documents.
 Tolerate white lines that may appear in PDF page 
backgrounds

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/uiconfig

[Seth Chaiklin (via logerrit)]

 helpcontent2|2 +-
 sw/uiconfig/swriter/ui/optcompatpage.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a691337aaa79e03f12b87f9fc2ce85857d9fb621
Author: Seth Chaiklin 
AuthorDate: Tue Sep 26 11:49:00 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Sep 26 11:49:00 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a83574c073321df45582cce99d7b811774438723
  - tdf#157006 update label change for "Expand word space..."

Change-Id: I0b552f127d86846180783a9013f73c9c0dbd6130
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157223
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 0c24f409c31e..a83574c07332 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0c24f409c31e4ca8a85b6a1486e2c6eaf26942d6
+Subproject commit a83574c073321df45582cce99d7b811774438723
commit 0d375d059f52348d53858ff80e6a4d5372c7d71a
Author: Seth Chaiklin 
AuthorDate: Thu Sep 21 01:45:57 2023 +0200
Commit: Seth Chaiklin 
CommitDate: Tue Sep 26 11:48:44 2023 +0200

tdf#157006 shorten "Expand word space..." label

Change-Id: Iaaf6beff5e6c7845c2cb06b2f35ac080fed9d5e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157118
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui 
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 0238d909b21c..0aeb907e6ef3 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -109,7 +109,7 @@
   Use 
OpenOffice.org 1.1 object positioning
   Use 
OpenOffice.org 1.1 text wrapping around objects
   Consider wrapping style when positioning 
objects
-  Expand word space on lines with manual line 
breaks in justified paragraphs
+  Justify lines with a manual line break in 
justified paragraphs
   Protect form (no longer protects whole document. 
Insert write protected section instead)
   Word-compatible trailing blanks
   Tolerate white lines that may appear in PDF page 
backgrounds

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/unx

[Aron Budea (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4abf34d4e63a5df302ecd1ce005bef68a0c78d1
Author: Aron Budea 
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 11:44:17 2023 +0200

tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)

Use correct condition.

Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.

Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157220

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 9c8b3b6563de..7459b17935fc 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -321,7 +321,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
 // assume that everything <= 1.17.8 is unsafe to disable this
-if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
 cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
 }
 cairo_set_font_options(cr, pOptions);

Re: LO 24.2 C++20 baseline

[Miklos Vajna]

Hi,

On Mon, Sep 25, 2023 at 01:48:01PM +0300, Stephan Bergmann 
 wrote:
> Was that maybe an intermittent Clang bug?  It apparently doesn't hit the
> Jenkins Clang builds, and I don't see it with trunk Clang 18 either, but
> have dim memories that there was some issue with too-eager evaluation
> causing something like this at some point.  Do you have a way to check with
> another Clang version, to substantiate that assumption?

Yes, I can confirm downgrading to clang-12 would work around the
problem.

On Mon, Sep 25, 2023 at 12:57:56PM +0100, Caolán McNamara 
 wrote:
> On Mon, 2023-09-25 at 13:48 +0300, Stephan Bergmann wrote:
> > Was that maybe an intermittent Clang bug?  It apparently doesn't hit
> > the Jenkins Clang builds, and I don't see it with trunk Clang 18
> > either
> 
> I'm seeing it in oss-fuzz too FWIW, like
> https://oss-fuzz-build-logs.storage.googleapis.com/log-d8e659e6-8b3e-45b0-9676-ceb57d8152f4.txt

I see this got fixed with core.git commit
7f75bfd0f6b1bf4debb69e96c114e453c62685f8 (Don't enable the requires
clause for Clang 15, 2023-09-25), and that also fixed my original setup.

Thanks,

Miklos

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/poppler

[Michael Stahl (via logerrit)]

 download.lst  |4 ++--
 external/poppler/StaticLibrary_poppler.mk |6 +-
 external/poppler/disable-freetype.patch.1 |2 +-
 external/poppler/poppler-config.patch.1   |   27 +++
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 5b74eb49c84da9cf67c9a4d618850fbec3efb853
Author: Michael Stahl 
AuthorDate: Mon Sep 25 15:50:43 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:40:31 2023 +0200

poppler: upgrade to release 23.09.0

Fixes CVE-2023-34872

Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157218
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 629782352844..2b875b046e8e 100644
--- a/download.lst
+++ b/download.lst
@@ -458,8 +458,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
-POPPLER_TARBALL := poppler-23.06.0.tar.xz
+POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
+POPPLER_TARBALL := poppler-23.09.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index c8c2e47c43d1..7b6f958245ac 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,10 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
 
 $(eval $(call 
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
 
-$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
+$(eval $(call gb_StaticLibrary_use_externals,poppler,\
+   libjpeg \
+   zlib \
+))
 
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
 
@@ -92,6 +95,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/FDPDFDocBuilder \
UnpackedTarball/poppler/poppler/FILECacheLoader \
UnpackedTarball/poppler/poppler/FileSpec \
+   UnpackedTarball/poppler/poppler/FlateEncoder \
UnpackedTarball/poppler/poppler/FontEncodingTables \
UnpackedTarball/poppler/poppler/FontInfo \
UnpackedTarball/poppler/poppler/Form \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 77c643de40f5..3c4d1d0f7a8a 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -19,9 +19,9 @@ disable freetype dependent code
 -#include FT_FREETYPE_H
 +//#include 
 +//#include FT_FREETYPE_H
+ #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
- // to help get compile errors if one ever extends variants
 @@ -2760,6 +2760,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle, bool forceName)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index be8fc98556a7..8f71e987b2b9 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6
+mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off 
-DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off 
-DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6=off
 
 manually disabled these because cmake failed to do it:
 HAVE_CAIRO
@@ -37,9 +37,6 @@ index 0fbd336a..451213f8 100644
 +/* Do not hardcode the library location */
 +/* #undef ENABLE_RELOCATABLE */
 +
-+/* Build against zlib. */
-+/* #undef ENABLE_ZLIB */
-+
 +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */
 +/* #undef ENABLE_ZLIB_UNCOMPRESS */
 +
@@ -182,7 +179,7 @@ index 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - configure.ac download.lst external/libwps

[Taichi Haradaguchi (via logerrit)]

 configure.ac|2 +-
 download.lst|4 ++--
 external/libwps/README  |2 +-
 external/libwps/inc/pch/precompiled_wps.hxx |3 ++-
 external/libwps/libtool.patch.0 |   13 ++---
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit d74f136da78b3690ecdf284940ac9d9a4231b56c
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 21 20:23:26 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:39:15 2023 +0200

upload libwps 0.4.14

Change-Id: I0d10aafa17afaaef9b154255bf17638dd67070e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157149
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 6acdde8006e6b59758b00bc178f15f32796a1987)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157214
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 69f5ef61bec8..bc6a09974a54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9573,7 +9573,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10])
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.14])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 0044c6a8f3ab..629782352844 100644
--- a/download.lst
+++ b/download.lst
@@ -544,8 +544,8 @@ WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-WPS_SHA256SUM := 
e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
-WPS_VERSION_MICRO := 12
+WPS_SHA256SUM := 
365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de
+WPS_VERSION_MICRO := 14
 WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libwps/README b/external/libwps/README
index 3ce52187d520..1354aaa24db2 100644
--- a/external/libwps/README
+++ b/external/libwps/README
@@ -1 +1 @@
-Microsoft Works file word processor format import library from 
[http://libwps.sourceforge.net/].
+Microsoft Works file word processor format import library from 
[https://sourceforge.net/projects/libwps/].
diff --git a/external/libwps/inc/pch/precompiled_wps.hxx 
b/external/libwps/inc/pch/precompiled_wps.hxx
index 77d92f7615b6..e25d81e9c6ca 100644
--- a/external/libwps/inc/pch/precompiled_wps.hxx
+++ b/external/libwps/inc/pch/precompiled_wps.hxx
@@ -13,13 +13,14 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-10-13 10:00:18 using:
+ Generated on 2023-09-21 20:32:22 using:
  ./bin/update_pch external/libwps wps --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
  ./bin/update_pch_bisect ./external/libwps/inc/pch/precompiled_wps.hxx "make 
external/libwps.build" --find-conflicts
 */
 
+#include 
 #if PCH_LEVEL >= 1
 #include 
 #include 
diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0
index cc4b08ba2147..bccd0ebdbc06 100644
--- a/external/libwps/libtool.patch.0
+++ b/external/libwps/libtool.patch.0
@@ -1,12 +1,11 @@
 ltmain.sh.sav  2018-08-02 14:21:34.0 +0200
-+++ ltmain.sh  2019-05-05 22:04:15.433588776 +0200
-@@ -7277,7 +7277,8 @@ func_mode_link ()
-   # -stdlib=*select c++ std lib with clang
+--- ltmain.sh.sav  2023-05-03 21:29:15.0 +0900
 ltmain.sh  2023-09-21 20:13:31.766938069 +0900
+@@ -7277,7 +7277,7 @@ func_mode_link ()
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+  -fuse-ld=*|--ld-path=*)
+   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-  -fsanitize=*)
++  -fsanitize=*|-fuse-ld=*|--ld-path=*)
  func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
  func_append compile_command " $arg"

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/poppler

[Michael Stahl (via logerrit)]

 download.lst  |4 ++--
 external/poppler/StaticLibrary_poppler.mk |6 +-
 external/poppler/disable-freetype.patch.1 |2 +-
 external/poppler/poppler-config.patch.1   |   27 +++
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 6d1c0e802eaefa1c42051c1456be61cef2dc2e86
Author: Michael Stahl 
AuthorDate: Mon Sep 25 15:50:43 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:38:04 2023 +0200

poppler: upgrade to release 23.09.0

Fixes CVE-2023-34872

Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157253
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 413fb57673d2..7ec467d43a66 100644
--- a/download.lst
+++ b/download.lst
@@ -454,8 +454,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
-POPPLER_TARBALL := poppler-23.06.0.tar.xz
+POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
+POPPLER_TARBALL := poppler-23.09.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index c8c2e47c43d1..7b6f958245ac 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,10 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
 
 $(eval $(call 
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
 
-$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
+$(eval $(call gb_StaticLibrary_use_externals,poppler,\
+   libjpeg \
+   zlib \
+))
 
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
 
@@ -92,6 +95,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/FDPDFDocBuilder \
UnpackedTarball/poppler/poppler/FILECacheLoader \
UnpackedTarball/poppler/poppler/FileSpec \
+   UnpackedTarball/poppler/poppler/FlateEncoder \
UnpackedTarball/poppler/poppler/FontEncodingTables \
UnpackedTarball/poppler/poppler/FontInfo \
UnpackedTarball/poppler/poppler/Form \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 77c643de40f5..3c4d1d0f7a8a 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -19,9 +19,9 @@ disable freetype dependent code
 -#include FT_FREETYPE_H
 +//#include 
 +//#include FT_FREETYPE_H
+ #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
- // to help get compile errors if one ever extends variants
 @@ -2760,6 +2760,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle, bool forceName)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index be8fc98556a7..8f71e987b2b9 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6
+mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off 
-DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off 
-DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6=off
 
 manually disabled these because cmake failed to do it:
 HAVE_CAIRO
@@ -37,9 +37,6 @@ index 0fbd336a..451213f8 100644
 +/* Do not hardcode the library location */
 +/* #undef ENABLE_RELOCATABLE */
 +
-+/* Build against zlib. */
-+/* #undef ENABLE_ZLIB */
-+
 +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */
 +/* #undef ENABLE_ZLIB_UNCOMPRESS */
 +
@@ -182,7 +179,7 @@ index 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/poppler

[Taichi Haradaguchi (via logerrit)]

 download.lst |4 -
 external/poppler/README  |2 
 external/poppler/UnpackedTarball_poppler.mk  |1 
 external/poppler/disable-freetype.patch.1|   18 ++---
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   76 +++
 external/poppler/gcc7-EntityInfo.patch.1 |   43 +++--
 external/poppler/inc/pch/precompiled_poppler.hxx |   30 -
 external/poppler/poppler-config.patch.1  |   27 +---
 8 files changed, 161 insertions(+), 40 deletions(-)

New commits:
commit 038bd4f5bd878bedda8cfee9cad2c28dba482d79
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 14 09:58:15 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:37:24 2023 +0200

poppler: upgrade to release 23.06.0

Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of
some code that requires NSS or GPGMEPP.

Update external/poppler/inc/pch/precompiled_poppler.hxx.

Change-Id: I5e61371776c64962452022516446b5079c3840e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157252
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 2e30742dcd5a..413fb57673d2 100644
--- a/download.lst
+++ b/download.lst
@@ -454,8 +454,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
-POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
+POPPLER_TARBALL := poppler-23.06.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/README b/external/poppler/README
index 35a640264618..08d3612c3542 100644
--- a/external/poppler/README
+++ b/external/poppler/README
@@ -1 +1 @@
-From [http://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base. 
+From [https://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base.
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 6cbed9e103ec..73265d8ec65b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
+   external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/gcc7-EntityInfo.patch.1 \
external/poppler/gcc7-GfxFont.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 710742206925..77c643de40f5 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -1,8 +1,8 @@
 disable freetype dependent code
 
 poppler/poppler/Form.cc.orig   2022-09-14 15:46:48.588316681 +0200
-+++ poppler/poppler/Form.cc2022-09-14 15:48:01.468274551 +0200
-@@ -46,7 +46,7 @@
+--- poppler/poppler/Form.cc.orig   2023-06-05 19:29:14.0 +0900
 poppler/poppler/Form.cc2023-06-14 18:50:22.232312300 +0900
+@@ -48,7 +48,7 @@
  #include 
  #include 
  #include 
@@ -11,7 +11,7 @@ disable freetype dependent code
  #include "goo/gmem.h"
  #include "goo/gfile.h"
  #include "goo/GooString.h"
-@@ -77,8 +77,8 @@
+@@ -78,8 +78,8 @@
  #include "fofi/FoFiTrueType.h"
  #include "fofi/FoFiIdentifier.h"
  
@@ -20,18 +20,18 @@ disable freetype dependent code
 +//#include 
 +//#include FT_FREETYPE_H
  
- // return a newly allocated char* containing an UTF16BE string of size length
- char *pdfDocEncodingToUTF16(const std::string &orig, int *length)
-@@ -2743,6 +2743,8 @@
+ // helper for using std::visit to get a dependent false for static_asserts
+ // to help get compile errors if one ever extends variants
+@@ -2760,6 +2760,8 @@
  
- Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle)
+ Form::AddFontResult Form::addFontToDefaultResources(const std::string 
&filepath, int faceIndex, const std::string &fontFamily, const std::string 
&fontStyle, bool forceName)
  {
 +return {};
 +#if 0
  if (!GooString::endsWith(filepath, ".ttf") && 
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, 
".otf")) {

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/poppler

[Taichi Haradaguchi (via logerrit)]

 download.lst |8 -
 external/poppler/ExternalPackage_poppler_data.mk |   24 ++---
 external/poppler/StaticLibrary_poppler.mk|   46 +--
 external/poppler/UnpackedTarball_poppler.mk  |7 -
 external/poppler/gcc7-GfxFont.patch.1|   94 +++
 external/poppler/poppler-config.patch.1  |   14 +--
 6 files changed, 145 insertions(+), 48 deletions(-)

New commits:
commit 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Mar 14 19:01:26 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:37:01 2023 +0200

poppler: upgrade to release 23.03.0

* Upgrade poppler-data to 0.4.12
* Update poppler-config.patch.1

Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251

diff --git a/download.lst b/download.lst
index 2ca0caf36627..2e30742dcd5a 100644
--- a/download.lst
+++ b/download.lst
@@ -454,10 +454,10 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
-POPPLER_TARBALL := poppler-22.12.0.tar.xz
-POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
-POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
+POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
+POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
+POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/poppler/ExternalPackage_poppler_data.mk 
b/external/poppler/ExternalPackage_poppler_data.mk
index 78024d3fec8b..b85a73f0e663 100644
--- a/external/poppler/ExternalPackage_poppler_data.mk
+++ b/external/poppler/ExternalPackage_poppler_data.mk
@@ -100,6 +100,7 @@ poppler_cmap-files =\
cMap/Adobe-GB1/GB-EUC-H \
cMap/Adobe-GB1/GB-EUC-V \
cMap/Adobe-GB1/GB-H \
+   cMap/Adobe-GB1/GB-V \
cMap/Adobe-GB1/GBK2K-H  \
cMap/Adobe-GB1/GBK2K-V  \
cMap/Adobe-GB1/GBK-EUC-H\
@@ -114,10 +115,9 @@ poppler_cmap-files =\
cMap/Adobe-GB1/GBT-EUC-H\
cMap/Adobe-GB1/GBT-EUC-V\
cMap/Adobe-GB1/GBT-H\
+   cMap/Adobe-GB1/GBT-V\
cMap/Adobe-GB1/GBTpc-EUC-H  \
cMap/Adobe-GB1/GBTpc-EUC-V  \
-   cMap/Adobe-GB1/GBT-V\
-   cMap/Adobe-GB1/GB-V \
cMap/Adobe-GB1/UCS2-GBK-EUC \
cMap/Adobe-GB1/UCS2-GBpc-EUC\
cMap/Adobe-GB1/UniGB-UCS2-H \
@@ -131,17 +131,17 @@ poppler_cmap-files =\
cMap/Adobe-Japan1/78-EUC-H  \
cMap/Adobe-Japan1/78-EUC-V  \
cMap/Adobe-Japan1/78-H  \
-   cMap/Adobe-Japan1/78ms-RKSJ-H   \
-   cMap/Adobe-Japan1/78ms-RKSJ-V   \
cMap/Adobe-Japan1/78-RKSJ-H \
cMap/Adobe-Japan1/78-RKSJ-V \
cMap/Adobe-Japan1/78-V  \
+   cMap/Adobe-Japan1/78ms-RKSJ-H   \
+   cMap/Adobe-Japan1/78ms-RKSJ-V   \
cMap/Adobe-Japan1/83pv-RKSJ-H   \
-   cMap/Adobe-Japan1/90msp-RKSJ-H  \
-   cMap/Adobe-Japan1/90msp-RKSJ-V  \
cMap/Adobe-Japan1/90ms-RKSJ-H   \
cMap/Adobe-Japan1/90ms-RKSJ-UCS2\
cMap/Adobe-Japan1/90ms-RKSJ-V   \
+   cMap/Adobe-Japan1/90msp-RKSJ-H  \
+   cMap/Adobe-Japan1/90msp-RKSJ-V  \
cMap/Adobe-Japan1/90pv-RKSJ-H   \
cMap/Adobe-Japan1/90pv-RKSJ-UCS2\
cMap/Adobe-Japan1/90pv-RKSJ-UCS2C   \
@@ -201,9 +201,6 @@ poppler_cmap-files =\
cMap/Adobe-Japan1/UniJIS2004-UTF32-V\
cMap/Adobe-Japan1/UniJIS2004-UTF8-H \
cMap/Adobe-Japan1/UniJIS2004-UTF8-V \
-   cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V   \
-   cMap/Adobe-Japan1/UniJISPro-UCS2-V  \
-   cMap/Adobe-Japan1/UniJISPro-UTF8-V  \
cMap/Adobe-Jap

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - download.lst external/libtommath

[Michael Stahl (via logerrit)]

 download.lst  |4 ++--
 external/libtommath/README|2 +-
 external/libtommath/UnpackedTarball_libtommath.mk |2 --
 external/libtommath/clang-cl.patch|   16 
 external/libtommath/libtommath-msvc.patch |   12 
 5 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 00839def1c1d28067653a738e04d586bb9778433
Author: Michael Stahl 
AuthorDate: Mon Sep 25 14:22:40 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:36:44 2023 +0200

libtommath: upgrade to release 1.2.1

Fixes CVE-2023-36328.

Change-Id: I1193f5df789c7dd10855e35936fc2697697c464e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157246
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3daab618c759be2b93ad337061ef347c76229a22)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157249
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index dc015b19794d..2ca0caf36627 100644
--- a/download.lst
+++ b/download.lst
@@ -325,8 +325,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
-LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
+LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
+LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit c2f87ac01cad03e286ebb304a32b785f1dac7b60
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:36:36 2023 +0200

LibTomMath: upgrade to release 1.2.0

* external/libtommath/clang-cl.patch: removed "typedef unsigned __int128
mp_word" from tommmath.h
* external/libtommath/libtommath-msvc.patch: fixed upstream

Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157248
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index d11e8b05b98e..dc015b19794d 100644
--- a/download.lst
+++ b/download.lst
@@ -325,8 +325,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
-LIBTOMMATH_TARBALL := ltm-1.0.zip
+LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
+LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libtommath/README b/external/libtommath/README
index 0da3128c5404..41f91970a71b 100644
--- a/external/libtommath/README
+++ b/external/libtommath/README
@@ -3,4 +3,4 @@ integer library written entirely in C.
 
 Used by embedded firebird (external/firebird).
 
-http://www.libtom.org/LibTomMath/
+From [https://www.libtom.net/LibTomMath/].
diff --git a/external/libtommath/UnpackedTarball_libtommath.mk 
b/external/libtommath/UnpackedTarball_libtommath.mk
index bb0b9e352930..8961a46162c5 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -14,8 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
-   external/libtommath/libtommath-msvc.patch \
-   external/libtommath/clang-cl.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/clang-cl.patch 
b/external/libtommath/clang-cl.patch
deleted file mode 100644
index 1cc92d380c62..
--- a/external/libtommath/clang-cl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 tommath.h
-+++ tommath.h
-@@ -15,6 +15,13 @@
- #ifndef BN_H_
- #define BN_H_
- 
-+// Work around clang-cl issue when mp_word is a typedef for unsigned 
__int128, see
-+//  "Clang-cl generates a call 
to an undefined symbol
-+// _udivti3":
-+#if defined _WIN32 && defined __clang__
-+#define MP_8BIT
-+#endif
-+
- #include 
- #include 
- #include 
diff --git a/external/libtommath/libtommath-msvc.patch 
b/external/libtommath/libtommath-msvc.patch
deleted file mode 100644
index 07884871aac9..
--- a/external/libtommath/libtommath-msvc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 makefile.msvc  2016-02-05 23:25:32.0 +0100
-+++ makefile.msvc  2016-07-21 11:34:20.618390100 +0200
-@@ -38,3 +

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/unx

[Aron Budea (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cdb098171a67f4859d2e97cb001528c97de74a76
Author: Aron Budea 
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:22:32 2023 +0200

tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)

Use correct condition.

Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.

Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157219
Reviewed-by: Xisco Fauli 

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 719b5085fcc5..f0ab33c15f5d 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -443,7 +443,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
 // assume that everything <= 1.17.8 is unsafe to disable this
-if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
 cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
 }
 cairo_set_font_options(cr, pOptions);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - librelogo/source

[Julien Nabet (via logerrit)]

 librelogo/source/LibreLogo/LibreLogo.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d3cc049575f32341044631def02f977176e142ac
Author: Julien Nabet 
AuthorDate: Sun Sep 24 12:14:43 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:20:00 2023 +0200

tdf#157388: LibreLogo sqrt undefined

Change-Id: Ief68aa9067e3c817f9ce5694ce015ca9049b4375
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157206
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit fa9c420fb880f5f84aeaf7feab15a86bac47ae31)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157210
Reviewed-by: Xisco Fauli 

diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index 1cab5ec96cb4..dca6356026bb 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -194,7 +194,7 @@ class __Doc__:
 self.fontstyle = 0
 self.points = []
 
-from math import pi, sin, cos, asin, log10, hypot
+from math import pi, sin, cos, asin, log10, hypot, sqrt
 
 from com.sun.star.awt import Point as __Point__
 from com.sun.star.awt import Gradient as __Gradient__

[Libreoffice-commits] core.git: vcl/unx

[Aron Budea (via logerrit)]

 vcl/unx/generic/gdi/cairotextrender.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b52a7c3154f5263db82f19f7cc7d0e7b32da603
Author: Aron Budea 
AuthorDate: Tue Sep 26 00:09:52 2023 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 26 09:31:21 2023 +0200

tdf#152675 treat all cairo versions <= 1.17.8 the same (actually)

Use correct condition.

Follow-up to 1dd357ccf7ca9edbe5f2ef60465c2559f678d306.

Change-Id: Icc2d04c0023b0a6595ece89d389919f3821aacbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 2394c33b0c82..9b998066954b 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -445,7 +445,7 @@ void CairoTextRender::DrawTextLayout(const 
GenericSalLayout& rLayout, const SalG
 // See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/643
 // b) tdf#152675 a similar report for cairo: 1.16.0-4ubuntu1,
 // assume that everything <= 1.17.8 is unsafe to disable this
-if (cairo_version() <= CAIRO_VERSION_ENCODE(1, 17, 8))
+if (cairo_version() > CAIRO_VERSION_ENCODE(1, 17, 8))
 cairo_font_options_set_hint_metrics(pOptions, 
CAIRO_HINT_METRICS_OFF);
 }
 cairo_set_font_options(cr, pOptions);

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3e654ad373407b774ab80c39b15f56b33bfafa6
Author: Olivier Hallot 
AuthorDate: Tue Sep 26 04:05:23 2023 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Sep 26 09:05:23 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0c24f409c31e4ca8a85b6a1486e2c6eaf26942d6
  - tdf#157360 Local help should not phone home

+ Remove call to matomo TDF server instance when help is local
+ Keep when Help is online.
+ refactor javascript

Change-Id: I285b426531c91ff558c01798f803bf3f89720b1f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157255
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 491f223b3e7a..0c24f409c31e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 491f223b3e7a1b272d3050fbaa84be897ef45c2d
+Subproject commit 0c24f409c31e4ca8a85b6a1486e2c6eaf26942d6

[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/help2.js help3xsl/online_transform.xsl help3xsl/tdf_matomo.js Package_html_dynamic.mk

[Olivier Hallot (via logerrit)]

 CustomTarget_html.mk  |6 +++
 Package_html_dynamic.mk   |1 
 help3xsl/help2.js |   79 +-
 help3xsl/online_transform.xsl |3 +
 help3xsl/tdf_matomo.js|   24 
 5 files changed, 67 insertions(+), 46 deletions(-)

New commits:
commit 0c24f409c31e4ca8a85b6a1486e2c6eaf26942d6
Author: Olivier Hallot 
AuthorDate: Mon Sep 25 13:55:57 2023 -0300
Commit: Olivier Hallot 
CommitDate: Tue Sep 26 09:05:22 2023 +0200

tdf#157360 Local help should not phone home

+ Remove call to matomo TDF server instance when help is local
+ Keep when Help is online.
+ refactor javascript

Change-Id: I285b426531c91ff558c01798f803bf3f89720b1f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157255
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index e73ea160e0..ac3f21956a 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -27,6 +27,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
languages.js \
default.css \
help2.js \
+   $(if $(HELP_ONLINE),tdf_matomo.js) \
$(foreach lang,$(gb_HELP_LANGS),\
$(lang)/bookmarks.js \
$(lang)/contents.js \
@@ -331,4 +332,9 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/help2.js : \
 $(BUILDDIR)/config_host.mk
sed -e "s/%PRODUCTNAME/$(gb_PRODUCTNAME_JS)/g" $< > $@
 
+$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/tdf_matomo.js : \
+$(SRCDIR)/helpcontent2/help3xsl/tdf_matomo.js 
+   mkdir -p $(dir $@)
+   cp $(SRCDIR)/helpcontent2/help3xsl/tdf_matomo.js $@
+
 # vim: set noet sw=4 ts=4:
diff --git a/Package_html_dynamic.mk b/Package_html_dynamic.mk
index 6e23cf892e..b7d3e8082f 100644
--- a/Package_html_dynamic.mk
+++ b/Package_html_dynamic.mk
@@ -16,6 +16,7 @@ $(eval $(call 
gb_Package_add_files,helpcontent2_html_dynamic,$(LIBO_SHARE_HELP_F
 languages.js \
 default.css \
 help2.js \
+$(if $(HELP_ONLINE),tdf_matomo.js) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/help3xsl/help2.js b/help3xsl/help2.js
index 8bf2810293..df11cb5210 100644
--- a/help3xsl/help2.js
+++ b/help3xsl/help2.js
@@ -98,20 +98,6 @@ function moduleColor (module) {
 }
 }
 
-// Find spans that need the switch treatment and give it to them
-var spans = document.querySelectorAll("[class^=switch]");
-var n = spans.length;
-for (z = 0; z < n; z++) {
-var id = spans[z].getAttribute("id");
-if (id === null) {
-continue;
-}
-else if (id.startsWith("swlnsys")) {
-setSystemSpan(spans[z]);
-} else {
-setApplSpan(spans[z]);
-}
-}
 /* add &DbPAR= and &System= to the links in DisplayArea div */
 /* skip for object files */
 function fixURL(module, system) {
@@ -216,33 +202,6 @@ function setupLanguages(page) {
 }
 }
 
-// Test, if we are online
-if (document.body.getElementsByTagName('meta')) {
-var _paq = _paq || [];
-/* tracker methods like "setCustomDimension" should be called before 
"trackPageView" */
-_paq.push(['disableCookies']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-(function() {
-var u="//piwik.documentfoundation.org/";
-_paq.push(['setTrackerUrl', u+'piwik.php']);
-_paq.push(['setSiteId', '68']);
-var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
-g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; 
s.parentNode.insertBefore(g,s);
-})();
-var system = getParameterByName("System");
-} else {
-var system = getSystem();
-}
-
-var module = getParameterByName("DbPAR");
-fixURL(module,system);
-moduleColor(module);
-var helpID = getParameterByName("HID");
-// only used in xhp pages with  tags
-var missingElement = document.getElementById("bm_HID2");
-if(missingElement != null){missingElement.innerHTML = helpID;}
-
 function debugInfo(dbg) {
 if (dbg == null) return;
 document.getElementById("DEBUG").style.display = "block";
@@ -251,15 +210,43 @@ function debugInfo(dbg) {
 document.getElementById("bm_HID").innerHTML = "HID is: "+helpID;
 }
 
+// Find spans that need the switch treatment and give it to them
+function impl_Switches(){
+
+let spans = document.querySelectorAll("[class^=switch]");
+let n = spans.length;
+for (let z = 0; z < n; z++) {
+let id = spans[z].getAttribute("id");
+if (id === null) {
+continue;
+}
+else if (id.startsWith("swlnsys")) {
+setSystemSpan(spans[z]);
+} else {
+setApplSpan(spans[z]);
+}
+}
+}
+// Main
+let module = getParameterByName("DbPAR");
+let system = getParameterByName("System");
+let helpID = getParameterByName("HID");
+impl_Switches();
+fixURL(module,system);
+moduleColor(module);
+// only used in xhp pages with