core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit bd4b345ac6017483839091102d732ff3d899ec87
Author: Christian Lohmaier 
AuthorDate: Thu May 23 13:30:24 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Thu May 23 13:30:24 2024 +0200

Update git submodules

* Update translations from branch 'master'
  to b46612b5cf30742f137cc685ff3bb75b42a75619
  - update translations for master

and force-fix errors using pocheck

Change-Id: I062d883de199aa7dd9015d72f519e190614c6d86

diff --git a/translations b/translations
index fa6c5405a769..b46612b5cf30 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fa6c5405a7696a8b954d555a8373058fb4853bd1
+Subproject commit b46612b5cf30742f137cc685ff3bb75b42a75619

translations.git: Changes to 'refs/tags/libreoffice-24.2.4.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier 
 at 2024-05-21 19:32 +

Tag libreoffice-24.2.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9r4ACgkQ9DSh76/u
rqOwWg//anE0dmH5q9xr7vo2jDL0l5LwFx8O8odVzUv8D0o88/0MV/BdGhIy4c9l
sbNLDr9BzK/IYcsLjwZWpN0YdGRgcL5lE+ApTLEBG7cGELTd8SfOIm3nAL1taDsL
N3lYwotRUKmoqOnVcsOCwZnJ3Qqugg2EXBh+JC9kaXS7cPVne6lti+Lqp+/2nUma
hMnlg1LK4nHEcCihmQQvkFogv+nknH4mY1bnqHbKpdAALOSoiA3qCZq0IpE5qI2g
zd8fHQUpZuSyejvxxybRIdvCEAAZTzl/y3tC7SvXgnkiYmIs6XcRb8Pfr+HI11QC
DhbIDwlpOWTVyusx+rr5R6s5CEAUo1OUOOMzjzWcGnDEI1Ufq67adtqFCFFP6Gi5
xKjkfT9Fk2oyw4kvbWsNdixyfd5NUy1VZlEJNq14CuCZF7dDYsjxCmbMK+WXcnYI
RzaqWakbwD/QGtkaFrOKQF/hop7BkhyzqZ/gKV1+WNYUNz60PAIhW+BqZQksUexx
tx5v6TUNkST+QEncVvCiHbl59YGPHdL7ar0FuAtQXT5JvfvdNtfSs5uQGf28rMbP
3ribxN1ATWuag4LjoYoKd8dvL8td2LJOvIoZauLKPA6jSDoUtv73OmrRGa5LSoJY
82iMcK9XErJUXCH4R3oNncPz8OUFQ2rpCO965BM/9eadajU5AGY=
=iYuy
-END PGP SIGNATURE-

Changes since cp-24.04.0-1-10:
---
 0 files changed
---

help.git: Changes to 'refs/tags/libreoffice-24.2.4.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier 
 at 2024-05-21 19:32 +

Tag libreoffice-24.2.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9r4ACgkQ9DSh76/u
rqODgw/7B1Sz61JzCNbUdpVA25HyFPr+1KsDOpKdt1XHfJxs9fKBtCErkuuRe+8s
cTu67IpuSjclHVeHmmZJh54PpSFU98y9YyBIIZV6PCSQfc2XYS24XMwSSBQmUPZU
iTz/B5BlelbcebeLWr8ADtfsj2OxKs2jOhEm91Gh0eCiN7ynXBnwwnQ1PzFK9bCg
eSOfX07UonBvhClGlliexQ5UO7RLjcjJrSrtS5qwe2jlbGOlN6wmaAHnu+0S2IF2
8MFngnlc5HBG2dcZyitoQsZeylYKiYXiJcMESJ3G+cgwxiBl+QAYOzYQAjEZhrz+
PSx+xOD4FRwk5XZbhwb5rBbH0o9esW2ZbmImfPHCORhr+6hF4UYslvK6KN9BWcLF
avSfyR4Qapx+m1CT9xQCwYdr8ZXf6qnfs7Fpmyt7PTrLFN8sC+Ibk/pikMudxK0B
Zy7jpAoz/0CRwsEFh4cRDVmKuRLaRLIE8zEtQjFDSl1v6vHvEGVcNZN5t49xEsyI
UzHc9ot/1G7cWncti4ePxBTPM8Fk7l/jUd8a5gQc3ddTDiVCDsGGQjMTsET8xwZN
4VAc1STWvnsYvR7BHIYa1Z9t1WYrDGHztfxcrL2quPK1LPlvhazxS9e81njNNa7y
Wd61M7ohiBwsi6pL3HP6r+cXsGpHR2r1T3Ap2wk5LOfwFI8wyRk=
=Bf/9
-END PGP SIGNATURE-

Changes since co-24.04-branch-point-15:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/libreoffice-24.2.4.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier 
 at 2024-05-21 19:32 +

Tag libreoffice-24.2.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9rsACgkQ9DSh76/u
rqMTHg//fKbqOU7Gk9CyUhQaYIPxg/q+Wo1Ak7sI6Q39pJWsCCAKu6TDEDgcJHN4
e5tQ5pgayt6dxUyl1QBZ8pxQ71SuBByIRNV/JFbKtOuK/i0mT92aZepiHEuye+vs
+rZ78UK+aDPgRBjbu2k6CtBpmDalGXl+CaU8xCG4UFuaSqiErx+EIERA3f9DiCqm
fbB3Uw/JUVTEJnhNNJC60GJzCnGfn1RUWscsJfVmHxODL3Q5YCJbVzVN4kog2aPA
gZo/BZihp9JfRKg1NL/HH9CdA4Z5QOHggGnox+x3GLOpSZOvJwOdgERq2s8m0RjO
1lG8aebrSESxLPy1GI3veYwvvBpVbUVKvMvhmg3OkGis9XtSXF+jfWs6ysDXq6Nh
za/1Bi/tRviqTTIIh9O9AkD59diTR5SntjMBO1iDGa+MaaNx1fgARm1cXB2CU+V2
+ySMckS1D4X3xEk7UlZh636aCsmGb9GZ67r2fA01sRMfLjBA6YwHCKL80ljijuuk
nOBCS9XkL5GVROU1FAhv2BqZHoXighkMLPPdF1eL16CCNKUbheSYZLSV+Il9tCEm
LhY5R28PowpRlyZXW10VsINbdEmwP5Vw3QXrbNOFlU1gAp3BPDzdvGzQ1xiN4urK
7ITA9nOTY4dkLO0HonEorhGeKN0Jaxn7ux+Q6jD4D5ihmF2sr3I=
=/oB+
-END PGP SIGNATURE-

Changes since cp-24.04.1-2-5:
---
 0 files changed
---

core.git: Changes to 'refs/tags/libreoffice-24.2.4.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier 
 at 2024-05-21 19:32 +

Tag libreoffice-24.2.4.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9r4ACgkQ9DSh76/u
rqNA9RAA0nvF7TZQ4RPhnuMJXIKHwhrVdPwXLsho9eqxdWVOIajlSKWeVybl02Dp
7HVDSsdf5T3NyMKLJUFoFcGos032UkYuuZrflB7g/t71QzJZ5zYuIJ2jHhsugvcl
Hy4S1qlXg4v1Dz82WJ84eeYKBzWei2g3RnmwvnZECxJKfNAGeS21bN+xRbFGkham
sHddwXwobzjNU8FFzYHG0pG04WUqUtkiNK2QsqPsb8alVPTRxv4DfR1qa36gmPO+
OvlPJd31s1gdMQCAxGjhycxo2Tx9MXfXuVURjsxRcpjx0XdSkr3YA2jwACJ1D8FW
6eAzb+CUsI+8GVIFuhgkW3BQMwDDJ+1TXoX8qPvNbQgpGBd+TFmn7H8f1SU530QF
ZcoXgQVxpMHkdOgXFHggd+NdrNDBtZa0AftWX52EieYboJsXaN7L9y624MgJIGiF
Nz+2rjA9POFVxRQIR5o/7EbrejVPASLq6322u3rQ+yIuxa534vU0ynJlm34t6kys
UYI6hsD6AmhC0A1/6m+qXgWQNQuq6/fVv4H5T02PL/lz+hNgRW4cZmlJEFSwPnvq
Pt8oyajieiexsWdqsxCSX+oPxKaOtqvuaa2UBJN3tQm2tQHGTVM0y/0seecCVCPB
0XYzbbTLXcMRimMIMuAaonnYUWOgxcRQ4mWUxJDKQLLxDKXHZJY=
=cimD
-END PGP SIGNATURE-

Changes since co-24.04-branch-point-572:
---
 0 files changed
---

core.git: Branch 'libreoffice-24-2-4' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7fbc89b67189455afaf5681f33db07daf06c28f
Author: Christian Lohmaier 
AuthorDate: Tue May 21 21:32:40 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 21 21:32:40 2024 +0200

bump product version to 24.2.4.1.0+

Change-Id: If9eeaf1eda12619f68d468927a6ba275a05e60e9

diff --git a/configure.ac b/configure.ac
index a435fdc89a1e..8fc5f88de3c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.2.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.4.1.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-24-2' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbf052d967d2c7e920a58e47d3351dc7d3a61121
Author: Christian Lohmaier 
AuthorDate: Tue May 21 21:30:01 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 21 21:30:01 2024 +0200

bump product version to 24.2.5.0.0+

Change-Id: I5885efdf31ee6b8121e098b2fb7024f1c0b9dee4

diff --git a/configure.ac b/configure.ac
index a435fdc89a1e..79373cd08b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.2.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.5.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Changes to 'libreoffice-24-2-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-24-2-4' available with the following commits:
commit 44988e22d7e035f4d6c32edf068512bb06e52f4a
Author: Christian Lohmaier 
Date:   Tue May 21 21:29:22 2024 +0200

Branch libreoffice-24-2-4

This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.2.x release,
please use the 'libreoffice-24-2' branch.

If you want to build something cool, unstable, and risky, use master.

translations.git: Changes to 'libreoffice-24-2-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-24-2-4' available with the following commits:
commit 788f33aa5169aa152f1628a8007e0cd3aa7d2ea2
Author: Christian Lohmaier 
Date:   Tue May 21 21:29:05 2024 +0200

Branch libreoffice-24-2-4

This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.2.x release,
please use the 'libreoffice-24-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic114b70832c57c1f3e7de0740423eef9aef8aaba

help.git: Changes to 'libreoffice-24-2-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-24-2-4' available with the following commits:
commit 9428eb8af362dfb31d0b2285734bf34af41a5d84
Author: Christian Lohmaier 
Date:   Tue May 21 21:29:05 2024 +0200

Branch libreoffice-24-2-4

This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.2.x release,
please use the 'libreoffice-24-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I6d693e6cac1747e20011b143e8c9cf9f3cadb5cd

dictionaries.git: Changes to 'libreoffice-24-2-4'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-24-2-4' available with the following commits:
commit 60391ddd98f7d3b209bf4a2b0509dbbff81a5fbc
Author: Christian Lohmaier 
Date:   Tue May 21 21:29:05 2024 +0200

Branch libreoffice-24-2-4

This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 24.2.x release,
please use the 'libreoffice-24-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I7c64976d624edbde4138c6abf8de5a3b4471d40c

core.git: Branch 'libreoffice-24-2' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit df5c3afef80d99213e48f5d78228b684e69216ee
Author: Christian Lohmaier 
AuthorDate: Tue May 21 21:23:07 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 21 21:23:07 2024 +0200

Update git submodules

* Update translations from branch 'libreoffice-24-2'
  to 5569d097c4619640613e373a9d494e380ecf564e
  - update translations for 24.2.4 rc1

and force-fix errors using pocheck

Change-Id: I33b8c9512615cb5d058159e40785d20255b645df

diff --git a/translations b/translations
index 64792214d2d8..5569d097c461 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 64792214d2d89afc019f94ca29ff7a2c2a17ab39
+Subproject commit 5569d097c4619640613e373a9d494e380ecf564e

translations.git: Branch 'libreoffice-24-2' - source/ab source/an source/ast source/bg source/ca source/cs source/da source/de source/es source/fa source/fi source/gl source/gug source/he source/hsb s

[Christian Lohmaier (via logerrit)]

 source/ab/connectivity/messages.po 
|6 
 source/an/cui/messages.po  
|5 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  
|8 
 source/an/reportdesign/messages.po 
|6 
 source/an/sc/messages.po   
|   57 
 source/an/sw/messages.po   
|   35 
 source/ast/connectivity/messages.po
|4 
 source/ast/cui/messages.po 
|   10 
 source/ast/editeng/messages.po 
|4 
 source/ast/extensions/messages.po  
|   12 
 source/ast/extras/source/autocorr/emoji.po 
|   43 
 source/ast/filter/messages.po  
|8 
 source/ast/helpcontent2/source/text/sbasic/guide.po
|6 
 source/ast/helpcontent2/source/text/sbasic/shared.po   
|   18 
 source/ast/helpcontent2/source/text/sbasic/shared/02.po
|6 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po
|4 
 source/ast/helpcontent2/source/text/scalc/00.po
|   10 
 source/ast/helpcontent2/source/text/scalc/01.po
|   10 
 source/ast/helpcontent2/source/text/scalc/04.po
|4 
 source/ast/helpcontent2/source/text/scalc/guide.po 
|6 
 source/ast/helpcontent2/source/text/sdatabase.po   
|8 
 source/ast/helpcontent2/source/text/shared.po  
|   12 
 source/ast/helpcontent2/source/text/shared/00.po   
|   58 
 source/ast/helpcontent2/source/text/shared/01.po   
|   14 
 source/ast/helpcontent2/source/text/shared/02.po   
|   16 
 source/ast/helpcontent2/source/text/shared/06.po   
|4 
 source/ast/helpcontent2/source/text/shared/autopi.po   
|4 
 source/ast/helpcontent2/source/text/shared/guide.po
|6 
 source/ast/helpcontent2/source/text/shared/optionen.po 
|4 
 source/ast/helpcontent2/source/text/simpress/00.po 
|8 
 source/ast/helpcontent2/source/text/swriter.po 
|4 
 source/ast/helpcontent2/source/text/swriter/00.po  
|   40 
 source/ast/helpcontent2/source/text/swriter/01.po  
|   12 
 source/ast/helpcontent2/source/text/swriter/02.po  
|4 
 source/ast/helpcontent2/source/text/swriter/guide.po   
|4 
 source/ast/helpcontent2/source/text/swriter/librelogo.po   
|4 
 source/ast/helpcontent2/source/text/swriter/menu.po
|   10 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po 
|   18 
 source/ast/sc/messages.po  
|   10 
 source/ast/sd/messages.po  
|   10 
 source/ast/sw/messages.po  
|   10 
 source/ast/wizards/source/resources.po 
|4 
 source/bg/cui/messages.po  
|4 
 source/bg/helpcontent2/source/auxiliary.po 
|8 
 source/bg/helpcontent2/source/text/sbasic/shared/03.po 
|   26 
 source/bg/helpcontent2/source/text/scalc.po
|4 
 source/bg/helpcontent2/source/text/scalc/00.po 
|   20 
 source/bg/helpcontent2/source/text/scalc/01.po 
|  114 
 source/bg/helpcontent2/source/text/scalc/04.po 
|6 
 source/bg/helpcontent2/source/text/scalc/guide.po  
|  116 
 source/bg/helpcontent2/source/text/shared/00.po
|4 
 source/bg/helpcontent2/source/text/shared/01.po
|6 
 source/bg/helpcontent2/source/text/shared/optionen.po  
|8 
 source/bg/helpcontent2/source/text/simpress/01.po  
|4 
 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po  
|   20 
 source/bg/sc/messages.po   
|   88 
 

translations.git: Changes to 'refs/tags/cp-24.04.3-1'

[Christian Lohmaier (via logerrit)]

Tag 'cp-24.04.3-1' created by Andras Timar  at 
2024-05-21 14:43 +

cp-24.04.3-1

Changes since cp-24.04.1-2-1:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier 
 at 2024-05-14 17:38 +

Tag libreoffice-24.8.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXkACgkQ9DSh76/u
rqOryg//byaBxnOqm4H2bEYmXiClrvMRqeJ55RC/NPsG4ppmvEjtvF3VSQ/iBawy
idIWmxgZfPQFc8Xe6Ql8BKCnBaE9vATV03GGeFY90AqgmTrcdQkXWgujgHhW2fVE
9ZUD710X8cO5vKOtB4+3AWFbQi2XnQ+AtHSOmzYSN8yAoghiNtYs8uz8DCUB5pGg
bOtWAP7svPeV9i7/VetGEZu6qGqrW4QE+xyyTj6flZ75uaNqjPh//ZzaEV4/HfTM
KQ1Vx9edPOXryvCWXMUJYK+ZtOlqVTRmNV3ZyJFpkHxpp/ogJEclmxreiQbt/cVe
SsdxK+68gshqGQL0/0n55VIkNP6MyyFIpvx6twy/rlDAfSu9wbrVDdxdq8FrAT7J
a0SgCdPXSRCcKY+g14uWjWuhQ3qhtK3QOZj5IayoKE+N0Q+A6K4gywWxwkXuKF4J
WSFjbVkjL1r2mZKFbNyrY1qZFGIaGUu6tRlpfpwDyYAuPHJzfnLmxt4iiYXmeUR2
f54llKFcIWfm5FWXBJhecd/+hspy6M6n1jN0lFtOJ27tXXo7c+x7HIxnZH7/Yr3S
e1OrXjUdZF6CRmWI0vulUmffCksIPjo64muX8v/Uw04yFhtgM6tImUVSrtAAWvSW
BlSnG6VEL+ijsxm62cpC71OScFEQae8Nwd6u4lYkR2yZsH/9ez8=
=HWrU
-END PGP SIGNATURE-

Changes since libreoffice-24-2-branch-point-26:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier 
 at 2024-05-14 17:37 +

Tag libreoffice-24.8.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXYACgkQ9DSh76/u
rqOiAg//ZHkdHcDnMnftNM/uIUgCNaoo4sgWTXtPbspBHWmIRjqY7JTxDsMWGpuF
DBXKz2FNdDPwBDRD/gMffXuJkJxqjYuO/0G/ESC8cF812JH2HXJlusXb+nM4YE1i
LV8SGw8unt6fINFWYcOATf8mwLjo3ENI7ZbUhK1fKQi9HiV11wo1R4+rneu98Dfm
MnI3+YPcyCkrg9hGuGz3AoLEt81qx1ys7oRMBAaCG2izM6BfG9HfMcdxbNDwkoTO
mmFYlZkmnmjEduxhD7oz4BchZ/Q1O7S/XYb+a3yzRsl34d5n0kiWQIbLoPK46Mmm
4hf0nzYIhHtPe8+8QSOX6acLC2fIyj1aq0rKiELo7Ni61JxcV4tkbrHvU3UGBQnb
lzElvAUUMLtgtEcgFrPS31UDMNIcheAe+UG800iocaV02jKq5K8NMGeWKXnFH+Kl
N+W95J5c1LW65K9AkJCQrg1yRig6+ODcpceZMV4sEvUn4wWDw//dTtDQsuUxB8qg
Z1ttOFpYfoCiHbP5giEcNEv5CibNRmRznLbFTkUvoc1sJherzWgMwPxi1o5yJq4P
r5mKjFz+tzL58fcDOkyHvbJU2jKpQnehtj83tnszXBEqL4ju5iGnM9OH8khS5nIt
kXtnxQsgvY24RYGcFooJHMsqE8nrihKXUDuyCuaQ4YmgCoO6hSE=
=FQJH
-END PGP SIGNATURE-

Changes since libreoffice-24-2-branch-point-11:
---
 0 files changed
---

help.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier 
 at 2024-05-14 17:38 +

Tag libreoffice-24.8.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXkACgkQ9DSh76/u
rqP9ng//TZDIRc4h6CzwrE7rRdwRihr+r5zw1HoudrB/wwozt3CdroK2CQhJ/ZlC
NQvA4UWbtfzb1OgRkaNo8OTv+MDOwovdMfDHYQidxo7nmtBNWIXHSGg48BFNl1QG
KqJXfyghBI/Gquim9yGpUkxOP3d/+Mk9+zTF1XRxsKFtw1pc4ktTPVhFrjK232Du
5Kmq/b+8h/TrfCTqwxHZVsLZDyAdHmq1NgPn0igPHt1HPLisyWkLwGcpcIeDV6E0
SRLOu6RDJIB4A+7hJyRFUTRCIJu35dw1rrMqVblEUWvGAlR9ojfPTRN8zQjDhlwx
5EozwJAaKcEYt/OieZPdUwErhlJsxMjocuK0JnzK3NsT1xsn/Nx9WY404RX/dTXl
HhVO0vZakJAszLPv6inHWCdcZs1bYaMhAPtTXEqGibPest3Ld+EySsRuCCeiPpk0
ip+mqcoSB3nQ2LnJ6U5Y2SrP1a8bNmgMxAWrSxf5qebiX8OqqwPVUjMMJ3RTlVPx
VQki63Xi57g3N43ewsiR9C1Rfezgp+rc+07xgCm3VazuFgc6FXITCJ6AaxBDAbS9
xCV19sNNOGfe4D0BApAVaGclQOz3lIjE2RhHkxQpD6k/8mIOuwVQ57cu24zy8vQ9
7kwXMVPMwkegO68w2eCHGAvbcRLJ5i18l1J8t1BtvuVzqJGU6Uc=
=zm+a
-END PGP SIGNATURE-

Changes since libreoffice-24-2-branch-point-230:
---
 0 files changed
---

core.git: configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6c9cb470e2786ada58b7ba401975375239b610b
Author: Christian Lohmaier 
AuthorDate: Tue May 14 19:38:30 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 14 19:38:30 2024 +0200

bump product version to 24.8.0.0.alpha1+

Change-Id: I96d168560db02ea3cad2eb3e428e1d17bc8d10d6

diff --git a/configure.ac b/configure.ac
index b27504e56dac..815900fc21ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.8.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.8.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier 
 at 2024-05-14 17:38 +

Tag libreoffice-24.8.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXkACgkQ9DSh76/u
rqPxLQ//b3eKJgH8lr7yHgN+92dGLsHHZ9Nl4d591S0aGo/Owy62vD/FrW5BNudL
Y6direc/hVsCJspjRCckpT+nehEesLQ5O0r2jCdomsplnz6zTZo8+r9Ql9l/jByZ
kIqDAFS7YJYtLkWorTbOvwQzVtN+498YYE5iTZINrG1P/Wd8gclpySUkG2QOkCLA
lAr3GFRrbLmbLt8jQ27pbjIVqQUZk1S7+N7G73iTNP4PKGhRSjCPidG71ojUc4Qj
wBKKOZvc1j2Rr96Wwg5d33CqJ9rvjz2eN6HDw+nX7Y4zdwNk2efjUY2dJihkx+xW
zQJmZawD5ZMxZadSxb8LK1whqmUaMEuc75whSATDXDSERgXf5kor4ahDoctuRovW
5asbL7Yl323keG6wyKFy5nZZYvd6njrCZosF0keVBF7FNxQCcfchLi3H1b4nSGhd
8Xphl+dbPj4Hc2NEpk/ZR1wNR6+Y1dl4AMWP6r0ID5peSk94dwWkkcB2HaasMdHp
lE4VhYsify2jvsQb61tI7r1Yb1odhGh/rD9rVwk0RqHXLl3HJfK6HH2w5QKAkidK
9ZY1eD/wSaCb4RMZwZHdUPDI/CI3zbpIgMxPFL50+yCmdXY+ML8CjQLGUJvwfvx5
Z7P/eFAOhSTvGGzJNUCtFtd6R1aJkogyoAmRTYNvYO5i6ts3HtE=
=577j
-END PGP SIGNATURE-

Changes since libreoffice-24-2-branch-point-4447:
---
 0 files changed
---

core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 0a2d308343314423fa60188a54c289cef44e43a3
Author: Christian Lohmaier 
AuthorDate: Tue May 14 19:31:56 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 14 19:31:56 2024 +0200

Update git submodules

* Update translations from branch 'master'
  to fa6c5405a7696a8b954d555a8373058fb4853bd1
  - update translations for master

and force-fix errors using pocheck

Change-Id: I40dc7118de79bc8c73cc06ead82fdf936e132ad3

diff --git a/translations b/translations
index b824b552da5c..fa6c5405a769 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b824b552da5c054dd35568e86266afd1cf539441
+Subproject commit fa6c5405a7696a8b954d555a8373058fb4853bd1

core.git: config_host.mk.in

[Christian Lohmaier (via logerrit)]

 config_host.mk.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51a970b8b0c8f8d5e8d33cd50c88930be3a653d8
Author: Christian Lohmaier 
AuthorDate: Wed May 8 14:35:11 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 10 18:21:55 2024 +0200

make sure KEEP_AWAKE_CMD gets only evaluated once

if using deferred evaluation then the creation of targets via $(call
gb_Top_GbuildModuleRules,foo) would result in it getting processed over
900 times, and on windows spawning a shell with the two ps and awk
command that takes 5 minutes.

If future commands need to be run when the rule is run, then an
alternative is to escape the variable in the define for the
gb_Top_GbuildModuleRules macro via double-$ → $$(KEEP_AWAKE_CMD) - but I
cannot think of any method where that should be necessary

Change-Id: I126e4d317bd77f359ca9f39adf00cc88846af281
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167351
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/config_host.mk.in b/config_host.mk.in
index 3ffe88380180..fe1fb546a6d1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -790,7 +790,7 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk
 # does use some of the variables defined above
 include @SRC_ROOT@/download.lst
 
-KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@
+KEEP_AWAKE_CMD:=@KEEP_AWAKE_CMD@
 
 # used for WSL-as-helper-builds where the build runs from within git-bash/MSYS 
that otherwise would
 # mess with anything that looks like a path (starts with a /) but cannot be 
resolved to a target

translations.git: Changes to 'refs/tags/libreoffice-7.6.7.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier 
 at 2024-05-07 17:55 +

Tag libreoffice-7.6.7.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6aw0ACgkQ9DSh76/u
rqMyuA/9E1LwMh39ZQwWBvjU1o+hNdPsCtQPA8vrsxwCGvefu9aqykLlyUWaFuPY
FctsgFIpkmaNIOUFT0wRjEQCr1wb5ZTkQuV8j0xvxvIO5qKIssN/sbZzFC0J9cJ0
UKxChKOanQ8gRiiWmEpTiKmmiiaZiZrsZobFQMFhs0IEzdZR/x4FNjDIOuyopbJJ
MViGdFKLU+xEXoOvShwvkzUnmoepVe5a4H+EfZZcyuCJCB4dfXX99Onzfoo7Iv0x
8VyVgzif2yVQ4JEdj1slcvB/1G8NsVA6HLJIjjQW11y+g58i8bUrLqhBYaEzAYNA
fqJ2mCPUFFLwrDHS8bXrJ0w2bnjqTZoOfQOR7EsfSiEkKXMN1dYF+SM8x/X7MPme
U/hNQLMzY3flexqjNNvGUTnbXsqtAzrwD9jRQxmCmLRF+8LnjBP9G25Wm2HdS2C4
fyIfsPeKLw4HMa/oQnTotNkDveRkaGyOOnA7towMko7XcXEpjHERXPT+oa+9u9T3
+Iww22Wr+44QCe323friRqbYAEUOa7w29rMW83cvhIhbDlIZ60o3Gg9MKfZrWYu9
qzXoKTiNPDh0RcDJ9+yBC3b3otBt1qwAGWjFoAs0nUGsoppLc75aK0Gyiu73b/yN
kzIvT1wqta6/eFwar6VZV1ZAr0eijwk913uIznVkrB4MqlkLuGA=
=L0m6
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-35:
---
 0 files changed
---

help.git: Changes to 'refs/tags/libreoffice-7.6.7.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier 
 at 2024-05-07 17:55 +

Tag libreoffice-7.6.7.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6aw0ACgkQ9DSh76/u
rqNH4g//bxJJRFpSasRjZKFM9dC6Fls/Gk/MBcbuctHVjBJU/oLQkY3ryUVWG1cD
pzrtxU+rCZHlqGpJLGfZw7V1K8WCouTpxwUjN9AOfphqYt0ayCwu52hi2Z2cxTPv
XQYNwjbtc+cawnQLyyxx0qFQtOoW1+6Xg4rMy5XYzchoQPxqQw5A+xXF9jbFpjPx
FttEiloUOJ0CEj25oY/iYzPHGNibn6DF9zkrHQZj27MkKXSUZZo+OICEZjCf1iIW
cHlEe/hk88YiwpuTbldFmWmaB6modCmKqHFkiXBEM9YMj29oLQ81e0Fwa0yyAfAc
EFpHWOUykyu+RDORnyDqnnPXkxma/OLmc+JkusATpUXVEdISM07X2ikcdnrGQA2C
aC92qxPcNb1h8JAdfx0c+qYBU0VLcVYY65/+mpory6OggArbeyMmPuKYTTh1PC4w
QHKrf7A3K9Hf+9pOpNnKw8HSG8Hk8cNztmQljBUPkhPa2gBE6oN+hTNKz5EJuNDF
elroMfWVwD5h70p9rxFeF9YQJPBL1pB/TQHw1M8zMDIVaENnS8F23KlJzslix0Zd
x8x6CJ32N7r/VHZGk3QIMgn4OntFfhX0dZ7i5m52Sj7Px3DAtLq+J+MGoCYFFd/9
o9d052soDb34iEt1PRfIvpdzjnYvRONPXAV38D2iOEq+LxQSuHA=
=SOBh
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-37:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/libreoffice-7.6.7.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier 
 at 2024-05-07 17:55 +

Tag libreoffice-7.6.7.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6awoACgkQ9DSh76/u
rqOuzBAAl5YgYHgUbyXiNhvz+B2O7VYcENrEJJpkQgogC8xHnNQ2VABsXyJ1teRd
PbeLf3e+J08/ginYEYTGFmWHRJILDqkEl1giXQSMTbVeVU9f7dp2ONTRp6R2qkos
DMkPR2MzMrA34Ln8AgBVBQRB4cEDlVFqduWX8x/Zomesi6lw5PwrSydpa16wfNfL
xW+ZWDL9MiURtwqgB6SqWy9TbCe8UDYvIdpA3wV3WbtlDMczJ9RxpjxhoDuvWvVF
gLncOQyRNmbMAETyww6zNRAJWF8MHVXzfjeWQbG2fBoxVmyYq89XpyvLnNQO+Eu5
+vFrG8xvdrwizFdHgVcMDIw4Ob8/jHmj5FGfMVwr/hIsK09AjFAWHpplYGWgYSZ5
Xvc5M24GQhOtnLlrObUZ4U+NeXyRap2V6OlV2NQIMqvbjFVJhfcKabuu1uZefWd4
zEhZngY+k4HyJEf5RS50XfOW3CAZVgyP8ZRmh04Ts/E94GrfvQqF4TvG/rW6ESUi
0zrnoiJrv/x6s4CWDBXsuQwsr+zR4P1w9cM6BstAr3EhYVZbR/DUKGTRj8VylVsG
eoW9HCDnQaRDpihpVjEM5H+NvqrWHdu/+0sQpgQntOx0R/r5zGGn2dniAdZbeBEZ
RZiZxJLN8PWDDKfLECYIK3b+tnlnusb/SkmZbXBjgXNCuGgoLzM=
=JZus
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-9:
---
 0 files changed
---

core.git: Changes to 'refs/tags/libreoffice-7.6.7.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier 
 at 2024-05-07 17:55 +

Tag libreoffice-7.6.7.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6aw0ACgkQ9DSh76/u
rqNeeg//ai2fGoYlbnkQp0eORGo+iV5LnEJiia5uqU1Y4gPrt5e5HrzPYb8zeg7n
V39TTgTGfiTNP11+xS2L9jReH8zm+hhqvlsjcPTqBntOv2kVMwSc4/aaGYNQzn0d
8Bf2BZgo/Vc2ZyTm+BzQe+H+IY2a1hwslSgn9LlYM8EzAopwkAWPlKAsShU5C9iV
90XN1QT9DAFd4f+pkuyDAttOG0kXmO9WLjzj7leC3JH1wcRkhzUR5QZLTJB2erHq
Cw5VlN5N42f/gM765+tWFj0X7aTrYgmbMlB1S4GufdBmYKE2gdEpxCQlrBqTMl/P
G4gdoxzAqsBqmdmbt5KcnHdI6125P5HvVVeu56r2lSP4+jlkoRbZGqBfReklmEzk
iWrx6a16WgNEW5jXC8WQMiwvjFV/NSpWOtJVt1vWfEKFkcE/ks2o2f0YnxclEANy
vCEmer/qV4jpuyEBTDyADZ63SzhKrFBznUsfcOKrJ+gPZ56nbkCnVcT3ZqBOoCVT
lof+lAbg4oXTLwmNbKSQ887OxD0W6Bf5Ez9fHUJtJe5UeKCx3PzStOmKlze//90q
OnpsNxELxCrtl+XB1YwnpGffKXvVJ1kdnp5fG/etl7jE2dgLh64aMegahDoLAiCK
lOPeQIhxClY2Cn05UxeFYH1lv275vbf1gQw/glP6sGFSvcMAp0g=
=m/8w
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-1342:
---
 0 files changed
---

core.git: Branch 'libreoffice-7-6-7' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 480669aeffdc481c18ae7180a38d5062cf44e6bf
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:55:45 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 19:55:45 2024 +0200

bump product version to 7.6.7.2.0+

Change-Id: I0911f9096a7f883b6758e12991674e51a4854253

diff --git a/configure.ac b/configure.ac
index 555486903c06..af66ab54cdd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.6.7.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.7.2.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Branch 'libreoffice-7-6-7' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 2b3b0b061502510a9ac39dfb413d055f8cf0b68e
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:42:58 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 7 19:42:58 2024 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-6-7'
  to 8999e292deb14538ab51b298d0ceca0cc863553b
  - update translations for 7.6.7 rc2

and force-fix errors using pocheck

Change-Id: If3cf78a036f5575eb3f433e414dda1c39a6fdaf8
(cherry picked from commit d0bb46f277349b8b379b46edd2d56b67496b6cb8)

diff --git a/translations b/translations
index 6c5d82ebf2be..8999e292deb1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6c5d82ebf2be560ac8678088ab4b0a27951d8c60
+Subproject commit 8999e292deb14538ab51b298d0ceca0cc863553b

translations.git: Branch 'libreoffice-7-6-7' - source/ab source/an source/ast source/bg source/ca source/da source/de source/es source/fi source/gug source/hr source/hsb source/it source/ja source/ka

[Christian Lohmaier (via logerrit)]

 source/ab/connectivity/messages.po 
|6 
 source/ab/filter/messages.po   
|8 
 source/an/cui/messages.po  
|8 
 source/an/reportdesign/messages.po 
|6 
 source/an/sw/messages.po   
|4 
 source/ast/connectivity/messages.po
|4 
 source/ast/cui/messages.po 
|   18 
 source/ast/dbaccess/messages.po
|8 
 source/ast/extensions/messages.po  
|   51 
 source/ast/extras/source/autocorr/emoji.po 
|  182 
 source/ast/filter/messages.po  
|6 
 source/ast/helpcontent2/source/text/sbasic/shared.po   
|8 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po
|4 
 source/ast/helpcontent2/source/text/scalc/00.po
|   12 
 source/ast/helpcontent2/source/text/scalc/01.po
|   34 
 source/ast/helpcontent2/source/text/scalc/04.po
|4 
 source/ast/helpcontent2/source/text/scalc/guide.po 
|   14 
 source/ast/helpcontent2/source/text/sdatabase.po   
|   30 
 source/ast/helpcontent2/source/text/sdraw/00.po
|8 
 source/ast/helpcontent2/source/text/shared.po  
|6 
 source/ast/helpcontent2/source/text/shared/00.po   
|   12 
 source/ast/helpcontent2/source/text/shared/01.po   
|   44 
 source/ast/helpcontent2/source/text/shared/02.po   
|4 
 source/ast/helpcontent2/source/text/shared/04.po   
|6 
 source/ast/helpcontent2/source/text/shared/06.po   
|4 
 source/ast/helpcontent2/source/text/shared/autopi.po   
|   10 
 source/ast/helpcontent2/source/text/shared/guide.po
|   14 
 source/ast/helpcontent2/source/text/simpress.po
|4 
 source/ast/helpcontent2/source/text/simpress/00.po 
|4 
 source/ast/helpcontent2/source/text/simpress/01.po 
|4 
 source/ast/helpcontent2/source/text/simpress/guide.po  
|6 
 source/ast/helpcontent2/source/text/smath/00.po
|4 
 source/ast/helpcontent2/source/text/swriter.po 
|4 
 source/ast/helpcontent2/source/text/swriter/00.po  
|6 
 source/ast/helpcontent2/source/text/swriter/01.po  
|4 
 source/ast/helpcontent2/source/text/swriter/guide.po   
|4 
 source/ast/helpcontent2/source/text/swriter/menu.po
|8 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po 
|   43 
 source/ast/reportdesign/messages.po
|6 
 source/ast/sc/messages.po  
|   13 
 source/ast/sd/messages.po  
|5 
 source/ast/svx/messages.po 
|8 
 source/ast/wizards/source/resources.po 
|6 
 source/bg/cui/messages.po  
|6 
 source/bg/helpcontent2/source/text/sbasic/shared.po
|4 
 source/bg/helpcontent2/source/text/scalc/00.po 
|4 
 source/bg/helpcontent2/source/text/scalc/01.po 
|6 
 source/bg/helpcontent2/source/text/scalc/guide.po  
|   14 
 source/bg/helpcontent2/source/text/shared/02.po
|4 
 source/bg/helpcontent2/source/text/shared/04.po
|   12 
 source/bg/helpcontent2/source/text/shared/optionen.po  
|8 
 source/bg/sc/messages.po   
|   18 
 source/bg/sw/messages.po   
|   10 
 source/bg/xmlsecurity/messages.po  
|   12 
 source/ca/connectivity/messages.po 
|   10 
 source/ca/dbaccess/messages.po 
|4 
 

core.git: Branch 'libreoffice-7-6' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit d42003bbab268f8ea4e0da40326d0f26c72a3939
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:40:56 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 7 19:40:56 2024 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-6'
  to d0bb46f277349b8b379b46edd2d56b67496b6cb8
  - update translations for 7.6.7 rc2

and force-fix errors using pocheck

Change-Id: If3cf78a036f5575eb3f433e414dda1c39a6fdaf8

diff --git a/translations b/translations
index f33641b61868..d0bb46f27734 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f33641b618682a4cac0c330f341a80bbdfbf0a02
+Subproject commit d0bb46f277349b8b379b46edd2d56b67496b6cb8

translations.git: Branch 'libreoffice-7-6' - source/ab source/an source/ast source/bg source/ca source/da source/de source/es source/fi source/gug source/hr source/hsb source/it source/ja source/ka so

[Christian Lohmaier (via logerrit)]

 source/ab/connectivity/messages.po 
|6 
 source/ab/filter/messages.po   
|8 
 source/an/cui/messages.po  
|8 
 source/an/reportdesign/messages.po 
|6 
 source/an/sw/messages.po   
|4 
 source/ast/connectivity/messages.po
|4 
 source/ast/cui/messages.po 
|   18 
 source/ast/dbaccess/messages.po
|8 
 source/ast/extensions/messages.po  
|   51 
 source/ast/extras/source/autocorr/emoji.po 
|  182 
 source/ast/filter/messages.po  
|6 
 source/ast/helpcontent2/source/text/sbasic/shared.po   
|8 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po
|4 
 source/ast/helpcontent2/source/text/scalc/00.po
|   12 
 source/ast/helpcontent2/source/text/scalc/01.po
|   34 
 source/ast/helpcontent2/source/text/scalc/04.po
|4 
 source/ast/helpcontent2/source/text/scalc/guide.po 
|   14 
 source/ast/helpcontent2/source/text/sdatabase.po   
|   30 
 source/ast/helpcontent2/source/text/sdraw/00.po
|8 
 source/ast/helpcontent2/source/text/shared.po  
|6 
 source/ast/helpcontent2/source/text/shared/00.po   
|   12 
 source/ast/helpcontent2/source/text/shared/01.po   
|   44 
 source/ast/helpcontent2/source/text/shared/02.po   
|4 
 source/ast/helpcontent2/source/text/shared/04.po   
|6 
 source/ast/helpcontent2/source/text/shared/06.po   
|4 
 source/ast/helpcontent2/source/text/shared/autopi.po   
|   10 
 source/ast/helpcontent2/source/text/shared/guide.po
|   14 
 source/ast/helpcontent2/source/text/simpress.po
|4 
 source/ast/helpcontent2/source/text/simpress/00.po 
|4 
 source/ast/helpcontent2/source/text/simpress/01.po 
|4 
 source/ast/helpcontent2/source/text/simpress/guide.po  
|6 
 source/ast/helpcontent2/source/text/smath/00.po
|4 
 source/ast/helpcontent2/source/text/swriter.po 
|4 
 source/ast/helpcontent2/source/text/swriter/00.po  
|6 
 source/ast/helpcontent2/source/text/swriter/01.po  
|4 
 source/ast/helpcontent2/source/text/swriter/guide.po   
|4 
 source/ast/helpcontent2/source/text/swriter/menu.po
|8 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po 
|   43 
 source/ast/reportdesign/messages.po
|6 
 source/ast/sc/messages.po  
|   13 
 source/ast/sd/messages.po  
|5 
 source/ast/svx/messages.po 
|8 
 source/ast/wizards/source/resources.po 
|6 
 source/bg/cui/messages.po  
|6 
 source/bg/helpcontent2/source/text/sbasic/shared.po
|4 
 source/bg/helpcontent2/source/text/scalc/00.po 
|4 
 source/bg/helpcontent2/source/text/scalc/01.po 
|6 
 source/bg/helpcontent2/source/text/scalc/guide.po  
|   14 
 source/bg/helpcontent2/source/text/shared/02.po
|4 
 source/bg/helpcontent2/source/text/shared/04.po
|   12 
 source/bg/helpcontent2/source/text/shared/optionen.po  
|8 
 source/bg/sc/messages.po   
|   18 
 source/bg/sw/messages.po   
|   10 
 source/bg/xmlsecurity/messages.po  
|   12 
 source/ca/connectivity/messages.po 
|   10 
 source/ca/dbaccess/messages.po 
|4 
 

core.git: Branch 'libreoffice-7-6-7' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2026 ++--
 1 file changed, 1023 insertions(+), 1003 deletions(-)

New commits:
commit 4963c0c2a287b63e4cd92cbd441c7fcd336fa7ec
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:20:07 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 19:23:23 2024 +0200

update credits

Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6
(cherry picked from commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb)
(cherry picked from commit 1c3ae1f56fd04e954c5a6fc59bd6337dfc7ee8ea)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ec7d2eba89a9..c3d752e2232c 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   635
+   2360
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 635
+ 2360
  55667
- 27596
+ 29321
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13427930
+   13478728
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -370,7 +370,7 @@
  
  
   
-   
+   
   
   

@@ -381,12 +381,12 @@
   

   
-  
-   
-  
   

   
+  
+   
+  
   

   
@@ -448,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1163,20 +1163,20 @@


 Credits
-1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
+1971 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-05-07 16:01:41.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35426Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ 

core.git: Branch 'libreoffice-7-6' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2026 ++--
 1 file changed, 1023 insertions(+), 1003 deletions(-)

New commits:
commit 1c3ae1f56fd04e954c5a6fc59bd6337dfc7ee8ea
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:20:07 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 19:21:55 2024 +0200

update credits

Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6
(cherry picked from commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ec7d2eba89a9..c3d752e2232c 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   635
+   2360
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 635
+ 2360
  55667
- 27596
+ 29321
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13427930
+   13478728
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -370,7 +370,7 @@
  
  
   
-   
+   
   
   

@@ -381,12 +381,12 @@
   

   
-  
-   
-  
   

   
+  
+   
+  
   

   
@@ -448,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1163,20 +1163,20 @@


 Credits
-1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
+1971 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-05-07 16:01:41.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35426Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1193,15 +1193,15 @@
Vladimir 
GlazunovCommits: 25434Joined: 

core.git: Branch 'libreoffice-24-2' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2026 ++--
 1 file changed, 1023 insertions(+), 1003 deletions(-)

New commits:
commit 54586d9de58d4b971ef976bcce0df957141b0a50
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:20:07 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 19:21:23 2024 +0200

update credits

Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6
(cherry picked from commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ec7d2eba89a9..c3d752e2232c 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   635
+   2360
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 635
+ 2360
  55667
- 27596
+ 29321
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13427930
+   13478728
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -370,7 +370,7 @@
  
  
   
-   
+   
   
   

@@ -381,12 +381,12 @@
   

   
-  
-   
-  
   

   
+  
+   
+  
   

   
@@ -448,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1163,20 +1163,20 @@


 Credits
-1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
+1971 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-05-07 16:01:41.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35426Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1193,15 +1193,15 @@
Vladimir 
GlazunovCommits: 25434Joined: 

core.git: readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 2026 ++--
 1 file changed, 1023 insertions(+), 1003 deletions(-)

New commits:
commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb
Author: Christian Lohmaier 
AuthorDate: Tue May 7 19:20:07 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 19:20:16 2024 +0200

update credits

Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index ec7d2eba89a9..c3d752e2232c 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   635
+   2360
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 635
+ 2360
  55667
- 27596
+ 29321
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13427930
+   13478728
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -370,7 +370,7 @@
  
  
   
-   
+   
   
   

@@ -381,12 +381,12 @@
   

   
-  
-   
-  
   

   
+  
+   
+  
   

   
@@ -448,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1163,20 +1163,20 @@


 Credits
-1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
+1971 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-05-07 16:01:41.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35426Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1193,15 +1193,15 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 21158Joined: 

core.git: configure.ac odk/CustomTarget_doxygen.mk

[Christian Lohmaier (via logerrit)]

 configure.ac|   18 --
 odk/CustomTarget_doxygen.mk |8 
 2 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 83d3f9b819ee23efa314953fc2fde4412d90a60b
Author: Christian Lohmaier 
AuthorDate: Tue May 7 14:19:50 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Tue May 7 17:08:44 2024 +0200

use windows doxygen in wsl-as-helper case

basically reverts f7fe6a0bed2c2aee19535a26181a2edfb103e587

avoiding the penalty for accessing files in the windows-realm from
within the wsl-container significantly accelerates the doc-generation

Change-Id: I95af905bda7225a9c1924a41e952656dffbfbc0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167279
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/configure.ac b/configure.ac
index e04f4a846642..5954533a7f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9488,8 +9488,9 @@ else
 fi
 else
 AC_MSG_CHECKING([for doxygen])
-DOXYGEN=$with_doxygen
-AC_MSG_RESULT([$DOXYGEN])
+PathFormat "$with_doxygen"
+DOXYGEN="$formatted_path_unix"
+AC_MSG_RESULT([$formatted_path])
 fi
 if test -n "$DOXYGEN"; then
 DOXYGEN_VERSION=`$DOXYGEN --version 2>/dev/null`
@@ -9498,6 +9499,19 @@ else
 AC_MSG_ERROR([found doxygen is too old; need at least version 
1.8.4 or specify --without-doxygen])
 fi
 fi
+if test -n "$WSL_ONLY_AS_HELPER"; then
+dnl what really should be tested is whether it is doxygen from 
windows-realm
+dnl i.e. one that runs on the windows-side and deals with 
windows-pathnames
+dnl using doxygen from wsl container would be possible, but 
there's a performance
+dnl penalty when accessing the files outside the container
+AC_MSG_CHECKING([whether doxygen is a windows executable])
+if $(file "$DOXYGEN" | grep -q "PE32"); then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+AC_MSG_ERROR([please provide a path to a windows version of 
doxygen or use --without-doxygen])
+fi
+fi
 fi
 fi
 AC_SUBST([DOXYGEN])
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 42132387457b..03b43c0c7180 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -22,8 +22,8 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Type.h \
com/sun/star/uno/Type.hxx
 
-# Cygwin Doxygen needs unix paths, wsl-as-helper needs paths into windows-realm
-odk_cygwin_path = $(if $(MSYSTEM),$(call gb_Helper_wsl_path,$(1)),$(call 
gb_Helper_cyg_path,$(1)))
+# Cygwin Doxygen needs unix paths, wsl-as-helper works in windows-realm
+odk_cygwin_path = $(if $(MSYSTEM),$(1),$(call gb_Helper_cyg_path,$(1)))
 odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/)
 odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \
$(SRCDIR)/include/sal/log-areas.dox \
@@ -57,7 +57,7 @@ $(gb_CustomTarget_workdir)/odk/docs/cpp/doxygen.log : \
$(call gb_Package_get_target,odk_headers_generated)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
-   rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL) 
$(DOXYGEN) $<) > $@
+   rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN)
 
 $(eval $(call gb_CustomTarget_register_targets,odk/docs,\
@@ -98,7 +98,7 @@ $(gb_CustomTarget_workdir)/odk/docs/idl/doxygen.log : \
$(SRCDIR)/odk/docs/idl/main.dox
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
-   rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL) 
$(DOXYGEN) $<) > $@
+   rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN)
 
 # vim: set noet sw=4 ts=4:

core.git: external/argon2 external/boost external/box2d external/breakpad external/cairo external/clucene external/curl external/dtoa external/epoxy external/expat external/firebird external/fontconfi

[Christian Lohmaier (via logerrit)]

 RepositoryExternal.mk |  380 
+-
 external/IAccessible2/ExternalProject_IAccessible2.mk |2 
 external/argon2/ExternalProject_argon2.mk |4 
 external/boost/StaticLibrary_boost_locale.mk  |2 
 external/box2d/StaticLibrary_box2d.mk |4 
 external/breakpad/StaticLibrary_breakpad.mk   |4 
 external/cairo/ExternalProject_cairo.mk   |8 
 external/clucene/Library_clucene.mk   |8 
 external/curl/ExternalProject_curl.mk |2 
 external/dtoa/StaticLibrary_dtoa.mk   |2 
 external/epoxy/Library_epoxy.mk   |4 
 external/expat/StaticLibrary_expat.mk |2 
 external/expat/StaticLibrary_expat_x64.mk |2 
 external/firebird/ExternalProject_firebird.mk |   22 
 external/fontconfig/ExternalProject_fontconfig.mk |2 
 external/freetype/ExternalProject_freetype.mk |2 
 external/gpgmepp/Library_gpgmepp.mk   |   14 
 external/graphite/StaticLibrary_graphite.mk   |4 
 external/harfbuzz/ExternalProject_harfbuzz.mk |2 
 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk   |   12 
 external/jfreereport/ExternalProject_jfreereport_liblayout.mk |   18 
 external/libcmis/StaticLibrary_libcmis.mk |4 
 external/libetonyek/Library_etonyek.mk|6 
 external/libffi/ExternalProject_libffi.mk |6 
 external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk |6 
 external/liblangtag/ExternalProject_liblangtag.mk |4 
 external/libmwaw/Library_mwaw.mk  |2 
 external/libodfgen/Library_odfgen.mk  |2 
 external/liborcus/Library_orcus-parser.mk |4 
 external/liborcus/Library_orcus.mk|4 
 external/librevenge/Library_revenge.mk|2 
 external/libstaroffice/Library_staroffice.mk  |4 
 external/libtiff/ExternalProject_libtiff.mk   |   10 
 external/libwpd/Library_wpd.mk|4 
 external/libwpg/Library_wpg.mk|2 
 external/libwps/Library_wps.mk|4 
 external/libxslt/ExternalProject_libxslt.mk   |4 
 external/lxml/ExternalProject_lxml.mk |   14 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |4 
 external/mdnsresponder/StaticLibrary_mDNSResponder.mk |2 
 external/nss/ExternalProject_nss.mk   |4 
 external/onlineupdate/CustomTarget_generated.mk   |2 
 external/onlineupdate/Executable_mar.mk   |8 
 external/onlineupdate/Executable_mbsdiff.mk   |4 
 external/onlineupdate/Executable_test_updater_dialog.mk   |   14 
 external/onlineupdate/Executable_update_service.mk|   22 
 external/onlineupdate/Executable_updater.mk   |   24 
 external/onlineupdate/Library_install_updateservice.mk|2 
 external/onlineupdate/StaticLibrary_libmar.mk |6 
 external/onlineupdate/StaticLibrary_libmarverify.mk   |4 
 external/onlineupdate/StaticLibrary_updatehelper.mk   |   16 
 external/onlineupdate/WinResTarget_updater.mk |8 
 external/openldap/ExternalProject_openldap.mk |6 
 external/pdfium/Library_pdfium.mk |   12 
 external/postgresql/ExternalProject_postgresql.mk |   12 
 external/python3/ExternalProject_python3.mk   |   26 
 external/python3/GeneratedPackage_python3.mk  |2 
 external/redland/ExternalProject_raptor.mk|2 
 external/redland/ExternalProject_rasqal.mk|6 
 external/redland/ExternalProject_redland.mk   |8 
 external/redland/Library_raptor.mk|2 
 external/redland/Library_rasqal.mk|6 
 external/redland/Library_rdf.mk   |2 
 external/rhino/ExternalProject_rhino.mk   |   34 
 external/skia/Library_skia.mk |8 
 external/xmlsec/ExternalProject_xmlsec.mk |   10 
 

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/TargetLocations.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6efe3a7a83bf5e110cbe84c225ca4f0a6364a906
Author: Christian Lohmaier 
AuthorDate: Sat May 4 14:30:50 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat May 4 16:28:40 2024 +0200

turn gb_HelpTranslatePartTarget_get_workdir into error

separate commit since that macro is used in helpcontent submodule

Change-Id: I2525b03eadf75b108499701f7f576634619cbf1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167123
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f36a036106a7..dc659c1e4b4d 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -98,7 +98,7 @@ gb_HelpTarget_get_workdir = $(error please use plain 
gb_HelpTarget_workdir)
 gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget
 gb_HelpTranslatePartTarget_get_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/done
 gb_HelpTranslatePartTarget_get_translated_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp
-gb_HelpTranslatePartTarget_get_workdir = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)
+gb_HelpTranslatePartTarget_get_workdir = $(error please use plain 
gb_HelpTranslatePartTarget_workdir instead)
 gb_HelpTranslatePartTarget_workdir := $(WORKDIR)/HelpTranslatePartTarget
 gb_HelpTranslateTarget_get_target = $(WORKDIR)/HelpTranslateTarget/$(1).done
 gb_HelpTreeTarget_get_target = $(WORKDIR)/HelpTreeTarget/$(1).tree

help.git: CustomTarget_html.mk

[Christian Lohmaier (via logerrit)]

 CustomTarget_html.mk |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 5873436e54097facb9c435dc00cef6fc7194b108
Author: Christian Lohmaier 
AuthorDate: Sat May 4 14:35:31 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat May 4 16:28:15 2024 +0200

makefile simplification: replace $(call 
gb_HelpTranslatePartTarget_get_workdir,foo)

helpcontent2 portion

Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8632560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167124
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 9b583f68c7..d105f119ad 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -65,7 +65,7 @@ ifeq ($(HELP_OMINDEX_PAGE),TRUE)
 
 define html_gen_xaptpl_dep
 $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/xap_tpl : \
-   $(if $(filter en-US,$(1)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
+   $(if $(filter 
en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef

@@ -84,7 +84,7 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \
--stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
-   $(if $(filter en-US,$*),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source/text/shared/help/browserhelp.xhp
 \
+   $(if $(filter 
en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/text/shared/help/browserhelp.xhp
 \
)
$(call gb_Trace_EndRange,$*/$(@F),XSL)
 
@@ -94,7 +94,7 @@ endif
 
 define html_gen_noscript_dep
 $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/noscript.html : \
-   $(if $(filter en-US,$(1)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
+   $(if $(filter 
en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
 
@@ -114,7 +114,7 @@ 
$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/noscript.html : \
--stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/noscript.xsl \
-   $(if $(filter en-US,$*),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source/text/shared/help/browserhelp.xhp
 \
+   $(if $(filter 
en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/text/shared/help/browserhelp.xhp
 \
)
$(call gb_Trace_EndRange,$*/$(@F),XSL)
 
@@ -126,7 +126,7 @@ 
$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : \
 
 define html_gen_langnames_js_dep
 $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/langnames.js : \
-   $(if $(filter en-US,$(1)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
+   $(if $(filter 
en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
 
@@ -222,13 +222,13 @@ 
$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/html.text : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
$(call gb_Trace_StartRange,$*/$(@F),XSL)
rm -rf $(dir $@)text && mkdir -p $(dir $@)text && cd $(dir $@)text && 
mkdir -p $(sort $(subst helpcontent2/source/text/,,$(dir 
$(gb_html_allhelpfiles \
-   && cd $(if $(filter en-US,$*),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$*)) \
+   && cd $(if $(filter 
en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*) \
&& RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix 
$(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(subst 
helpcontent2/source/,,$(gb_html_allhelpfiles \
&& while read xhp dummy; do \
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam Language $* \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
-   --stringparam root $(if $(filter en-US,$*),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source/ \
+   --stringparam root $(if $(filter 
en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/
 \
--stringparam productname "$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion "$(PRODUCTVERSION)" \
--stringparam xapian $(if $(filter TRUE, 
$(HELP_OMINDEX_PAGE)),'yes','no') \
@@ -287,7 +287,7 @@ 
$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/bookmarks.part : \
$(call gb_Output_announce,$(subst 

core.git: 2 commits - helpcontent2 solenv/gbuild

[Christian Lohmaier (via logerrit)]

 helpcontent2 |2 +-
 solenv/gbuild/HelpTarget.mk  |8 
 solenv/gbuild/TargetLocations.mk |1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a3d55b67b0c44aa135aad6447ba8a03c5aa7936a
Author: Christian Lohmaier 
AuthorDate: Sat May 4 16:28:15 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Sat May 4 16:28:15 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5873436e54097facb9c435dc00cef6fc7194b108
  - makefile simplification: replace $(call 
gb_HelpTranslatePartTarget_get_workdir,foo)

helpcontent2 portion

Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8632560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167124
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index e8b21ab24434..5873436e5409 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1
+Subproject commit 5873436e54097facb9c435dc00cef6fc7194b108
commit 52fc9164940a7e778cf4b03a984f7259bd92f9fa
Author: Christian Lohmaier 
AuthorDate: Sat May 4 14:29:17 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat May 4 16:28:03 2024 +0200

makefile simplification: replace $(call 
gb_HelpTranslatePartTarget_get_workdir,foo)

…by a simple/static $(gb_HelpTranslatePartTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f

Change-Id: I2525b03eadf75b108499701f7f576634619ccf1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167122
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index aa114d373b0b..2a629fcbd129 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -45,14 +45,14 @@ $(call gb_Helper_abbreviate_dirs, \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
-m $${POFILES} \
-   -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2)) 
&& \
+   -o $(gb_HelpTranslatePartTarget_workdir)/$(2) && \
rm -f $${POFILES} \
, \
$(gb_HelpTranslatePartTarget_COMMAND) \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
-m \
-   -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2)) \
+   -o $(gb_HelpTranslatePartTarget_workdir)/$(2) \
) \
 ) && \
 touch $@ && \
@@ -83,7 +83,7 @@ $(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES 
:= $(3)
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) : 
$(gb_Module_CURRENTMAKEFILE)
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(3)
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call 
gb_HelpTranslatePartTarget_get_target,$(1))).dir
-$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(call 
gb_HelpTranslatePartTarget_get_workdir,$(1))/.dir
+$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| 
$(gb_HelpTranslatePartTarget_workdir)/$(1)/.dir
 
 endef
 
@@ -99,7 +99,7 @@ endef
 gb_HelpTranslateTarget__get_lang = $(lastword $(subst /, ,$(1)))
 
 gb_HelpTranslateTarget__get_partname = $(call 
gb_HelpTranslateTarget__get_lang,$(1))/$(patsubst %/,%,$(2))
-gb_HelpTranslateTarget__get_part_workdir = $(call 
gb_HelpTranslatePartTarget_get_workdir,$(call 
gb_HelpTranslateTarget__get_partname,$(1),$(2)))
+gb_HelpTranslateTarget__get_part_workdir = 
$(gb_HelpTranslatePartTarget_workdir)/$(call 
gb_HelpTranslateTarget__get_partname,$(1),$(2))
 
 gb_HelpTranslateTarget_get_translated_target = $(call 
gb_HelpTranslatePartTarget_get_translated_target,$(call 
gb_HelpTranslateTarget__get_partname,$(1),$(dir $(2))),$(notdir $(2)))
 gb_HelpTranslateTarget__get_any_translated_target = $(abspath $(call 
gb_HelpTranslatePartTarget_get_translated_target,,$(1)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f59b3da126f9..f36a036106a7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -99,6 +99,7 @@ gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget
 gb_HelpTranslatePartTarget_get_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/done
 gb_HelpTranslatePartTarget_get_translated_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp
 gb_HelpTranslatePartTarget_get_workdir = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)
+gb_HelpTranslatePartTarget_workdir := $(WORKDIR)/HelpTranslatePartTarget
 gb_HelpTranslateTarget_get_target = $(WORKDIR)/HelpTranslateTarget/$(1).done
 gb_HelpTreeTarget_get_target = $(WORKDIR)/HelpTreeTarget/$(1).tree
 gb_InstallModule_get_filelist = $(call 
gb_InstallModuleTarget_get_filelist,$(1))

core.git: 3 commits - solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/Extension.mk   |   49 ++-
 solenv/gbuild/Gallery.mk |   32 -
 solenv/gbuild/HelpTarget.mk  |   10 +++
 solenv/gbuild/TargetLocations.mk |9 ---
 4 files changed, 50 insertions(+), 50 deletions(-)

New commits:
commit c8a145afbff81d4c19c2346870eb005c775862b1
Author: Christian Lohmaier 
AuthorDate: Sat May 4 14:17:41 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat May 4 16:27:56 2024 +0200

makefile simplification: replace $(call gb_HelpTarget_get_workdir,foo)

…by a simple/static $(gb_HelpTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f

Change-Id: Ibe4ce564b021158f3b1800fad96bdeee88792a97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167121
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 98baa661e908..aa114d373b0b 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -377,7 +377,7 @@ endef
 # gb_HelpLinkTarget_set_indexed target indexfiles
 define gb_HelpLinkTarget_set_indexed
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(2)
-$(addprefix $(call gb_HelpTarget_get_workdir,$(1))/,$(2)) : $(call 
gb_HelpIndexTarget_get_target,$(1))
+$(addprefix $(gb_HelpTarget_workdir)/$(1)/,$(2)) : $(call 
gb_HelpIndexTarget_get_target,$(1))
 
 endef
 
@@ -407,7 +407,7 @@ endef
 define gb_HelpLinkTarget_add_renamed_file
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES += $(strip 
$(2)),$(strip $(3))
 $(call gb_HelpLinkTarget_get_target,$(1)) : $(3)
-$(call gb_HelpTarget_get_workdir,$(1))/$(2) : $(call 
gb_HelpLinkTarget_get_target,$(1))
+$(gb_HelpTarget_workdir)/$(1)/$(2) : $(call gb_HelpLinkTarget_get_target,$(1))
touch $$@
 
 endef
@@ -582,7 +582,7 @@ endif
$(call gb_HelpTarget_get_linked_target,$*) \
$(call gb_HelpTarget_get_target,$*) \
$(call gb_HelpTarget_get_translation_target,$*) \
-   $(call gb_HelpTarget_get_workdir,$*) \
+   $(gb_HelpTarget_workdir)/$* \
)
 
 gb_HelpTarget_get_packagename = HelpTarget/$(1)
@@ -599,7 +599,7 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3)
 $(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES :=
 $(call gb_HelpTarget_get_translation_target,$(1)) : 
$(gb_Module_CURRENTMAKEFILE)
 
-$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(call 
gb_HelpTarget_get_workdir,$(1)),$(call gb_HelpTarget_get_packagename,$(1)))
+$(call 
gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(gb_HelpTarget_workdir)/$(1),$(call
 gb_HelpTarget_get_packagename,$(1)))
 
 endef
 
@@ -617,7 +617,7 @@ endif
 $(call gb_HelpTarget_get_linked_target,$(1)) : $(call 
gb_HelpTarget_get_translation_target,$(1))
 ifeq ($(ENABLE_HTMLHELP),)
 $(call gb_HelpLinkTarget_get_target,$(1)) : $(call 
gb_HelpTarget_get_linked_target,$(1))
-$(call gb_HelpLinkTarget_get_target,$(1)) :| $(call 
gb_HelpTarget_get_workdir,$(1))/.dir
+$(call gb_HelpLinkTarget_get_target,$(1)) :| $(gb_HelpTarget_workdir)/$(1)/.dir
 $(call gb_HelpTarget_get_target,$(1)) : $(call 
gb_HelpLinkTarget_get_target,$(1))
 $(call gb_Package_get_preparation_target,$(5)) : $(call 
gb_HelpTarget_get_target,$(1))
 endif
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 553c127a1781..f59b3da126f9 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -94,7 +94,8 @@ gb_HelpTarget_get_filelist = 
$(WORKDIR)/HelpTarget/$(1).filelist
 gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate
 gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip
 gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1))
-gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1)
+gb_HelpTarget_get_workdir = $(error please use plain gb_HelpTarget_workdir)
+gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget
 gb_HelpTranslatePartTarget_get_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/done
 gb_HelpTranslatePartTarget_get_translated_target = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp
 gb_HelpTranslatePartTarget_get_workdir = 
$(WORKDIR)/HelpTranslatePartTarget/$(1)
commit ee5eb3dac8c90a49de88475cf2d0de9d8a93e912
Author: Christian Lohmaier 
AuthorDate: Sat May 4 14:08:02 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat May 4 16:27:49 2024 +0200

makefile simplification: replace $(call gb_Galley_get_workdir,foo)

…by a simple/static $(gb_Gallery_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f

Change-Id: Iaa2ab218b329a15c7bf2ea528e2612a3a6b44f6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167120
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 3d3fa2092edc..ec7a791351fb 100644

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/TargetLocations.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 83c2ef7c78d1453cc0419fd27a8c1418f90c12a3
Author: Christian Lohmaier 
AuthorDate: Thu May 2 11:31:59 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 3 16:07:04 2024 +0200

turn gb_CustomTarget_get_workdir into error and remove old _repo_targets

separate commit since help submodule also uses the macro.

actually turn it into make error to prevent reintroducing it

the repo_target ones are from way back when the whole repo was
split up in many different ones and not used for many years,
no point in having those as errors

Change-Id: I9fd42529d08ea7859b33f8570936f06039cfa184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167006
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1db26abd9e4e..725390a8feed 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -55,9 +55,8 @@ gb_ComponentTarget_get_target_for_build = 
$(WORKDIR_FOR_BUILD)/ComponentTarget/$
 gb_Configuration_get_preparation_target = 
$(WORKDIR)/Configuration/$(1).prepared
 gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
 gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
-gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
 gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
-gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
+gb_CustomTarget_get_workdir = $(error please use plain gb_CustomTarget_workdir 
instead)
 gb_CustomTarget_workdir := $(WORKDIR)/CustomTarget
 gb_DescriptionTranslateTarget_get_target = 
$(WORKDIR)/DescriptionTranslateTarget/$(1).xml
 gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done
@@ -109,7 +108,6 @@ gb_InternalUnoApi_get_target = 
$(WORKDIR)/InternalUnoApi/$(1).done
 gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1))
 gb_Jar_get_classsetname = Jar/$(1)
 gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
-gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
 gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
 gb_JunitTest_get_classsetname = JunitTest/$(1)
 gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done

core.git: helpcontent2

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 9c4e0578eead433de2b38f2a464b402c09432ecd
Author: Christian Lohmaier 
AuthorDate: Fri May 3 16:06:40 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri May 3 16:06:40 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to e8b21ab244345cea0a1d0b9190a8729ff3ea47b1
  - makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)

helpcontent2 portion

Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8636560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167007
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/helpcontent2 b/helpcontent2
index d5d56e1d29b6..e8b21ab24434 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d5d56e1d29b65749978ae5e9801531200477761b
+Subproject commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1

help.git: AllLangPackage_html_lang.mk CustomTarget_html.mk CustomTarget_imagelist.mk GeneratedPackage_html_lang_generated.mk Package_helpimages.mk Package_html_dynamic.mk

[Christian Lohmaier (via logerrit)]

 AllLangPackage_html_lang.mk |2 
 CustomTarget_html.mk|   72 
 CustomTarget_imagelist.mk   |6 +-
 GeneratedPackage_html_lang_generated.mk |2 
 Package_helpimages.mk   |2 
 Package_html_dynamic.mk |2 
 6 files changed, 43 insertions(+), 43 deletions(-)

New commits:
commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1
Author: Christian Lohmaier 
AuthorDate: Thu May 2 11:35:10 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri May 3 16:06:39 2024 +0200

makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)

helpcontent2 portion

Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8636560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167007
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/AllLangPackage_html_lang.mk b/AllLangPackage_html_lang.mk
index 63fe21ba65..a0ae5f5a7b 100644
--- a/AllLangPackage_html_lang.mk
+++ b/AllLangPackage_html_lang.mk
@@ -7,7 +7,7 @@
 # # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # #
 #
-$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_lang,$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)))
+$(eval $(call 
gb_AllLangPackage_AllLangPackage,helpcontent2_html_lang,$(gb_CustomTarget_workdir)/helpcontent2/help3xsl))
 
 $(eval $(call 
gb_AllLangPackage_use_customtarget,helpcontent2_html_lang,helpcontent2/help3xsl))
 
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index a3a9cec55f..9b583f68c7 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -43,7 +43,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
 
 # trailing space for Windows so that xargs doesn't interpret the final CR (that
 # win-make adds as the newline character) as part of the last filename
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/hid2file.js : \
 $(SRCDIR)/helpcontent2/help3xsl/generate_hid2file.xsl \
 $(foreach module,$(html_TEXT_MODULES),$(call 
gb_AllLangHelp_get_helpfiles_target,$(module))) \
 $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
@@ -64,14 +64,14 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
 ifeq ($(HELP_OMINDEX_PAGE),TRUE)
 
 define html_gen_xaptpl_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/xap_tpl : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/xap_tpl : \
$(if $(filter en-US,$(1)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef

 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_xaptpl_dep,$(lang
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \
 $(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
 $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
@@ -93,14 +93,14 @@ endif
 # Create noscript.html, when browser has no javascript enabled
 
 define html_gen_noscript_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/noscript.html : 
\
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/noscript.html : \
$(if $(filter en-US,$(1)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_noscript_dep,$(lang
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/noscript.html : \
 $(SRCDIR)/helpcontent2/help3xsl/noscript.xsl \
 $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \
 $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
@@ -120,12 +120,12 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \
 
 
 # set of installed languages - has to be language independent
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : \
 $(SRCDIR)/helpcontent2/CustomTarget_html.mk
printf 'var languagesSet = new Set([%s]);
' "$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))" > $@
 
 define html_gen_langnames_js_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/langnames.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/langnames.js : \
$(if $(filter en-US,$(1)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
@@ -133,7 +133,7 @@ endef
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call 
html_gen_langnames_js_dep,$(lang
 
 # names of the languages - has to be translated, ie. per language
-$(call 

core.git: android/CustomTarget_lo_android.mk bridges/CustomTarget_gcc3_linux_arm.mk bridges/Library_cpp_uno.mk cli_ure/CustomTarget_cli_ure_assemblies.mk desktop/CustomTarget_desktop_unopackages_insta

[Christian Lohmaier (via logerrit)]

 android/CustomTarget_lo_android.mk  |2 
 bridges/CustomTarget_gcc3_linux_arm.mk  |   12 -
 bridges/Library_cpp_uno.mk  |4 
 cli_ure/CustomTarget_cli_ure_assemblies.mk  |   18 -
 desktop/CustomTarget_desktop_unopackages_install.mk |6 
 desktop/CustomTarget_soffice.mk |6 
 desktop/Executable_soffice_bin.mk   |8 
 desktop/GeneratedPackage_desktop_unopackages_install.mk |2 
 desktop/Package_soffice_sh.mk   |2 
 editeng/CustomTarget_generated.mk   |2 
 extensions/CustomTarget_automationtest.mk   |2 
 extensions/CustomTarget_so_activex_idl.mk   |2 
 extensions/CustomTarget_so_activex_x64.mk   |   16 -
 external/onlineupdate/CustomTarget_generated.mk |2 
 extras/AllLangPackage_autotextshare.mk  |2 
 extras/CustomTarget_autocorr.mk |   12 -
 extras/CustomTarget_autotextshare.mk|   16 -
 extras/CustomTarget_autotextuser.mk |   12 -
 extras/CustomTarget_gallsystem.mk   |6 
 extras/CustomTarget_glade.mk|2 
 extras/CustomTarget_opensymbol.mk   |4 
 extras/CustomTarget_templates.mk|   30 +--
 extras/CustomTarget_tplpresnt.mk|   20 +-
 extras/CustomTarget_tplwizard.mk|   32 +--
 extras/Package_autocorr.mk  |2 
 extras/Package_autotextuser.mk  |2 
 extras/Package_fonts.mk |2 
 extras/Package_gallsystemstr.mk |2 
 extras/Package_glade.mk |2 
 extras/Package_resource_fonts.mk|2 
 extras/Package_templates.mk |2 
 extras/Package_tplpresnt.mk |2 
 extras/Package_tplwizard.mk |2 
 filter/CustomTarget_svg.mk  |2 
 i18npool/CustomTarget_breakiterator.mk  |2 
 i18npool/CustomTarget_collator.mk   |2 
 i18npool/CustomTarget_indexentry.mk |6 
 i18npool/CustomTarget_localedata.mk |8 
 i18npool/CustomTarget_textconversion.mk |6 
 i18npool/Library_i18npool.mk|   12 -
 instsetoo_native/CustomTarget_install.mk|   46 ++--
 instsetoo_native/CustomTarget_setup.mk  |   38 ++--
 instsetoo_native/Package_setup.mk   |2 
 instsetoo_native/Package_setup_ure.mk   |2 
 jvmfwk/CustomTarget_jreproperties.mk|6 
 jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk   |2 
 jvmfwk/Package_jreproperties.mk |2 
 jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk|2 
 librelogo/CustomTarget_librelogo.mk |2 
 librelogo/Package_librelogo_properties.mk   |2 
 odk/CustomTarget_allheaders.mk  |2 
 odk/CustomTarget_check.mk   |4 
 odk/CustomTarget_classes.mk |2 
 odk/CustomTarget_config_win.mk  |2 
 odk/CustomTarget_doxygen.mk |   16 -
 odk/CustomTarget_html.mk|2 
 odk/CustomTarget_javadoc.mk |   12 -
 odk/CustomTarget_settings.mk|2 
 odk/GeneratedPackage_odk_doxygen.mk |2 
 odk/GeneratedPackage_odk_javadoc.mk |2 
 odk/GeneratedPackage_uno_loader_classes.mk  |2 
 odk/Package_config_win.mk   |2 
 odk/Package_html.mk |2 
 odk/Package_settings_generated.mk   |2 
 odk/Package_share_readme.mk |2 
 odk/build-examples_common.mk|   16 -
 officecfg/CustomTarget_registry.mk  |6 
 oox/CustomTarget_generated.mk   |2 
 oox/Package_generated.mk|2 
 postprocess/CustomTarget_check_dynamic_objects.mk   |2 
 postprocess/CustomTarget_components.mk  |2 
 postprocess/CustomTarget_fontconfig.mk  |8 
 postprocess/CustomTarget_images.mk  |2 
 postprocess/CustomTarget_registry.mk|   36 +--
 postprocess/CustomTarget_signing.mk |4 
 postprocess/Package_fontconfig.mk   |2 
 

core.git: Branch 'libreoffice-24-2' - android/source

[Christian Lohmaier (via logerrit)]

 android/source/res/values-ab/strings.xml |2 
 android/source/res/values-ast/strings.xml|  121 +++
 android/source/res/values-ca/strings.xml |  121 +++
 android/source/res/values-cs/strings.xml |  121 +++
 android/source/res/values-cy/strings.xml |  121 +++
 android/source/res/values-de/strings.xml |   40 +---
 android/source/res/values-dsb/strings.xml|  121 +++
 android/source/res/values-el/strings.xml |  121 +++
 android/source/res/values-es/strings.xml |  121 +++
 android/source/res/values-eu/strings.xml |  121 +++
 android/source/res/values-fa/strings.xml |  121 +++
 android/source/res/values-fi/strings.xml |2 
 android/source/res/values-fr/strings.xml |  121 +++
 android/source/res/values-gl/strings.xml |  121 +++
 android/source/res/values-hsb/strings.xml|  121 +++
 android/source/res/values-hu/strings.xml |  121 +++
 android/source/res/values-hy/strings.xml |  121 +++
 android/source/res/values-ia/strings.xml |   78 +
 android/source/res/values-in/strings.xml |   91 
 android/source/res/values-is/strings.xml |  121 +++
 android/source/res/values-it/strings.xml |  121 +++
 android/source/res/values-ja/strings.xml |2 
 android/source/res/values-kk/strings.xml |2 
 android/source/res/values-ne/strings.xml |   23 +
 android/source/res/values-nl/strings.xml |  121 +++
 android/source/res/values-pa/strings.xml |  118 ++
 android/source/res/values-pl/strings.xml |  121 +++
 android/source/res/values-pt-rBR/strings.xml |  121 +++
 android/source/res/values-pt/strings.xml |  121 +++
 android/source/res/values-sk/strings.xml |   22 
 android/source/res/values-sl/strings.xml |  121 +++
 android/source/res/values-tr/strings.xml |   44 ++---
 android/source/res/values-uk/strings.xml |  121 +++
 android/source/res/values-zh-rTW/strings.xml |  121 +++
 34 files changed, 3141 insertions(+), 66 deletions(-)

New commits:
commit 8b80b3daf5db792d86c0caf379ca010750cebba6
Author: Christian Lohmaier 
AuthorDate: Thu May 2 13:47:55 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 2 13:47:55 2024 +0200

seed 24-2 branch with android translations

Change-Id: Ib5f9e545d4dbef998ed8b7a3ffbea5e7e4c0a9d3

diff --git a/android/source/res/values-ab/strings.xml 
b/android/source/res/values-ab/strings.xml
new file mode 100644
index ..a6b3daec9354
--- /dev/null
+++ b/android/source/res/values-ab/strings.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/android/source/res/values-ast/strings.xml 
b/android/source/res/values-ast/strings.xml
new file mode 100644
index ..27e9d06bd131
--- /dev/null
+++ b/android/source/res/values-ast/strings.xml
@@ -0,0 +1,121 @@
+
+
+Amosar la llicencia
+Documentu de testu nuevu
+Dibuxu nuevu
+ensin títulu
+Esbilla\'l ficheru que quies 
abrir
+Ficheros recién
+Tolos ficheros
+Axustes
+Amosar el tecláu
+Refacer
+NON
+Desaniciar
+Anubrir
+Amosar
+Fueya
+Esti ficheru ye namái de llectura.
+Presentación nueva
+Fueya de cálculu nueva
+Tocante a
+Guardar
+Guetar
+Desfacer
+Páxina
+Configuración del visor del 
LibreOffice
+Versión: %1$sbrIdentificador de la 
construción: a 
href=https://hub.libreoffice.org/git-core/%2$s%2$s/a;
+El Visor del LibreOffice ye un visor de 
documentos basáu nel LibreOffice.
+https://www.libreoffice.org
+Esta versión fornióla $VENDOR.
+Visor del LibreOffice
+Xenerales
+Mou esperimental
+Mou de desendolcu
+Guardar como…
+Guardando’l documentu…
+Nun se pudo guardar el 
documentu.
+¿Quies guardar el documentu enantes 
de zarralu\?
+GUARDAR
+Encaboxar
+Amosar l\'avisu
+Política de privacidá
+Crear un ficheru nuevu
+Atopar siguiente
+Atopar anterior
+iconu de ficheru
+Activa\'l mou d\'edición 
esperimental. Úsalu baxo la to responsabilidá.
+Activar mou de desendolcu, nel 
que se puen unviar ordes d\'UNO dientro de l\'app. Úsalu baxo la to 
responsabilidá.
+Partes
+Activar el formatu
+Unviar orde UNO
+Guardar completu
+Contraseña
+Presentación de diapositives
+Ametar diapositiva
+Atrás
+Inxertar
+Llargor óptimu
+Axustar el llargor
+

core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit b19c1cf7fa65386de7eb0eeea8068899cdcfb877
Author: Christian Lohmaier 
AuthorDate: Tue Apr 30 15:03:36 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Apr 30 15:03:36 2024 +0200

Update git submodules

* Update translations from branch 'master'
  to 7e1ef25c4f7bb14013f6e68e04c1205785967dad
  - update translations for master

and force-fix errors using pocheck

Change-Id: I2067aadd5d6dad3a13b142a80b099c86aa4f2211

diff --git a/translations b/translations
index b2b2c286fed6..7e1ef25c4f7b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b2b2c286fed6e5116acc819a44c69214af3f993b
+Subproject commit 7e1ef25c4f7bb14013f6e68e04c1205785967dad

translations.git: Changes to 'refs/tags/libreoffice-24.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier 
 at 2024-04-29 18:46 +

Tag libreoffice-24.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vkACgkQ9DSh76/u
rqNyrRAAmW2Cnqt+fvcyXc7yGyz5xxMJEN3hwRWhJEAlEWVPd2PRU6SEPwQLbNZr
P5hvUiucL3P0nWp+cjrIvZGCNZw1+fGEeHXS/H3yNkrfH2bjsB3vF17qONFzv9rj
lBneiw9P/WrIP7O2gP7snpfAUGqXpFohuwUXBE8Nvi+1Ve4YBxK1oTj/DOCxNUKO
GPXdDSa4QrzwipTzQ/SxWU37Z9vvkh4tY54MVsp6bXyIXf1HJKGUEltwJldpdaMa
tYMtOKtl6aubYARbFJZelWSHC9xrKk/1YXGKhXKknpq7A1+1lg7ZXgJ5acPVfRjx
Y2JGLmO2Oga6JoNeFDhWuDM2MfogbIkVXF+sCVKXiLPpOp7Cdw94DPbCkV22ySCv
SR6yhSxKJlnTDCejj97wxSZJjtOZGLYio8hkZcEE8kuPllNnIRSagLFmlRfPz/Ii
FvvaEPiBKhImbw+Zky5nhPIQrVjERp3en7byzHGprQ10zQbSrIGKX/+AbjgTRrLf
qUMXWi17JABAOw83n7EmipzTSxdINK9ZocY8XlCAC1wsP5NBCKKC9GcHfC06eZlu
3ZfGDM0jYK/nAU9Y0mWBk73O9K+kf8Xy9h8ONvFMdOhi2BFSsNU26WRFie83ZKVM
/HYhRJV/jvvT7L4nHUewezma/OxXY02TKURhNR59XkqcEmUbG1M=
=+z+5
-END PGP SIGNATURE-

Changes since cp-24.04.0-1-9:
---
 0 files changed
---

help.git: Changes to 'refs/tags/libreoffice-24.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier 
 at 2024-04-29 18:46 +

Tag libreoffice-24.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vkACgkQ9DSh76/u
rqMUag//c8RlmiZ664uDe9Y2ZG4qBpLO1o5H8b1LMWHkm2WHFb2eTpYfFkhqrm3O
LGBD6uVi59FM2Bk9fRF7Q4o1RnplNZoaOAGCWZ0vT7TL+JsMHKtxUh793DS19SD+
yd5FoGvPl4j5Qf7y7vuTcgk6Hspsllu4RvDWGE65Sb/HROATmveG2bQf61B/lABS
mj8Gu05QyKVFCsBWn0MzdAATSX1h1u1Xh9XzX3RILN9GtCvuu7U7M9cDcCP5yH03
NhkrqzGijwTreP2Fmga1b8GKBgHDL7VJmPdb1xjdJuIWrdlXkdprdaHkFsJMXPzu
nIXQkTztBUbBMbklsaYn0MSyLoTkQ/HemNWIOHB1zk/F9Q+J0l9tyfmOTtGpksxg
fZNraRZfj4/dnYSLWwe+fGf8p2eToFYXg0ZMzI52rbGDSc5IS762mAxJcMe8zULG
X23qOeZ0FTorASS3xhqhDK1V+zcT3q8kr78vrsSdCh4aoFefgeZrd0uBf739J4sl
u9JYndati9fGRzVkoqtKZOhQflFhZ5rs0UhMK9qOz+RjBGnVC0nkYIgSahXKGteE
ycc0rpRO6JVTC5HNnihAfU5SVB9eK2mTBU1IIpIB5rrkUd5gBKFU03VQO3vqlZpz
sW1JwYPom+TtY7opwbKSttF6zxcfbNixmQ+qanBgZg0tkV1fQNI=
=SfY+
-END PGP SIGNATURE-

Changes since co-24.04-branch-point-14:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/libreoffice-24.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier 
 at 2024-04-29 18:46 +

Tag libreoffice-24.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vYACgkQ9DSh76/u
rqOz0xAAt8HmkOV15ukFpVSAxrsWB/6gJViCo8aP22EfYRZNwwHP2GjqrVp4yQUE
VjRMT/U04ShrgbE9uKt9pKZEPcmXs6ruKCOM7ynkwiF9/Y4JqIzQF4m19nDEKX9J
hdxzcOWK+SDNM1a+yRPvEESUJE4zdhnrnOUzUoZLZeVnKf9KVqspoHZps/Ng1NAQ
z8gqWahehllBGQXlD8nvg6NGm7aNjrG6a/7IgX3GdNRBBotdULxVWef9v88kxExP
bfLNh3HUWrdmg0/yofqWtoMyFN9v2XiVWrvMCjVrQ4BjKkpBC6RtB1xV8uCxf122
2YBZW2/wke2oPtMg+r3oEE9dSZFbZQHVAjVkYy4ag6+yow2+FTVjuVkZ0tr0dkyq
xmhjITuAdtA4d0GJ+2iBWmLofeRzJ2hc8AZudJpxzY36lB3FgFOYeRQ/aAPbrmwa
MTYpndFIlzdGJ42620yynd038i2icyDdmyM08UkEJAfRthcX3cVJxstyDANImwYB
krvfbhZHZtivq+s6srrmHa2pe36H4C1/dWSCepXU/pfMwfmIqPaKCRxXTcfHD04m
o0VUBZyxwAU1lN5itZ6spITXIdG1/n+wReuIZKgkzMB/M6X8BIgKpFMBHkdn2DjO
C0o0XnHVT7aGYVnsmnmiT08K6BIMWzp1KMKZdAshmkwkoRckiTQ=
=R0de
-END PGP SIGNATURE-

Changes since cp-24.04.1-2-1:
---
 0 files changed
---

core.git: Branch 'libreoffice-24-2-3' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89ce85eddedeeaed893f29661df65e4c8aceccdf
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:46:48 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:46:48 2024 +0200

bump product version to 24.2.3.2.0+

Change-Id: Idab0cf1697395a44f959954c23b17f145100ca29

diff --git a/configure.ac b/configure.ac
index 5872d2973f79..a765953454f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[24.2.3.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[24.2.3.2.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Changes to 'refs/tags/libreoffice-24.2.3.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier 
 at 2024-04-29 18:46 +

Tag libreoffice-24.2.3.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vkACgkQ9DSh76/u
rqOHiA//Zwf+pYyAM+5UkNRISlj+33c/b+pp2sYVqRodIBr04TZwgkDRoka02PY1
mpYZMesgraKfD6JxvmrbygjAXT70I+u3sgdDqk5iw4IWCAlndgJb9unzWhxO/TMN
FQfja/6dJP3ACFm+MaSvUHyvzKJxZ1eBnpVXZ444Rt1eEAMYTMdaQsY04q9XsHOs
o0ZFZbdA3lBfwP32dQ05Du/X6h9FgpADBIPigKy3PdOasJ+rAvlivI68Lz583mUa
o9+MZ8E/zEXAfKjzFB/gSBmV7pww4Cx57GxYhNoq7V470NIsfQhSPHsyCtslyo3f
UCbJSpP5UxVxeHSl6gPvIAFaAqaMOqpx6lV8OBnNbW88R7AgZzkO9+Igj6pp9f0R
Dkv20Gsr6QYFJpJ4Ihp38SQSSu9h6/rjVGgsIydLwLU3gVZZrFVRFwRJXYddRsPW
pOW79/BQE2KcviSGKEEMnupMknduMZZjSAdG8+hvoDrNLAivYzrECPsEdyORDPUE
rzjk9rAvugy/q6rI5933W0slia4a1PPM7dR/Ms4DQgBoMqR74YG/qFeAEUjxswdI
lzDW+SxVw0lzD6bQf+RcfyVLoJjgPxYRjqw2a+wuGbw1vymtyXuYiEO15f7khhkX
l553sirBMedhNXtrh1y3xBziQUGtzd9ZI49VMe6i6K46pUwBSe8=
=fT6w
-END PGP SIGNATURE-

Changes since co-24.04-branch-point-439:
---
 0 files changed
---

core.git: Branch 'libreoffice-24-2-3' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3327 ++--
 1 file changed, 1712 insertions(+), 1615 deletions(-)

New commits:
commit ab4fd05c26289147ac1cab686a93a84fda85be5f
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:36:41 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:42:10 2024 +0200

update credits

Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf
(cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200)
(cherry picked from commit 6b20b3abc70c210ae52ecde24076ad08c4594fe0)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e08695d232b5..ec7d2eba89a9 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.1.2$Linux_X86_64
 
LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   2519
+   635
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 2519
+ 635
  55667
- 29480
+ 27596
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13298901
+   13427930
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -373,23 +373,20 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -451,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1166,7 +1163,7 @@


 Credits
-1948 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-03-18 19:52:02.
+1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1179,7 +1176,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35252Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1196,15 +1193,15 @@

core.git: Branch 'libreoffice-24-2' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3327 ++--
 1 file changed, 1712 insertions(+), 1615 deletions(-)

New commits:
commit 6b20b3abc70c210ae52ecde24076ad08c4594fe0
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:36:41 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:41:10 2024 +0200

update credits

Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf
(cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e08695d232b5..ec7d2eba89a9 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.1.2$Linux_X86_64
 
LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   2519
+   635
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 2519
+ 635
  55667
- 29480
+ 27596
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13298901
+   13427930
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -373,23 +373,20 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -451,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1166,7 +1163,7 @@


 Credits
-1948 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-03-18 19:52:02.
+1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1179,7 +1176,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35252Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1196,15 +1193,15 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   

core.git: Branch 'libreoffice-7-6-7' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3327 ++--
 1 file changed, 1712 insertions(+), 1615 deletions(-)

New commits:
commit 7ed1bd0ab67b053cb8c748f9b7388bafc64b89e1
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:36:41 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:40:26 2024 +0200

update credits

Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf
(cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200)
(cherry picked from commit 83a33814da4c4335e5054389e1a5acaccf95377d)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e08695d232b5..ec7d2eba89a9 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.1.2$Linux_X86_64
 
LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   2519
+   635
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 2519
+ 635
  55667
- 29480
+ 27596
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13298901
+   13427930
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -373,23 +373,20 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -451,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1166,7 +1163,7 @@


 Credits
-1948 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-03-18 19:52:02.
+1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1179,7 +1176,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35252Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1196,15 +1193,15 @@

core.git: Branch 'libreoffice-7-6' - readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3327 ++--
 1 file changed, 1712 insertions(+), 1615 deletions(-)

New commits:
commit 83a33814da4c4335e5054389e1a5acaccf95377d
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:36:41 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:39:36 2024 +0200

update credits

Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf
(cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e08695d232b5..ec7d2eba89a9 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.1.2$Linux_X86_64
 
LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   2519
+   635
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 2519
+ 635
  55667
- 29480
+ 27596
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13298901
+   13427930
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -373,23 +373,20 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -451,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1166,7 +1163,7 @@


 Credits
-1948 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-03-18 19:52:02.
+1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1179,7 +1176,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35252Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1196,15 +1193,15 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   

core.git: readlicense_oo/license

[Christian Lohmaier (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 3327 ++--
 1 file changed, 1712 insertions(+), 1615 deletions(-)

New commits:
commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:36:41 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 29 20:38:43 2024 +0200

update credits

Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index e08695d232b5..ec7d2eba89a9 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c
 alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
 meta:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.1.2$Linux_X86_64
 
LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/24.2.2.2$Linux_X86_64
 
LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   2519
+   635
501
55167
26963
@@ -16,9 +16,9 @@
  3623
  3434
  501
- 2519
+ 635
  55667
- 29480
+ 27596
  0
  0
  false
@@ -146,7 +146,7 @@
false

true
-   13298901
+   13427930
true
false
false
@@ -176,7 +176,7 @@
  
   

-   
+   
 


@@ -373,23 +373,20 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -451,24 +448,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1166,7 +1163,7 @@


 Credits
-1948 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-03-18 19:52:02.
+1970 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2024-04-25 17:14:16.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1179,7 +1176,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 35252Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 35359Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1196,15 +1193,15 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 21081Joined: 
2000-10-04
+   Stephan 

core.git: Branch 'libreoffice-24-2-3' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit f185f1fb1ce949f0ebe16eb23f7b76e90020e8cb
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:18:59 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 29 20:18:59 2024 +0200

Update git submodules

* Update translations from branch 'libreoffice-24-2-3'
  to abc5b4da9d1c382d8f76eec58b3c6b0ba17f92bd
  - update translations for 24.2.3 rc2

and force-fix errors using pocheck

Change-Id: Ia1b6ca2a6abad23632aafb021c8bba19a20e1a7b
(cherry picked from commit 64792214d2d89afc019f94ca29ff7a2c2a17ab39)

diff --git a/translations b/translations
index 3edeb8ea2ff2..abc5b4da9d1c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3edeb8ea2ff253535180e0fd61245b68096a8804
+Subproject commit abc5b4da9d1c382d8f76eec58b3c6b0ba17f92bd

translations.git: Branch 'libreoffice-24-2-3' - source/ab source/an source/ast source/bg source/ca source/cs source/da source/de source/dsb source/es source/fi source/fr source/gl source/gug source/hr

[Christian Lohmaier (via logerrit)]

 source/ab/filter/messages.po   |8 
 source/ab/svx/messages.po  |   10 
 source/an/cui/messages.po  |   18 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  |4 
 source/an/reportdesign/messages.po |6 
 source/an/sd/messages.po   |8 
 source/an/shell/source/win32/shlxthandler/res.po   |8 
 source/an/sw/messages.po   |4 
 source/ast/chart2/messages.po  |8 
 source/ast/cui/messages.po |   23 
 source/ast/dbaccess/messages.po|8 
 source/ast/extensions/messages.po  |   49 
 source/ast/extras/source/autocorr/emoji.po |  178 -
 source/ast/filter/messages.po  |4 
 source/ast/helpcontent2/source/text/sbasic/guide.po|8 
 source/ast/helpcontent2/source/text/sbasic/shared.po   |8 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po|4 
 source/ast/helpcontent2/source/text/scalc/00.po|   44 
 source/ast/helpcontent2/source/text/scalc/01.po|   46 
 source/ast/helpcontent2/source/text/scalc/guide.po |   12 
 source/ast/helpcontent2/source/text/sdatabase.po   |   24 
 source/ast/helpcontent2/source/text/sdraw/00.po|8 
 source/ast/helpcontent2/source/text/sdraw/guide.po |4 
 source/ast/helpcontent2/source/text/shared/00.po   |   18 
 source/ast/helpcontent2/source/text/shared/01.po   |   64 
 source/ast/helpcontent2/source/text/shared/02.po   |8 
 source/ast/helpcontent2/source/text/shared/04.po   |   14 
 source/ast/helpcontent2/source/text/shared/autopi.po   |   10 
 source/ast/helpcontent2/source/text/shared/guide.po|   16 
 source/ast/helpcontent2/source/text/shared/menu.po |   20 
 source/ast/helpcontent2/source/text/shared/optionen.po |6 
 source/ast/helpcontent2/source/text/simpress.po|4 
 source/ast/helpcontent2/source/text/simpress/00.po |8 
 source/ast/helpcontent2/source/text/simpress/01.po |4 
 source/ast/helpcontent2/source/text/simpress/guide.po  |6 
 source/ast/helpcontent2/source/text/smath/00.po|4 
 source/ast/helpcontent2/source/text/swriter/00.po  |6 
 source/ast/helpcontent2/source/text/swriter/02.po  |6 
 source/ast/helpcontent2/source/text/swriter/librelogo.po   |4 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |   71 
 source/ast/reportdesign/messages.po|6 
 source/ast/sc/messages.po  |   17 
 source/ast/sd/messages.po  |7 
 source/ast/svx/messages.po |   22 
 source/ast/sw/messages.po  |9 
 source/ast/wizards/source/resources.po |8 
 source/bg/cui/messages.po  |6 
 source/bg/framework/messages.po|8 
 source/bg/helpcontent2/source/text/sbasic/shared.po|4 
 source/bg/helpcontent2/source/text/scalc/guide.po  |   10 
 source/bg/helpcontent2/source/text/shared/02.po|4 
 source/bg/helpcontent2/source/text/shared/04.po|8 
 source/bg/helpcontent2/source/text/shared/menu.po  |   12 
 source/bg/helpcontent2/source/text/shared/optionen.po  |8 
 source/bg/helpcontent2/source/text/swriter/00.po   |  446 ++--
 source/bg/helpcontent2/source/text/swriter/01.po   |  344 +--
 source/bg/helpcontent2/source/text/swriter/02.po   |  122 -
 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po  |4 
 source/bg/sc/messages.po   |   12 
 source/bg/sfx2/messages.po |8 
 source/bg/sw/messages.po   |8 
 source/bg/xmlsecurity/messages.po  |   12 
 source/ca/connectivity/messages.po |   10 
 source/ca/cui/messages.po  |6 
 source/ca/dbaccess/messages.po |6 
 

core.git: Branch 'libreoffice-24-2' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 32921f8ae0aea6d724a80974f2b213c799175ab5
Author: Christian Lohmaier 
AuthorDate: Mon Apr 29 20:15:20 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 29 20:15:20 2024 +0200

Update git submodules

* Update translations from branch 'libreoffice-24-2'
  to 64792214d2d89afc019f94ca29ff7a2c2a17ab39
  - update translations for 24.2.3 rc2

and force-fix errors using pocheck

Change-Id: Ia1b6ca2a6abad23632aafb021c8bba19a20e1a7b

diff --git a/translations b/translations
index 3e215b586e92..64792214d2d8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3e215b586e927288b92725d456b4dd7fd54dee85
+Subproject commit 64792214d2d89afc019f94ca29ff7a2c2a17ab39

translations.git: Branch 'libreoffice-24-2' - source/ab source/an source/ast source/bg source/ca source/cs source/da source/de source/dsb source/es source/fi source/fr source/gl source/gug source/hr s

[Christian Lohmaier (via logerrit)]

 source/ab/filter/messages.po   |8 
 source/ab/svx/messages.po  |   10 
 source/an/cui/messages.po  |   18 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  |4 
 source/an/reportdesign/messages.po |6 
 source/an/sd/messages.po   |8 
 source/an/shell/source/win32/shlxthandler/res.po   |8 
 source/an/sw/messages.po   |4 
 source/ast/chart2/messages.po  |8 
 source/ast/cui/messages.po |   23 
 source/ast/dbaccess/messages.po|8 
 source/ast/extensions/messages.po  |   49 
 source/ast/extras/source/autocorr/emoji.po |  178 -
 source/ast/filter/messages.po  |4 
 source/ast/helpcontent2/source/text/sbasic/guide.po|8 
 source/ast/helpcontent2/source/text/sbasic/shared.po   |8 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po|4 
 source/ast/helpcontent2/source/text/scalc/00.po|   44 
 source/ast/helpcontent2/source/text/scalc/01.po|   46 
 source/ast/helpcontent2/source/text/scalc/guide.po |   12 
 source/ast/helpcontent2/source/text/sdatabase.po   |   24 
 source/ast/helpcontent2/source/text/sdraw/00.po|8 
 source/ast/helpcontent2/source/text/sdraw/guide.po |4 
 source/ast/helpcontent2/source/text/shared/00.po   |   18 
 source/ast/helpcontent2/source/text/shared/01.po   |   64 
 source/ast/helpcontent2/source/text/shared/02.po   |8 
 source/ast/helpcontent2/source/text/shared/04.po   |   14 
 source/ast/helpcontent2/source/text/shared/autopi.po   |   10 
 source/ast/helpcontent2/source/text/shared/guide.po|   16 
 source/ast/helpcontent2/source/text/shared/menu.po |   20 
 source/ast/helpcontent2/source/text/shared/optionen.po |6 
 source/ast/helpcontent2/source/text/simpress.po|4 
 source/ast/helpcontent2/source/text/simpress/00.po |8 
 source/ast/helpcontent2/source/text/simpress/01.po |4 
 source/ast/helpcontent2/source/text/simpress/guide.po  |6 
 source/ast/helpcontent2/source/text/smath/00.po|4 
 source/ast/helpcontent2/source/text/swriter/00.po  |6 
 source/ast/helpcontent2/source/text/swriter/02.po  |6 
 source/ast/helpcontent2/source/text/swriter/librelogo.po   |4 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |   71 
 source/ast/reportdesign/messages.po|6 
 source/ast/sc/messages.po  |   17 
 source/ast/sd/messages.po  |7 
 source/ast/svx/messages.po |   22 
 source/ast/sw/messages.po  |9 
 source/ast/wizards/source/resources.po |8 
 source/bg/cui/messages.po  |6 
 source/bg/framework/messages.po|8 
 source/bg/helpcontent2/source/text/sbasic/shared.po|4 
 source/bg/helpcontent2/source/text/scalc/guide.po  |   10 
 source/bg/helpcontent2/source/text/shared/02.po|4 
 source/bg/helpcontent2/source/text/shared/04.po|8 
 source/bg/helpcontent2/source/text/shared/menu.po  |   12 
 source/bg/helpcontent2/source/text/shared/optionen.po  |8 
 source/bg/helpcontent2/source/text/swriter/00.po   |  446 ++--
 source/bg/helpcontent2/source/text/swriter/01.po   |  344 +--
 source/bg/helpcontent2/source/text/swriter/02.po   |  122 -
 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po  |4 
 source/bg/sc/messages.po   |   12 
 source/bg/sfx2/messages.po |8 
 source/bg/sw/messages.po   |8 
 source/bg/xmlsecurity/messages.po  |   12 
 source/ca/connectivity/messages.po |   10 
 source/ca/cui/messages.po  |6 
 source/ca/dbaccess/messages.po |6 
 

core.git: config_host.mk.in configure.ac

[Christian Lohmaier (via logerrit)]

 config_host.mk.in |6 +++---
 configure.ac  |   12 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 9d7548dafb44c1f0af82771a597db1404659af66
Author: Christian Lohmaier 
AuthorDate: Fri Apr 26 13:03:49 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Sat Apr 27 10:16:39 2024 +0200

fix some hardcoded use of wsl.exe and fix some typos

Change-Id: I6152ee61913638f828eeb201ecb26312de5f8572
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166737
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/config_host.mk.in b/config_host.mk.in
index 70d73f0a32f5..3ffe88380180 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -792,8 +792,8 @@ include @SRC_ROOT@/download.lst
 
 KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@
 
-# prep for WSL-as-helper-builds where build runs from within git-bash/MSYS 
that would otherwise
-# messes with anything that looks like a path (starts with /) but it cannot 
resolve
+# used for WSL-as-helper-builds where the build runs from within git-bash/MSYS 
that otherwise would
+# mess with anything that looks like a path (starts with a /) but cannot be 
resolved to a target
 export MSYS_NO_PATHCONV=1
 STRAWBERRY_PERL=@STRAWBERRY_PERL@
-WSL=@WSL@
\ No newline at end of file
+WSL=@WSL@
diff --git a/configure.ac b/configure.ac
index 1650686382ef..e04f4a846642 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,7 +337,8 @@ if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q 
mingw64); then
 STRAWBERRY_PERL="$formatted_path/perl/bin/perl.exe"
 AC_ARG_WITH([wsl-command],
 [AS_HELP_STRING([--with-wsl-command],
-[Specify your wsl distro command if it isn't the default/the one 
used with just wsl.exe])],
+[Specify your wsl distro command if it isn't the default/the one 
used with just wsl.exe –
+ for example: wsl.exe -d MyDistro -u NonDefaultUser])],
 [],
 [with_wsl_command="wsl.exe"])
 WSL="$with_wsl_command"
@@ -15468,10 +15469,11 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
 PERL="perl.exe"
 # use flex, gperf and nasm from wsl-container
 # if using absolute path, would need to use double-leading slash for the 
msys path mangling
-FLEX="wsl.exe $FLEX"
-NASM="wsl.exe $NASM"
-# some externals (libebook) checks with AC_PATH_PROGS, and that requires 
argument to begin with slash...
-GPERF="/c/Windows/system32/wsl.exe gperf"
+FLEX="$WSL $FLEX"
+NASM="$WSL $NASM"
+# some externals (libebook) check for it with AC_PATH_PROGS, and that only 
accepts overrides
+# with an absolute path/requires the value to begin with a slash
+GPERF="/c/Windows/system32/$WSL gperf"
 # append strawberry tools dir to PATH (for e.g. windres, ar)
 LO_PATH="$LO_PATH:$STRAWBERRY_TOOLS"
 # temp-dir needs to be in windows realm, hardcode for now

core.git: config_host.mk.in configure.ac Makefile.in

[Christian Lohmaier (via logerrit)]

 Makefile.in   |   16 
 config_host.mk.in |2 ++
 configure.ac  |   41 +
 3 files changed, 51 insertions(+), 8 deletions(-)

New commits:
commit f5c3ec505b83a20d272a66305bca565e9ff38b04
Author: Christian Lohmaier 
AuthorDate: Fri Apr 26 14:49:59 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 23:10:22 2024 +0200

add --with-keep-awake switch to prevent going into sleep/suspend

if used defaults to Awake for Windows and caffeinate for macOS

Change-Id: I35f41bf1fb63af05ce2ec1a7f4d7b50b310536a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166743
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/Makefile.in b/Makefile.in
index f55e92c94405..ac3e8aafb529 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,19 +91,19 @@ define gb_Top_GbuildModuleRules
 .PHONY: $(1).allbuild $(1).buildall $(1).allcheck $(1).checkall
 
 $(1): bootstrap fetch
-   cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS)
+   $(KEEP_AWAKE_CMD) cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) 
$(GMAKE_OPTIONS)
 
 $(1).build $(1).check $(1).coverage $(foreach 
target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)): bootstrap fetch
-   cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
+   $(KEEP_AWAKE_CMD) cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) 
$(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
 
 $(1).clean $(1).showdeliverables:
cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) 
$$(patsubst $(1).%,%,$$@)
 
 $(1).allbuild $(1).buildall: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1)
+   $(KEEP_AWAKE_CMD) $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1)
 
 $(1).allcheck $(1).checkall: bootstrap fetch
-   $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1)
+   $(KEEP_AWAKE_CMD) $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) 
$(WORKDIR)/Module/slowcheck/$(1)
 
 $(1).all:
@echo "'make $(1).all' was renamed to 'make $(1).allcheck' (or use 
'make $(1).allbuild' to build without unit tests)"
@@ -170,10 +170,10 @@ gbuild_TARGETS := AllLangHelp \
 
 # build a generic gbuild target
 $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach 
module,$(gbuild_modules),$(target)_$(module)/%)) UIConfig_modules/% %.genpatch: 
bootstrap fetch
-   $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
+   $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
 
 $(gbuild_TARGETS):
-   $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
+   $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
 
 #
 # Clean
@@ -291,9 +291,9 @@ bootstrap: check-if-root compilerplugins
 #
 build: bootstrap fetch $(if 
$(CROSS_COMPILING),cross-toolset,install-gdb-printers) \
 $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if 
$(LODE_HOME),clang-format-check)))
-   $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(build_goal)
+   $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) 
$(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
 ifeq ($(OS),iOS)
-   $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
+   $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
 endif
 
 build-non-l10n-only build-l10n-only check debugrun translations packageinfo 
coverage $(gb_Top_MODULE_CHECK_TARGETS): build
diff --git a/config_host.mk.in b/config_host.mk.in
index 1d5480bacf61..70d73f0a32f5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -790,6 +790,8 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk
 # does use some of the variables defined above
 include @SRC_ROOT@/download.lst
 
+KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@
+
 # prep for WSL-as-helper-builds where build runs from within git-bash/MSYS 
that would otherwise
 # messes with anything that looks like a path (starts with /) but it cannot 
resolve
 export MSYS_NO_PATHCONV=1
diff --git a/configure.ac b/configure.ac
index 4263116f894b..1650686382ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2810,6 +2810,13 @@ AC_ARG_WITH(gtk3-build,
 [(Windows-only) In order to build GtkTiledViewer on Windows, pass the 
path
  to a GTK3 build, like 
'--with-gtk3-build=C:/gtk-build/gtk/x64/release'.]))
 
+AC_ARG_WITH(keep-awake,
+AS_HELP_STRING([--with-keep-awake],
+[command to prefix make with in order to prevent the system from going 
to sleep/suspend
+ while 

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/Trace.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1e5496e4daf469840d5bcc31fede4d4d66aebfe
Author: Christian Lohmaier 
AuthorDate: Fri Apr 26 14:53:17 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 21:44:23 2024 +0200

gbuild trace: disable flock for wsl-as-helper case

Change-Id: Ie5db3fcc6fccedb214aec472852d8d82813fb984
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166744
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
index a92f842e1dec..d1cba301469e 100644
--- a/solenv/gbuild/Trace.mk
+++ b/solenv/gbuild/Trace.mk
@@ -37,7 +37,7 @@ ifneq ($(gb_TRACE),)
 gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date 
+%s)0,$$(date +%s%N))
 # macOS also doesn't provide flock, so skip that part on mac
 # The (flock;cat) part is to minimize lock time.
-gb_Trace_Flock := $(if $(filter MACOSX,$(OS)),,| ( flock 1; cat ))
+gb_Trace_Flock := $(if $(MSYSTEM)$(filter MACOSX,$(OS)),,| ( flock 1; cat ))
 # call gb_Trace_AddMark,marktype,detail,type,extra
 define gb_Trace__AddMark
 echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": 
$(gb_Trace_Timestamp),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," 
$(gb_Trace_Flock) >>$(gb_TRACE)

core.git: filter/Configuration_filter.mk

[Christian Lohmaier (via logerrit)]

 filter/Configuration_filter.mk |   24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

New commits:
commit aabf18d56194405b28afcd814c41bbba73f5e9b9
Author: Christian Lohmaier 
AuthorDate: Sun Apr 21 22:15:14 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 15:02:37 2024 +0200

Configuration_filter.mk: create RESPONSEFILEs using gb_var2file

using echo ... | sed won't help with command-line limits and doing the
simple substitution by make saves spawning a few sed processes

Change-Id: I4ee81d26b3df18ebf82140f00c823cb7543cac1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166411
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index b2d3b09689f0..42ebab575cd3 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -39,9 +39,7 @@ $(call gb_XcuFilterTypesTarget_get_target,%) : 
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FIT)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   RESPONSEFILE=`$(gb_MKTEMP)` && \
-   echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
-   | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
+   RESPONSEFILE=$(call gb_var2file,$(shell 
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(basename $(notdir $(filter 
%.xcu,$^) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -82,9 +80,7 @@ $(call gb_XcuFilterFiltersTarget_get_target,%) : 
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FIF)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   RESPONSEFILE=`$(gb_MKTEMP)` && \
-   echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
-   | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
+   RESPONSEFILE=$(call gb_var2file,$(shell 
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(basename $(notdir $(filter 
%.xcu,$^) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -115,12 +111,8 @@ $(call gb_XcuFilterOthersTarget_get_target,%) : 
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FIO)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   RESPONSEFILE=`$(gb_MKTEMP)` && \
-   RESPONSEFILE2=`$(gb_MKTEMP)` && \
-   echo "items=$(strip $(foreach xcu,$(filter %.xcu,$^),$(if 
$(filter frameloaders,$(notdir $(patsubst %/,%,$(dir $(xcu),$(basename 
$(notdir $(xcu),)" \
-   | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
-   echo "items=$(strip $(foreach xcu,$(filter %.xcu,$^),$(if 
$(filter contenthandlers,$(notdir $(patsubst %/,%,$(dir $(xcu),$(basename 
$(notdir $(xcu),)" \
-   | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE2} && \
+   RESPONSEFILE=$(call gb_var2file,$(shell 
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(strip $(foreach 
xcu,$(filter %.xcu,$^),$(if $(filter frameloaders,$(notdir $(patsubst 
%/,%,$(dir $(xcu),$(basename $(notdir $(xcu),))) && \
+   RESPONSEFILE2=$(call gb_var2file,$(shell 
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(strip $(foreach 
xcu,$(filter %.xcu,$^),$(if $(filter contenthandlers,$(notdir $(patsubst 
%/,%,$(dir $(xcu),$(basename $(notdir $(xcu),))) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -151,9 +143,7 @@ $(call gb_XcuFilterInternalTarget_get_target,%) : 
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FII)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   RESPONSEFILE=`$(gb_MKTEMP)` && \
-   echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
-   | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
+   RESPONSEFILE=$(call gb_var2file,$(shell 
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(basename $(notdir $(filter 
%.xcu,$^) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -199,9 +189,7 @@ $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),FIU)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-   

core.git: 2 commits - external/gpgmepp external/icu external/libassuan external/openssl

[Christian Lohmaier (via logerrit)]

 external/gpgmepp/ExternalProject_gpgmepp.mk |2 +-
 external/icu/ExternalProject_icu.mk |2 +-
 external/libassuan/ExternalProject_libassuan.mk |2 +-
 external/openssl/ExternalProject_openssl.mk |3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 84c80da9751c2d89655b0cfdda2f7ad581d1b15e
Author: Christian Lohmaier 
AuthorDate: Fri Apr 19 11:39:58 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:02:29 2024 +0200

use strawberry perl in wsl-as-helper case for openssl

it needs modules that are not available in git-bash perl, and strawberry
perl is already used as a way to get windres and similar utilities
Might want to revisit that to streamline the dependencies

Change-Id: Ieb1c83831292677e9930d376d9d71283c6a1140e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166342
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index 048158700f84..910c957484c4 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -62,11 +62,12 @@ OPENSSL_PLATFORM := \
 ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalProject_use_nmake,openssl,build))
 
+$(call gb_ExternalProject_get_state_target,openssl,build): export PERL:=$(if 
$(MSYSTEM),$(STRAWBERRY_PERL),$(shell cygpath -m $(PERL)))
+
 $(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_Trace_StartRange,openssl,EXTERNAL)
$(call gb_ExternalProject_run,build,\
CONFIGURE_INSIST=1 $(PERL) Configure $(OPENSSL_PLATFORM) 
no-tests no-multilib \
-   && export PERL="$(shell cygpath -w $(PERL))" \
&& nmake -f makefile \
$(if $(call 
gb_Module__symbols_enabled,openssl),DEBUG_FLAGS_VALUE="$(gb_DEBUGINFO_FLAGS)") \
)
commit b77bcf2838e2ab233c61cff8237f2847bd910dcb
Author: Christian Lohmaier 
AuthorDate: Wed Aug 2 14:55:44 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:02:20 2024 +0200

run autoconf/autoreconf via wsl in wsl-as-helper case

Change-Id: I9bcdfe352fd378e1bf09e15b8d8f7dcea82c0b5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166341
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk 
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index a58717fe3adb..d2733bf21b49 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): 
$(call gb_Executable_
$(call gb_Trace_StartRange,gpgmepp,EXTERNAL)
$(call gb_ExternalProject_run,build, \
$(gb_WIN_GPG_cross_setup_exports) \
-   && autoreconf \
+   && $(WSL) autoreconf \
&& $(gb_RUN_CONFIGURE) ./configure \
   $(gb_CONFIGURE_PLATFORMS) \
   --disable-shared \
diff --git a/external/icu/ExternalProject_icu.mk 
b/external/icu/ExternalProject_icu.mk
index 5388eee58983..cd4bc99ab1a3 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -20,7 +20,7 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_Trace_StartRange,icu,EXTERNAL)
$(call gb_ExternalProject_run,build,\
-   autoconf -f \
+   $(WSL) autoconf -f \
&& export LIB="$(ILIB)" PYTHONWARNINGS="default" \
gb_ICU_XFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS) 
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD -Gy)" \
&& CFLAGS="$${gb_ICU_XFLAGS}" CPPFLAGS="$(SOLARINC)" 
CXXFLAGS="$${gb_ICU_XFLAGS}" \
diff --git a/external/libassuan/ExternalProject_libassuan.mk 
b/external/libassuan/ExternalProject_libassuan.mk
index 9b972a55fc27..d73935b212e4 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): 
$(call gb_Executabl
$(call gb_Trace_StartRange,libassuan,EXTERNAL)
$(call gb_ExternalProject_run,build,\
  $(gb_WIN_GPG_cross_setup_exports) \
- && autoreconf \
+ && $(WSL) autoreconf \
  && $(gb_RUN_CONFIGURE) ./configure \
--enable-static \
--disable-shared \

core.git: 2 commits - odk/CustomTarget_doxygen.mk solenv/gbuild

[Christian Lohmaier (via logerrit)]

 odk/CustomTarget_doxygen.mk |   36 
 solenv/gbuild/LinkTarget.mk |7 ++
 solenv/gbuild/platform/com_MSC_class.mk |3 --
 3 files changed, 22 insertions(+), 24 deletions(-)

New commits:
commit d5897420b0df5222ef87dce60668df902a5e279a
Author: Christian Lohmaier 
AuthorDate: Wed Aug 2 16:19:19 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:02:11 2024 +0200

run bison, flex and nasm via wsl in wsl-as-helper case

Change-Id: Ic3e82b72605cd0b5458bd31ab5ff5285adb3db75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166340
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f4d15f411516..e054cffb4c85 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -499,9 +499,8 @@ endef
 
 #  gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target, 
source-target)
 define gb_LexTarget__command
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
-   $(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) )
+   $(call gb_Helper_wsl_path,$(FLEX) $(T_LEXFLAGS) -o$(4) $(1)) && touch 
$(3)
 endef
 
 
@@ -647,8 +646,8 @@ $(call gb_GenNasmObject_get_target,%) :
$(call gb_Trace_StartRange,$*,ASM)
test -f $(call gb_GenNasmObject_get_source,$*) || (echo "Missing 
generated source file $(call gb_GenNasmObject_get_source,$*)" && false)
mkdir -p $(dir $@) $(dir $(call gb_GenNasmObject_get_dep_target,$*)) && 
cd $(SRCDIR) && \
-   $(NASM) $(T_NASMFLAGS) $(T_NASMFLAGS_APPEND) -I$(dir $(call 
gb_GenNasmObject_get_source,$*)) \
-   $(call gb_GenNasmObject_get_source,$*) -o $@ && \
+   $(call gb_Helper_wsl_path,$(NASM) $(T_NASMFLAGS) 
$(T_NASMFLAGS_APPEND) -I$(dir $(call gb_GenNasmObject_get_source,$*)) \
+   $(call gb_GenNasmObject_get_source,$*) -o $@) && \
echo "$@ : $(call gb_GenNasmObject_get_source,$*)" > $(call 
gb_GenNasmObject_get_dep_target,$*)
$(call gb_Trace_EndRange,$*,ASM)
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 7e6b5e8d3b57..5424da11d75c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -26,9 +26,8 @@ endef
 
 define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
-   $(BISON) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
+   $(call gb_Helper_wsl_path,$(WSL) $(BISON) $(T_YACCFLAGS) --defines=$(4) 
-o $(5) $(1)) && touch $(3)
 
 endef
 
commit f7fe6a0bed2c2aee19535a26181a2edfb103e587
Author: Christian Lohmaier 
AuthorDate: Tue Jul 11 16:48:24 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:02:00 2024 +0200

run doxygen via wsl in wsl-as-helper case

Change-Id: I534bcc8b07aea1637a3aea01cd1c5da998833a4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166339
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index a693adebde34..cc848699d73b 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -22,13 +22,13 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Type.h \
com/sun/star/uno/Type.hxx
 
-# Cygwin Doxygen needs unix paths
-odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1))
-odk_cpp_PREFIX := $(INSTDIR)/$(SDKDIRNAME)/include/
-odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \
+# Cygwin Doxygen needs unix paths, wsl-as-helper needs paths into windows-realm
+odk_cygwin_path = $(if $(MSYSTEM),$(call gb_Helper_wsl_path,$(1)),$(call 
gb_Helper_cyg_path,$(1)))
+odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/)
+odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \
$(SRCDIR)/include/sal/log-areas.dox \
-   $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) 
$(odk_cpp_INCFILELIST))
-odk_cpp_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref
+   $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) 
$(odk_cpp_INCFILELIST)))
+odk_cpp_DOXY_WORKDIR := $(call odk_cygwin_path,$(call 
gb_CustomTarget_get_workdir,odk/docs/cpp)/ref)
 
 $(eval $(call gb_CustomTarget_register_targets,odk/docs,\
cpp/Doxyfile \
@@ -40,12 +40,12 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : 
\
$(gb_Module_CURRENTMAKEFILE)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
-   sed -e 's!^INPUT = %$$!INPUT = $(call 
odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \
-   -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call 
odk_cygwin_path,$(odk_cpp_DOXY_WORKDIR))!' \
+   sed -e 

core.git: 2 commits - config_host.mk.in configure.ac external/liblangtag Makefile.in solenv/bin solenv/gbuild

[Christian Lohmaier (via logerrit)]

 Makefile.in   |   10 +
 config_host.mk.in |4 
 configure.ac  |  123 +++---
 external/liblangtag/UnpackedTarball_liblangtag.mk |2 
 solenv/bin/shortpath.cmd  |1 
 solenv/gbuild/Helper.mk   |   36 ++
 solenv/gbuild/UnpackedTarball.mk  |2 
 solenv/gbuild/platform/com_MSC_defs.mk|8 -
 8 files changed, 164 insertions(+), 22 deletions(-)

New commits:
commit 9c6eece2c427473fafb41d9b5ee66e93363ecc8f
Author: Christian Lohmaier 
AuthorDate: Tue Jul 11 18:37:29 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:01:36 2024 +0200

extracting tarballs that call helpers to uncompress require unix-style paths

Change-Id: I528e343fb5b22194b4639649fbfc04c0583f77c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166336
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk 
b/external/liblangtag/UnpackedTarball_liblangtag.mk
index 16b9ea999f71..40102052a79c 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,liblangtag))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,liblangtag,$(LIBLANGTAG_TARBALL),,liblangtag))
 
 $(eval $(call gb_UnpackedTarball_set_pre_action,liblangtag,\
-   $(GNUTAR) -x -j -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
+   $(GNUTAR) -x -j -f $(call 
gb_Helper_cyg_path,$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL)) 
\
 ))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liblangtag))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index fb574f6a95f1..4419dd172870 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -24,7 +24,7 @@ $(GNUTAR) \
$(3) \
-C $(UNPACKED_DIR) \
$(STRIP_COMPONENTS)=$(UNPACKED_STRIP_COMPONENTS) \
-   -f $(UNPACKED_TARBALL)
+   -f $(call gb_Helper_cyg_path,$(UNPACKED_TARBALL))
 endef
 
 define gb_UnpackedTarget__command_unzip
commit 4c86718e78c6b18c84774e48ca025694364c251a
Author: Christian Lohmaier 
AuthorDate: Thu Apr 18 12:45:01 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:01:26 2024 +0200

initial support for running autogen.sh inside wsl from git-bash

Change-Id: I4272ea817a48880fd4206d6c73add7ccb8c4f6c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166335
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/Makefile.in b/Makefile.in
index ab7090ee1e77..f55e92c94405 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,6 +38,11 @@ Makefile $(BUILDDIR)/Makefile: $(BUILDDIR)/config_host.mk 
$(BUILDDIR)/config_hos
@touch $@
 
 # run configure in an environment not polluted by config_host.mk
+ifneq ($(MSYSTEM),)
+WSL:=@WSL@
+# wsl needs unix-style path into windows realm
+$(BUILDDIR)/config_host.mk : SRCDIR:=/$(shell $(WSL) wslpath -u $(SRCDIR))
+endif
 $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/autogen.sh \
$(SRCDIR)/config_host.mk.in \
@@ -51,9 +56,8 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
) \
-   $(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
-   if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/bin"; 
then echo force-restart; fi)
-   sh -c $(SRCDIR)/autogen.sh
+   $(shell if test -n '$(JAVA_HOME)' -a ! -d '$(JAVA_HOME)'; then 
echo force-restart; fi)
+   sh -c "$(if $(MSYSTEM),$(WSL) )$(SRCDIR)/autogen.sh"
 
 else # MAKE_RESTARTS
 
diff --git a/config_host.mk.in b/config_host.mk.in
index c1cd96717707..1d5480bacf61 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -792,4 +792,6 @@ include @SRC_ROOT@/download.lst
 
 # prep for WSL-as-helper-builds where build runs from within git-bash/MSYS 
that would otherwise
 # messes with anything that looks like a path (starts with /) but it cannot 
resolve
-export MSYS_NO_PATHCONV=1
\ No newline at end of file
+export MSYS_NO_PATHCONV=1
+STRAWBERRY_PERL=@STRAWBERRY_PERL@
+WSL=@WSL@
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 46430707a313..cf14c248e948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ SCPDEFS=""
 GIT_NEEDED_SUBMODULES=""
 LO_PATH= # used by path_munge to construct a PATH variable
 
+
 FilterLibs()
 {
 # Return value: $filteredlibs
@@ -191,6 +192,19 @@ PathFormat()
 # But Cygwin can
 formatted_path_unix="$formatted_path"
 fi
+if test -n "$WSL_ONLY_AS_HELPER"; then
+# if already in unix format, switch to windows format to create 
shortened path

core.git: 2 commits - cli_ure/CustomTarget_cli_ure_assemblies.mk configure.ac editeng/CustomTarget_generated.mk filter/CustomTarget_svg.mk solenv/gbuild sw/CustomTarget_generated.mk

[Christian Lohmaier (via logerrit)]

 cli_ure/CustomTarget_cli_ure_assemblies.mk |   43 ++---
 configure.ac   |   15 ++
 editeng/CustomTarget_generated.mk  |5 +--
 filter/CustomTarget_svg.mk |3 --
 solenv/gbuild/CustomTarget.mk  |2 -
 sw/CustomTarget_generated.mk   |3 --
 6 files changed, 30 insertions(+), 41 deletions(-)

New commits:
commit f618f08cc310f20e2888cf4e5e99cfeb8fbd15b7
Author: Christian Lohmaier 
AuthorDate: Sun Apr 21 21:50:55 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:01:19 2024 +0200

simplify some sed rules/statements and use proper quoting

make removes partially built targets in case the rule exits with
non-zero status, so creating a temp file and moving it is not necessary
also use single quotes for cases where characters might be interpreted
by the shell
Also combine multiple sed calls into a single call of sed with multiple
expressions and replace additional "grep -v foo" with corresponding sed
delete command

Change-Id: Iff7e3b962175e347e5ed100a87c96fbaeef39985
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166410
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk 
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 260a52b25fec..266df95f2706 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -19,37 +19,24 @@ $(call gb_CustomTarget_get_target,cli_ure/source) : \
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : \
-   $(SRCDIR)/cli_ure/source/basetypes/assembly.cs \
-   $(SRCDIR)/cli_ure/version/version.txt \
-   $(cli_ure_source_MAKEFILE) \
-   | $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir
+$(SRCDIR)/cli_ure/source/basetypes/assembly.cs \
+$(SRCDIR)/cli_ure/version/version.txt \
+$(cli_ure_source_MAKEFILE) \
+| $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir
+   sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" 
$< > $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : \
-   $(SRCDIR)/cli_ure/source/native/assembly.cxx \
-   $(SRCDIR)/cli_ure/version/version.txt \
-   $(cli_ure_source_MAKEFILE) \
-   | $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir
+$(SRCDIR)/cli_ure/source/native/assembly.cxx \
+$(SRCDIR)/cli_ure/version/version.txt \
+$(cli_ure_source_MAKEFILE) \
+| $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir
+   sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" 
$< > $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
-   $(SRCDIR)/cli_ure/source/ure/assembly.cs \
-   $(SRCDIR)/cli_ure/version/version.txt \
-   $(cli_ure_source_MAKEFILE) \
-   | $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
-
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
-   sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" \
-   < $< > $@.tmp && \
-   mv $@.tmp $@
-
-# TODO use macros for this
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
-   sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" 
\
-   < $< > $@.tmp && \
-   mv $@.tmp $@
-
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
-   sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" \
-   < $< > $@.tmp && \
-   mv $@.tmp $@
+$(SRCDIR)/cli_ure/source/ure/assembly.cs \
+$(SRCDIR)/cli_ure/version/version.txt \
+$(cli_ure_source_MAKEFILE) \
+| $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
+   sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" $< > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/editeng/CustomTarget_generated.mk 
b/editeng/CustomTarget_generated.mk
index 77fb4f7bf383..8f05f6ccb23b 100644
--- a/editeng/CustomTarget_generated.mk
+++ b/editeng/CustomTarget_generated.mk
@@ -19,9 +19,8 @@ $(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : 
$(editeng_SRC)/tokens.tx
$(call gb_ExternalExecutable_get_command,python) $(editeng_PY) 
$(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf
 
 $(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf
-   $(GPERF) --compare-strncmp --readonly-tables 
--output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf
-   sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e 
"s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx
-   sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d" 
$(editeng_INC)/tokens.cxx
+   $(GPERF) 

core.git: 2 commits - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |  118 +--
 1 file changed, 59 insertions(+), 59 deletions(-)

New commits:
commit d9d976cd0ab0b52647e562d5c9cc3e492f71ee5d
Author: Christian Lohmaier 
AuthorDate: Thu Apr 18 12:56:50 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:01:00 2024 +0200

use unix paths for dir tests and prefer PathFormat…

over manual cygpath calls. Since PathFormat checks whether the path is
8.3 compatible/in case of spaces or other incompatible characters remove
some superfluous checks
also drop a workaround for VS2017 (minimum requried version is 2019)

Change-Id: I2d098cf323c96862c06acf7605abacbefe8a35ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166333
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 7aa526693862..554ccc8bc683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4142,7 +4142,8 @@ win_get_env_from_vsdevcmdbat()
 {
 local WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
 printf '@set VSCMD_SKIP_SENDTELEMETRY=1
' > $WRAPPERBATCHFILEPATH
-printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo
' "$(cygpath -w $VC_PRODUCT_DIR)" >> $WRAPPERBATCHFILEPATH
+PathFormat "$VC_PRODUCT_DIR"
+printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo
' "$formatted_path" >> $WRAPPERBATCHFILEPATH
 # use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting 
"ECHO is off." in case when ENV is empty or a space
 printf '@setlocal
@echo.%%%s%%
@endlocal
' "$1" >> $WRAPPERBATCHFILEPATH
 local result
@@ -4177,7 +4178,7 @@ find_ucrt()
 ide_env_file="${ide_env_dir}VsDevCmd.bat"
 if test -f "$ide_env_file"; then
 PathFormat "$(win_get_env_from_vsdevcmdbat UniversalCRTSdkDir)"
-UCRTSDKDIR=$formatted_path
+UCRTSDKDIR=$formatted_path_unix
 UCRTVERSION=$(win_get_env_from_vsdevcmdbat UCRTVersion)
 dnl Hack needed at least by tml:
 if test "$UCRTVERSION" = 10.0.15063.0 \
@@ -4371,9 +4372,9 @@ if test "$_os" = "WINNT"; then
 fi
 
 # Find the version of devenv.exe
-# MSVC 2017 devenv does not start properly from a DOS 8.3 path
-DEVENV=$(cygpath -lm "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe")
-DEVENV_unix=$(cygpath -u "$DEVENV")
+PathFormat "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
+DEVENV="$formatted_path"
+DEVENV_unix="$formatted_path_unix"
 if test ! -e "$DEVENV_unix"; then
 AC_MSG_WARN([No devenv.exe found - this is expected for VC++ Build 
Tools])
 fi
@@ -4398,11 +4399,10 @@ if test "$_os" = "WINNT"; then
 # Remove /cl.exe from CC case insensitive
 AC_MSG_NOTICE([found Visual C++ $vcyear])
 
-main_include_dir=`cygpath -d -m "$COMPATH/Include"`
-CPPFLAGS="$CPPFLAGS -I$main_include_dir"
-
 PathFormat "$COMPATH"
-COMPATH=`win_short_path_for_make "$formatted_path"`
+COMPATH="$formatted_path"
+COMPATH_unix="$formatted_path_unix"
+CPPFLAGS="$CPPFLAGS -I$COMPATH/Include"
 
 VCVER=$vcnumwithdot
 VCTOOLSET=$vctoolset
@@ -6733,15 +6733,10 @@ find_winsdk_version()
 winsdkbinsubdir="$regvalue".0
 winsdklibsubdir=$winsdkbinsubdir
 local tmppath="$winsdktest\Include\$winsdklibsubdir"
-local tmppath_unix=$(cygpath -u "$tmppath")
+PathFormat "$tmppath"
+local tmppath_unix=$formatted_path_unix
 # test exist the SDK path
-if test -d "$tmppath_unix"; then
-   # when path is convertible to a short path then path is okay
-   cygpath -d "$tmppath" >/dev/null 2>&1
-   if test $? -ne 0; then
-  AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see 
NtfsDisable8dot3NameCreation])
-   fi
-else
+if test ! -d "$tmppath_unix"; then
AC_MSG_ERROR([The Windows SDK not found, check the 
installation])
 fi
 fi
@@ -6847,8 +6842,8 @@ if test "$_os" = "WINNT"; then
 
 # normalize if found
 if test -n "$WINDOWS_SDK_HOME"; then
-WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
-WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+PathFormat "$WINDOWS_SDK_HOME"
+WINDOWS_SDK_HOME=$formatted_path_unix
 fi
 
 WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
@@ -6916,9 +6911,9 @@ the  Windows SDK are installed.])
 WINDOWS_SDK_HOME_unix="$formatted_path_unix"
 if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
 SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/Include"
-if test -d "$WINDOWS_SDK_HOME/include/um"; then
+if test -d "$WINDOWS_SDK_HOME_unix/include/um"; then
 SOLARINC="$SOLARINC 

core.git: 2 commits - config_host.mk.in external/beanshell external/hsqldb external/java_websocket external/jfreereport external/libcdr external/libebook external/libepubgen external/libfreehand exter

[Christian Lohmaier (via logerrit)]

 config_host.mk.in |4 +
 external/beanshell/ExternalProject_beanshell.mk   |2 
 external/hsqldb/ExternalProject_hsqldb.mk |2 
 external/java_websocket/ExternalProject_java_websocket.mk |2 
 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk   |2 
 external/jfreereport/ExternalProject_jfreereport_flute.mk |2 
 external/jfreereport/ExternalProject_jfreereport_libbase.mk   |2 
 external/jfreereport/ExternalProject_jfreereport_libfonts.mk  |2 
 external/jfreereport/ExternalProject_jfreereport_libformula.mk|2 
 external/jfreereport/ExternalProject_jfreereport_liblayout.mk |2 
 external/jfreereport/ExternalProject_jfreereport_libloader.mk |2 
 external/jfreereport/ExternalProject_jfreereport_librepository.mk |2 
 external/jfreereport/ExternalProject_jfreereport_libserializer.mk |2 
 external/jfreereport/ExternalProject_jfreereport_libxml.mk|2 
 external/jfreereport/ExternalProject_jfreereport_sac.mk   |2 
 external/libcdr/ExternalProject_libcdr.mk |2 
 external/libebook/ExternalProject_libebook.mk |2 
 external/libepubgen/ExternalProject_libepubgen.mk |2 
 external/libfreehand/ExternalProject_libfreehand.mk   |2 
 external/liblangtag/ExternalProject_liblangtag.mk |2 
 external/libqxp/ExternalProject_libqxp.mk |2 
 external/libvisio/ExternalProject_libvisio.mk |2 
 external/libzmf/ExternalProject_libzmf.mk |2 
 solenv/bin/modules/installer.pm   |2 
 solenv/bin/modules/installer/control.pm   |4 +
 solenv/bin/modules/installer/globals.pm   |2 
 solenv/bin/modules/installer/parameter.pm |1 
 solenv/bin/modules/installer/windows/msiglobal.pm |   21 
+-
 28 files changed, 43 insertions(+), 35 deletions(-)

New commits:
commit a97d983b501b28a2b5a9387efb6206b50097ffa1
Author: Christian Lohmaier 
AuthorDate: Fri Apr 19 14:54:12 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 26 14:00:43 2024 +0200

don't throw away command output when packaging installsets

and adjust installer to work with MSWin-style perl (like strawberry
perl)

Change-Id: I9305c7cb6ef72560bbf77626f113f3ee439b3ef3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166331
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 8c5c275adb91..5f9214e09e88 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -580,8 +580,6 @@ sub run {
 
 
installer::scriptitems::changing_name_of_language_dependent_keys($filesinproductlanguageresolvedarrayref);
 
-if ( $installer::globals::iswin and $^O =~ /MSWin/i ) { 
installer::converter::convert_slash_to_backslash($filesinproductlanguageresolvedarrayref);
 }
-
 $filesinproductlanguageresolvedarrayref = 
installer::scriptitems::remove_non_existent_languages_in_productlists($filesinproductlanguageresolvedarrayref,
 $languagestringref, "Name", "file");
 
 
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref,
 $dirsinproductarrayref);
diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index d126e917b57f..4faff4f39b9f 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -87,6 +87,8 @@ sub check_system_path
 map { my $dir = qx{cygpath -m "$_"}; chomp($dir); $dir 
}
 split /\Q$local_pathseparator\E\s*/, $pathvariable;
 $local_pathseparator = ';';
+} elsif ( $^O =~ /MSWin/i ) {
+$local_pathseparator = ';';
 }
 my $patharrayref = 
installer::converter::convert_stringlist_into_array(\$pathvariable, 
$local_pathseparator);
 
@@ -96,7 +98,7 @@ sub check_system_path
 
 if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
 {
-@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", 
"uuidgen", "makecab.exe", "msitran.exe", "expand.exe");
+@needed_files_in_path = ("msiinfo.exe", "msidb.exe", "uuidgen.exe", 
"makecab.exe", "msitran.exe", "expand.exe");
 }
 elsif ($installer::globals::iswin)
 {
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 045d9d6afde9..0dc148a9155a 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -265,7 +265,7 @@ BEGIN
 @installer::globals::removedirs = ();
 

core.git: postprocess/CustomTarget_registry.mk

[Christian Lohmaier (via logerrit)]

 postprocess/CustomTarget_registry.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dac6cbd2155ca47d9152fbcc523f52aee6386832
Author: Christian Lohmaier 
AuthorDate: Thu Apr 25 17:14:16 2024 +0200
Commit: Julien Nabet 
CommitDate: Thu Apr 25 21:49:11 2024 +0200

fix mismatching gb_Trace_StartRange and gb_Trace_EndRage

Change-Id: Ie4da22b05bf9219da811778bfb892e3d6c9de6c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166636
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 8a503e39862a..f4ee8e4f2791 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -607,7 +607,7 @@ $(call gb_XcdTarget_get_target,registry_%.xcd) : \
$(SRCDIR)/solenv/bin/removereportbuilder.xslt - ) \
> $@ \
)
-   $(call gb_Trace_EndRange,$*,XCD)
+   $(call gb_Trace_EndRange,registry_$*,XCD)
 
 $(call gb_XcdTarget_get_target,%.xcd) : \
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/windows.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 497fc304d49577df43842d56eb3ccbe6875fcafd
Author: Christian Lohmaier 
AuthorDate: Tue Jul 11 18:30:20 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Apr 24 15:51:34 2024 +0200

windows: set CONFIG_SHELL for external configure runs

Change-Id: I9cb03692524eced35935ad1979027f7b196e5ed6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166329
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index dc7a76d1515c..797680038320 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -19,6 +19,8 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
 
 gb_MKTEMP := mktemp --tmpdir=$(TMPDIR) gbuild.XX
 
+gb_RUN_CONFIGURE := CONFIG_SHELL=$(shell cygpath -ms /bin/sh)
+
 # define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
 # current baseline is Windows 7 (NT 6.1)
 # for _WIN32_IE, if _WIN32_WINNT >= 0x0600 the derived value from

core.git: external/breakpad external/coinmp external/lcms2 external/libtommath external/python3 external/skia

[Christian Lohmaier (via logerrit)]

 external/breakpad/UnpackedTarball_breakpad.mk |6 ++
 external/coinmp/UnpackedTarball_coinmp.mk |5 +
 external/lcms2/UnpackedTarball_lcms2.mk   |5 +
 external/libtommath/UnpackedTarball_libtommath.mk |5 +
 external/python3/UnpackedTarball_python3.mk   |5 +
 external/skia/UnpackedTarball_skia.mk |5 +
 6 files changed, 31 insertions(+)

New commits:
commit c1256034ffb585cd818eedb49c88c86d414224b9
Author: Christian Lohmaier 
AuthorDate: Tue Aug 8 12:13:53 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Apr 24 15:50:35 2024 +0200

use --binary flag when applying patches with patch from git-bash

Change-Id: Idbd4ad7ad89dc727e2f0cf851c4c62f05d5b2a0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166328
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/breakpad/UnpackedTarball_breakpad.mk 
b/external/breakpad/UnpackedTarball_breakpad.mk
index eca3d550d0d4..ce553e334251 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -19,6 +19,12 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,breakpad,$(BREAKPAD_TARBALL)))
 # external/breakpad/SIGSTKSZ.patch upstreamed at
 #   
"Adpat to SIGSTKSZ type
 #  in glibc 2.34":
+
+ifneq ($(MSYSTEM),)
+# use binary flag so patch from git-bash won't choke on mixed line-endings in 
patches
+$(eval $(call gb_UnpackedTarball_set_patchflags,breakpad,--binary))
+endif
+
 $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
external/breakpad/breakpad-use-correct-http-header.patch.1 \
external/breakpad/breakpad-wshadow.patch.1 \
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk 
b/external/coinmp/UnpackedTarball_coinmp.mk
index 83ebfca80193..20cf9184516e 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -29,6 +29,11 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,coinmp,\
Osi \
 ))
 
+ifneq ($(MSYSTEM),)
+# use binary flag so patch from git-bash won't choke on mixed line-endings in 
patches
+$(eval $(call gb_UnpackedTarball_set_patchflags,coinmp,--binary))
+endif
+
 # * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at
 #   
 
"[Coin-discuss]
 #   Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp":
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk 
b/external/lcms2/UnpackedTarball_lcms2.mk
index 745da1a0a782..f44683e03809 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -15,6 +15,11 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,lcms2))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
 
+ifneq ($(MSYSTEM),)
+# use binary flag so patch from git-bash won't choke on mixed line-endings in 
patches
+$(eval $(call gb_UnpackedTarball_set_patchflags,lcms2,--binary))
+endif
+
 # external/lcms2/0001-Added-missing-export.patch.1:
 # backport of 
https://github.com/mm2/Little-CMS/commit/f7b3c637c20508655f8b49935a4b556d52937b69
 $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
diff --git a/external/libtommath/UnpackedTarball_libtommath.mk 
b/external/libtommath/UnpackedTarball_libtommath.mk
index 8961a46162c5..6d8e1e9fdd57 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -13,6 +13,11 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
 
+ifneq ($(MSYSTEM),)
+# use binary flag so patch from git-bash won't choke on mixed line-endings in 
patches
+$(eval $(call gb_UnpackedTarball_set_patchflags,libtommath,--binary))
+endif
+
 $(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
 ))
 
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 6eaa4ca82784..cbb85e14e405 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -16,6 +16,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
PCbuild/pcbuild.sln \
 ))
 
+ifneq ($(MSYSTEM),)
+# use binary flag so patch from git-bash won't choke on mixed line-endings in 
patches
+$(eval $(call gb_UnpackedTarball_set_patchflags,python3,--binary))
+endif
+
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index 9e603dcb28dd..683de8e9d69c 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -45,6 +45,11 @@ skia_patches := \
 
 $(eval $(call 

core.git: helpcontent2

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 6e18734c5c3b026669da89b2b535383eccd4c083
Author: Christian Lohmaier 
AuthorDate: Wed Apr 24 15:32:43 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 24 15:32:43 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f32f607fcfb59c462919261f26f8ae07e1e4707f
  - Revert "win doesn't like (foo || bar) | … construct, suspends xsltproc"

This reverts commit b066c7f1008ce7d433683324dc9ef441478c832c.

Reason for revert: not all xargs versions know -a option (mac)

Change-Id: Ia2a54e1dffe459b058f1e11a35372bb38774044f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166519
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 67dd141b0f05..f32f607fcfb5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 67dd141b0f05a334a51a36d14cbe666559949715
+Subproject commit f32f607fcfb59c462919261f26f8ae07e1e4707f

help.git: CustomTarget_html.mk

[Christian Lohmaier (via logerrit)]

 CustomTarget_html.mk |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit f32f607fcfb59c462919261f26f8ae07e1e4707f
Author: Christian Lohmaier 
AuthorDate: Wed Apr 24 15:10:58 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Apr 24 15:32:42 2024 +0200

Revert "win doesn't like (foo || bar) | … construct, suspends xsltproc"

This reverts commit b066c7f1008ce7d433683324dc9ef441478c832c.

Reason for revert: not all xargs versions know -a option (mac)

Change-Id: Ia2a54e1dffe459b058f1e11a35372bb38774044f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166519
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index c8ac9250df..a3a9cec55f 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -278,32 +278,26 @@ html_gen_bookmarks_deps = $(call 
html__gen_bookmarks_deps,$(firstword $(1)),$(la
 
 $(eval $(foreach module,$(html_BMARK_MODULES),$(call 
html_gen_bookmarks_deps,$(subst :, ,$(module)
 
-# intermediate responsefile target, make will clear those automatically
-# unless they are explicitly listed as target or non-pattern prerequisite
-# depend on the online_transform.xsl just as a proxy to make sure the 
directory exists
-# is only intermediate because those were used as temp files previously - 
could just
-# as well be plain/explicit targets
-$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%_bookmarks.part.responsefile:|
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/online_transform.xsl
-   $(file > $@,$(subst 
helpcontent2/source/text/,,$(gb_AllLangHelp_$*_BOOKMARK_HELPFILES))$(if 
$(filter WNT,$(OS)), ))
-
 # strip the helpcontent2/source/text prefix and cd to the corresponding 
directory to maximize
 # the number of files that xargs can squeeze into a single invocation of 
xsltproc
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
 $(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
 $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \
-$(foreach module,$(html_TREE_MODULES),$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(module)_bookmarks.part.responsefile)
 \
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
$(call gb_Trace_StartRange,$*/$(@F),XSL)
-   cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \
-   && $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter 
WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs -a $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(firstword $(subst /, 
,$*))_bookmarks.part.responsefile) \
+   RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
helpcontent2/source/text/,,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))$(if 
$(filter WNT,$(OS)), )) \
+   && cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \
+   && ( \
+   $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter 
WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs) \
--stringparam app $(APP) \
--stringparam Language $(HELP_LANG) \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
--stringparam productname "$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion "$(PRODUCTVERSION)" \
$(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
-   | sort -k3b -s >$@
+   <$$RESPONSEFILE || { rm $$RESPONSEFILE; exit 1; } \
+   ) | sort -k3b -s >$@ && rm "$$RESPONSEFILE"
$(call gb_Trace_EndRange,$*/$(@F),XSL)
 
 # The various gid_File_Help_*_Zip in scp2 that use 
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG expect

dictionaries.git: Changes to 'refs/tags/libreoffice-7.6.7.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.1' created by Christian Lohmaier 
 at 2024-04-22 13:42 +

Tag libreoffice-7.6.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYmaSkACgkQ9DSh76/u
rqNB+xAAuDlEwgtuD5NnmTI3HRI1Mcd/yN9yOR4bVJZauL0oFndVXKtPJiPn/E/R
TGTdyPHgAwXRW82STEKenlBHIV6WlVa4vEFhrPkAFgmjfSU5aSnvrM9DhzsGCcIX
EGMfPb9N9PC470vHn57LgM7DHIvEQ+BudUpx0yrXb0awISNSLZV5roZI3edjfAiE
R+skMVS3QkLncKdHaxjfhZLJYIQw1CHVVkxWOFLyyjj9ZplGadv94C2iSF2lSuVo
dpzXxr4DAPeWEfhGRFDUlDYvI26uLRP9YZOs2tPT85v53Wr8i/8ebCi4KwTlLf47
ePgse999K+5SHhS0tlB2HptPTB12UIrT+bNYj8iCnN3GROUAyRvtS7HjFfie0O+a
EcJMVjj1cKofqszG08ihhxaDW1XQ9IIInE/nn1RYZ7r+pay0DOUCheQAoTnsLqgo
dj2zEmDbeLaNXoKaoAif0Rroz3RfZxfT1Filx5XtotKxTQWExCW+huxud8zUj96c
TtcIHtKhsmu9ThhT4PkBMtKWpPN37iTpJ+mXdqr9jDiQ9jhQXBdvlZJsOrrUXSxu
/Mc17iHfo2Oqg3PkpgPG18YrTyoxM66nKOc5dUI4cE4oZLlGdtP/7ye9MmhyGEsq
o6UWqg62cZKh4VqCx3+WLu9LeCEK8lmbsES9hN78rdlgGJHPUbk=
=2VJ0
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-8:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/libreoffice-7.6.7.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.1' created by Christian Lohmaier 
 at 2024-04-22 13:42 +

Tag libreoffice-7.6.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYmaSwACgkQ9DSh76/u
rqOGlhAAvpVsm7bbYXaYMYRU7FVsoy7FdYJv8CbMfBBxzSHvI1B4f1qKt5MnmIcE
z8IueLozZwkJs7m0f19g1Mpnvhv+aMGQ3CqsHM0+eqBH6RErZ/+LAIWmjuUHJdG3
cCUo43bnjJKhfdg81ajuu78F37W4BIo5d0dvbixJApzhsEvWYc8kVjCvetlbsRBk
b2DiUq58d7fEYo5gryM07VsM0dZ/LMoJB5b7Li2WGRLWHUVE+dTedWm91K0H+C0M
Vbl7sniD5fVkJYpFyl75E5RFSZhOHLKLq5UUAUlEkC3o2T3gYepNjttdCfXSwNjF
G3lOL+CsncThl86VRiykAwoJsoTDWgMBYlfKMDoHfzFiwtPaqIpcC2RP1DLhqy5c
DRYebUR7U9+LacvWcwS+ofRLQrRdjuQRhItnpS0SaOXF0Bfpj2Wt2o22CyV6We4E
NidBDWJi4XahEaXGXoCZYoLAEAzGYmP4YiR6zqFbpALdUIsQQPd67ufyTTgt5BGP
UpQug2xbvp9givOqoohKY+I2oHIXIWYBZoY96ZAihIVrGhvUzklhuF4EpUBaPThl
R+LlVUm+pJ3jaiCrfKSoPd3fjPNUNg9JSEWV6piRvKdfQC/i5h/wx3mqVS/FUN7Q
P39deJnhXSK5r0NHvwTP4MlfyeT4H797u3iK7LBZ/xwbOelb8U0=
=QLwk
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-34:
---
 0 files changed
---

help.git: Changes to 'refs/tags/libreoffice-7.6.7.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.1' created by Christian Lohmaier 
 at 2024-04-22 13:42 +

Tag libreoffice-7.6.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYmaSwACgkQ9DSh76/u
rqOYbg//dnkHkvS7fylqgi/h+RtCcGi8lHEkfsmibr+PQ9PtcJFcfbxbeii2PFad
8NtaWHHXIuF7JOfhH+6ylliZ8SQMJ6IU/muGSZp/S/jmeVmg8/DHaSvJs5LFbb0P
fpmXmoO8K4P3ZxYK5r0l/XVI0A6lKM4LwQOd/MxjkDdPKSZdViQgWLIy0OR05nOS
9sUsM3co5rHtSySHppBgU4MkywQaRDynMgsofoyf0dfrgVWB6KvCEAQ3DvPLtDwd
6qe5+km3xmfdDP9ElWLd8Okhifzv5Ij2SwpyRamaSR980eaiYnOpTcdzEcTnLln1
Z3fc/KL7hUXPgTaSeQaGVIIqMl3m1zCqmJrvy9GgaKZ5wkowh9c3PLoF7I0bH5yb
fZ41OSKwBYyHlw6SlVu3TQVpbrCu/gucTjy2y08VBhVdkI0n0HOH6FfLPm51yS2r
HB33TVQZvQ1maQQT7u4AQM61JsB5iecJxoP3h5IfaL9I7ssLQTGaK8SAaLK5R/HE
HFn70kHvYrsE0YV/1c2d1p+a9DX78qUp0FonewWyts+5Q36JalViVahxX5/sNtcA
Th15tVcEDDjjThiZ7eI78WpCbRJ9MDM2AYxbXiCc9YP8w26moTNq8QeekNEFkO3f
Ydtfu4ulT6+pCywsGEgPtabhWNHMbwh3748IeAzVz171HC+MlGM=
=Jub/
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-37:
---
 0 files changed
---

core.git: Branch 'libreoffice-7-6-7' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd664f1e70d8e04f70bccafd5059d8caeeb20d49
Author: Christian Lohmaier 
AuthorDate: Mon Apr 22 15:42:22 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 15:42:22 2024 +0200

bump product version to 7.6.7.1.0+

Change-Id: Ie30a80e88ba0f9bbbabdffe6674a54827924a86b

diff --git a/configure.ac b/configure.ac
index fb6103eb6181..555486903c06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.6.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.7.1.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Changes to 'refs/tags/libreoffice-7.6.7.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.6.7.1' created by Christian Lohmaier 
 at 2024-04-22 13:42 +

Tag libreoffice-7.6.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYmaSwACgkQ9DSh76/u
rqNHXw/+I3QwIqQI8Fe6gHUp+Gs4VlS+h61m8s5Z65RY0pZext1S3vlxfkPpu1p3
cukWbepP5AuvI+aOpAyqL3Gbl0cwFlQtWbrHdjsvKBtsB+o1zlGgFSMKZdpDpWGr
qBGadcrYr/adcNgdmRxjW4WpYgZzag6scODoMfD1zdJX0Qq/5qm0wKWMaLYXkwe0
Why87aB6Huqx257wM51uguiIvH8jM8LYueWMOT6FTtZ3CJirU0YM7+XbpSkoYzIP
HNAA7I3NLNj6Dzg9HbV2fI/1TVVhUhcLMyZQSYoFCOVQd7qEhJy4gdOsgMbouAsA
u3CoK+Le7y2RIdr6111sHfXSDg7rYQFNc6JBBR6pDlkQMsmqgCodn1GA4uGh/fXZ
TbDXnVin1JDe4dhDAHX7ED3l6tXJ1PdsUdzARc5X9lo/ss8I68uHWd+y7/PWZQQ+
wmVP1T0a11Qj2UtMi4zuGEc4OFUMl1F+UbyFJtX9GQuP2Vs3okg+oF6K9u91qgf0
JPObPksbYRcrkWOvYsSSDFJFrh8CL6PSoVKzeZGHoes5lP9o4VzpZee8v4/A3Mc6
bLCKLVkTriXFRQMQphtoqez7Vr9q7UTv0LiyVv8knuxA+XzC83s95hpf06YMIiwu
fIcWzqXFpHSaIjC7S259iFR8OAjzwJDdIjY3mkNViT/3K0TgEJQ=
=kWyd
-END PGP SIGNATURE-

Changes since libreoffice-7-6-branch-point-1319:
---
 0 files changed
---

core.git: Branch 'libreoffice-7-6' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1ed8a5bf757682fc193fc81231bfd3426b2d8dd6
Author: Christian Lohmaier 
AuthorDate: Mon Apr 22 15:40:16 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 15:40:16 2024 +0200

bump product version to 7.6.8.0.0+

Change-Id: Id143d0d8dc696aaa7639dae169e553f1a11d7137

diff --git a/configure.ac b/configure.ac
index fb6103eb6181..e39403d3902c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.6.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.8.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

core.git: Changes to 'libreoffice-7-6-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-6-7' available with the following commits:
commit dd0c68372a470f8bb156d59fc574b6e806391be4
Author: Christian Lohmaier 
Date:   Mon Apr 22 15:39:42 2024 +0200

Branch libreoffice-7-6-7

This is 'libreoffice-7-6-7' - the stable branch for the 7.6.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

translations.git: Changes to 'libreoffice-7-6-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-6-7' available with the following commits:
commit 6c5d82ebf2be560ac8678088ab4b0a27951d8c60
Author: Christian Lohmaier 
Date:   Mon Apr 22 15:39:20 2024 +0200

Branch libreoffice-7-6-7

This is 'libreoffice-7-6-7' - the stable branch for the 7.6.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I4e700e4069be6b372ef7baa8cb8d345ca035e389

help.git: Changes to 'libreoffice-7-6-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-6-7' available with the following commits:
commit 79a8c7dc6ca1090981ce01016e9358fd08d98e2a
Author: Christian Lohmaier 
Date:   Mon Apr 22 15:39:20 2024 +0200

Branch libreoffice-7-6-7

This is 'libreoffice-7-6-7' - the stable branch for the 7.6.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I089e30f63c2e28fe8c3b83ec704ac9d29a947a5c

dictionaries.git: Changes to 'libreoffice-7-6-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-6-7' available with the following commits:
commit f747c9370dcb6991d216368f598504208ac151b0
Author: Christian Lohmaier 
Date:   Mon Apr 22 15:39:20 2024 +0200

Branch libreoffice-7-6-7

This is 'libreoffice-7-6-7' - the stable branch for the 7.6.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.6.x release,
please use the 'libreoffice-7-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I7aa435e3665c7ec6c10ad4da01fcb92280daa9f9

core.git: Branch 'libreoffice-7-6' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit e34dcb0d0935d01a0affd72b82f373a955273f6a
Author: Christian Lohmaier 
AuthorDate: Mon Apr 22 15:36:13 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 22 15:36:13 2024 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-6'
  to f33641b618682a4cac0c330f341a80bbdfbf0a02
  - update translations for 7.6.7 rc1

and force-fix errors using pocheck

Change-Id: I3080467cb48d722ced33ba4e338fc9961675167a

diff --git a/translations b/translations
index ee46af8eb1ee..f33641b61868 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ee46af8eb1eeef8147c439b7b89b1779be2d1bbe
+Subproject commit f33641b618682a4cac0c330f341a80bbdfbf0a02

translations.git: Branch 'libreoffice-7-6' - source/ab source/an source/ast source/bg source/ca source/cs source/cy source/de source/dsb source/el source/es source/fa source/fi source/gl source/gug so

[Christian Lohmaier (via logerrit)]

 source/ab/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|   16 
 source/ab/officecfg/registry/data/org/openoffice/Office.po |4 
 source/ab/readlicense_oo/docs.po   |   14 
 source/ab/setup_native/source/mac.po   |6 
 source/ab/svx/messages.po  |   12 
 source/ab/swext/mediawiki/help.po  |   16 
 source/an/cui/messages.po  |   14 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  |7 
 source/an/sd/messages.po   |6 
 source/an/shell/source/win32/shlxthandler/res.po   |8 
 source/ast/chart2/messages.po  |   28 
 source/ast/cui/messages.po |   35 
 source/ast/extras/source/autocorr/emoji.po |   42 
 source/ast/helpcontent2/source/text/sbasic/guide.po|8 
 source/ast/helpcontent2/source/text/sbasic/shared.po   |   20 
 source/ast/helpcontent2/source/text/scalc.po   |4 
 source/ast/helpcontent2/source/text/scalc/00.po|4 
 source/ast/helpcontent2/source/text/scalc/01.po|   18 
 source/ast/helpcontent2/source/text/scalc/05.po|   12 
 source/ast/helpcontent2/source/text/scalc/guide.po |   16 
 source/ast/helpcontent2/source/text/schart/01.po   |6 
 source/ast/helpcontent2/source/text/sdraw/01.po|   12 
 source/ast/helpcontent2/source/text/sdraw/guide.po |4 
 source/ast/helpcontent2/source/text/shared.po  |4 
 source/ast/helpcontent2/source/text/shared/00.po   |   12 
 source/ast/helpcontent2/source/text/shared/01.po   |   36 
 source/ast/helpcontent2/source/text/shared/02.po   |   24 
 source/ast/helpcontent2/source/text/shared/04.po   |4 
 source/ast/helpcontent2/source/text/shared/autopi.po   |4 
 source/ast/helpcontent2/source/text/shared/guide.po|   34 
 source/ast/helpcontent2/source/text/shared/optionen.po |   14 
 source/ast/helpcontent2/source/text/simpress/00.po |8 
 source/ast/helpcontent2/source/text/simpress/01.po |6 
 source/ast/helpcontent2/source/text/simpress/02.po |4 
 source/ast/helpcontent2/source/text/simpress/guide.po  |6 
 source/ast/helpcontent2/source/text/smath/02.po|4 
 source/ast/helpcontent2/source/text/swriter.po |   16 
 source/ast/helpcontent2/source/text/swriter/01.po  |   38 
 source/ast/helpcontent2/source/text/swriter/02.po  |6 
 source/ast/helpcontent2/source/text/swriter/guide.po   |   16 
 source/ast/helpcontent2/source/text/swriter/librelogo.po   |8 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |   85 
 source/ast/sc/messages.po  |   19 
 source/ast/sd/messages.po  |   13 
 source/ast/sfx2/messages.po|   38 
 source/ast/svx/messages.po |   26 
 source/ast/sw/messages.po  |   54 
 source/ast/xmlsecurity/messages.po |   10 
 source/bg/framework/messages.po|8 
 source/bg/helpcontent2/source/text/scalc/guide.po  |8 
 source/bg/helpcontent2/source/text/shared/02.po|6 
 source/bg/helpcontent2/source/text/smath/01.po |6 
 source/bg/helpcontent2/source/text/swriter.po  |4 
 source/bg/helpcontent2/source/text/swriter/01.po   |   10 
 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po  |   20 
 source/bg/sd/messages.po   |6 
 source/ca/cui/messages.po  |6 
 source/ca/helpcontent2/source/text/sbasic/shared.po|   12 
 source/ca/helpcontent2/source/text/sbasic/shared/02.po |4 
 source/ca/helpcontent2/source/text/sbasic/shared/03.po |6 
 source/ca/helpcontent2/source/text/scalc/00.po |4 
 source/ca/helpcontent2/source/text/scalc/01.po |8 
 source/ca/helpcontent2/source/text/scalc/04.po |   10 
 source/ca/helpcontent2/source/text/scalc/05.po |   14 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   21 
 source/ca/helpcontent2/source/text/sdatabase.po   

core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 9f98223f22843058568552cce98417799c096ed9
Author: Christian Lohmaier 
AuthorDate: Mon Apr 22 13:59:11 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 22 13:59:11 2024 +0200

Update git submodules

* Update translations from branch 'master'
  to b2b2c286fed6e5116acc819a44c69214af3f993b
  - update translations for master

and force-fix errors using pocheck

Change-Id: I58b4c71142984e8e7cb21b2e269c0aa658b8c73f

diff --git a/translations b/translations
index 5bdfc7986299..b2b2c286fed6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5bdfc7986299178af1b2f20fa2e9b2bb5dd82a6b
+Subproject commit b2b2c286fed6e5116acc819a44c69214af3f993b

core.git: helpcontent2

[Christian Lohmaier (via logerrit)]

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

New commits:
commit b00e3093af7771765c1507c7c22436174411be53
Author: Christian Lohmaier 
AuthorDate: Mon Apr 22 13:38:07 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 22 13:38:07 2024 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b066c7f1008ce7d433683324dc9ef441478c832c
  - win doesn't like (foo || bar) | … construct, suspends xsltproc

not always/reproducible but often enough when using git-bash to get
annoying when building with all langs/when that is run in parallel
Splitting this up makes it more reliable (or I just have been lucky)

btw: why is this split-per-app when the final bookmarks.js is a simple
concatenation of all of them?

Change-Id: I629a302237b32da8ba77460e0415f32d50105ae5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166320
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/helpcontent2 b/helpcontent2
index 183a14d99cbf..b066c7f1008c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 183a14d99cbf6b18fa7d3d059a2ff0639520a205
+Subproject commit b066c7f1008ce7d433683324dc9ef441478c832c

help.git: CustomTarget_html.mk

[Christian Lohmaier (via logerrit)]

 CustomTarget_html.mk |   18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit b066c7f1008ce7d433683324dc9ef441478c832c
Author: Christian Lohmaier 
AuthorDate: Tue Jul 25 13:07:29 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:38:06 2024 +0200

win doesn't like (foo || bar) | … construct, suspends xsltproc

not always/reproducible but often enough when using git-bash to get
annoying when building with all langs/when that is run in parallel
Splitting this up makes it more reliable (or I just have been lucky)

btw: why is this split-per-app when the final bookmarks.js is a simple
concatenation of all of them?

Change-Id: I629a302237b32da8ba77460e0415f32d50105ae5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/166320
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index a3a9cec55f..00808bdf92 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -278,26 +278,32 @@ html_gen_bookmarks_deps = $(call 
html__gen_bookmarks_deps,$(firstword $(1)),$(la
 
 $(eval $(foreach module,$(html_BMARK_MODULES),$(call 
html_gen_bookmarks_deps,$(subst :, ,$(module)
 
+# intermediate responsefile target, make will clear those automatically
+# unless they are explicitly listed as target or non-pattern prerequisite
+# depend on the online_transform.xsl just as a proxy to make sure the 
directory exists
+# is only interemdiate because those were used as temp files previously - 
could just
+# as well be plain/explicit targets
+$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%_bookmarks.part.responsefile:|
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/online_transform.xsl
+   $(file > $@,$(subst 
helpcontent2/source/text/,,$(gb_AllLangHelp_$*_BOOKMARK_HELPFILES))$(if 
$(filter WNT,$(OS)), ))
+
 # strip the helpcontent2/source/text prefix and cd to the corresponding 
directory to maximize
 # the number of files that xargs can squeeze into a single invocation of 
xsltproc
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
 $(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
 $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \
+$(foreach module,$(html_TREE_MODULES),$(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(module)_bookmarks.part.responsefile)
 \
 | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
$(call gb_Trace_StartRange,$*/$(@F),XSL)
-   RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
helpcontent2/source/text/,,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))$(if 
$(filter WNT,$(OS)), )) \
-   && cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \
-   && ( \
-   $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter 
WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs) \
+   cd $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call 
gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/helpcontent2/source/text \
+   && $(call gb_ExternalExecutable_get_command,xsltproc,$(if $(filter 
WNT,$(OS)),env -i $(gb_Helper_set_ld_path)) xargs -a $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(firstword $(subst /, 
,$*))_bookmarks.part.responsefile) \
--stringparam app $(APP) \
--stringparam Language $(HELP_LANG) \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
--stringparam productname "$(gb_PRODUCTNAME_HTML)" \
--stringparam productversion "$(PRODUCTVERSION)" \
$(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
-   <$$RESPONSEFILE || { rm $$RESPONSEFILE; exit 1; } \
-   ) | sort -k3b -s >$@ && rm "$$RESPONSEFILE"
+   | sort -k3b -s >$@
$(call gb_Trace_EndRange,$*/$(@F),XSL)
 
 # The various gid_File_Help_*_Zip in scp2 that use 
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG expect

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/LinkTarget.mk |   11 ---
 solenv/gbuild/PrecompiledHeaders.mk |   10 --
 solenv/gbuild/gbuild.mk |3 +++
 3 files changed, 7 insertions(+), 17 deletions(-)

New commits:
commit df62514556b4220a4c099c00a34f28dd7fe88626
Author: Christian Lohmaier 
AuthorDate: Tue Jul 11 18:27:36 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:33:46 2024 +0200

add generic %/.dir target that can be used in order-only prerequisites

Change-Id: I7a919004100ff6319806bbdf016fda6a3a39661a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166327
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 85139659c634..f4d15f411516 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -279,11 +279,6 @@ endif
 # Note: if the *Object_dep_target does not exist it will be created by
 # concat-deps as PHONY
 ifeq ($(gb_FULLDEPS),$(true))
-$(dir $(call gb_CObject_get_dep_target,%)).dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CObject_get_dep_target,%))%/.dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_CObject_get_dep_target,%) :
$(if $(wildcard $@),touch $@)
@@ -342,12 +337,6 @@ $(call gb_CxxObject_get_target,%) : $(call 
gb_CxxObject_get_source,$(SRCDIR),%)
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(dir $(call gb_CxxObject_get_dep_target,%)).dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_CxxObject_get_dep_target,%))%/.dir :
-   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
 $(call gb_CxxObject_get_dep_target,%) :
$(if $(wildcard $@),touch $@)
 
diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 60445c28efbe..429ea57de201 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -25,8 +25,8 @@ gb_PrecompiledHeader__get_debugdir = $(if $(call 
gb_target_symbols_enabled,$(1))
 
 # $(call gb_PrecompiledHeader_generate_timestamp_rule,linktargetmakefilename)
 define gb_PrecompiledHeader_generate_timestamp_rule
-$(call gb_LinkTarget_get_pch_timestamp,$(1)) :
-   mkdir -p $$(dir $$@) && touch $$@
+$(call gb_LinkTarget_get_pch_timestamp,$(1)) : | $(dir $(call 
gb_LinkTarget_get_pch_timestamp,$(1))).dir
+   touch $$@
 
 endef
 
@@ -46,10 +46,8 @@ gb_PrecompiledHeader_flags_for_flags_file := $$(sort 
$(gb_PrecompiledHeader_cxxf
 # $(call 
gb_PrecompiledHeader_generate_rules,pchtarget,linktarget,linktargetmakefilename,pchcxxfile,compiler)
 define gb_PrecompiledHeader_generate_rules
 
-$(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) :
-   $$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $$(dir $$@) && \
-   echo "$$(call gb_PrecompiledHeader_get_target,$(1),$(3)) : 
$$(gb_Helper_PHONY)" > $$@)
+$(call gb_PrecompiledHeader_get_dep_target,$(1),$(3)) : | $(dir $(call 
gb_PrecompiledHeader_get_dep_target,$(1),$(3))).dir
+   echo "$$(call gb_PrecompiledHeader_get_target,$(1),$(3)) : 
$$(gb_Helper_PHONY)" > $$@
 
 # keep the flags the PCH was built with in a separate file, update the file if 
and only if the flags
 # change, and make the PCH depend on it => the PCH will be rebuilt on any 
flags change
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a36b2b758479..2f5704896d42 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -373,4 +373,7 @@ ifneq ($(CCACHE_DEPEND_MODE),)
 gb_COMPILER_SETUP += CCACHE_DEPEND=1
 endif
 
+$(WORKDIR)/%/.dir:
+   mkdir -p $(@D) && touch $@
+
 # vim: set noet sw=4:

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/Extension.mk |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 5511a7b77bcceb812737533de1184c5d009f0a78
Author: Christian Lohmaier 
AuthorDate: Mon Jul 24 12:49:46 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:32:51 2024 +0200

avoid exceeding command-line length limits when using zip

to package an Extension. With all languages enabled one can reach the
limit with longish buildpaths

Change-Id: I8943d6570ded57761350311fb34a0cf469d3ce83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166326
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 4342859e415f..200e7d9e2a4f 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -89,17 +89,20 @@ $(call gb_Extension_get_workdir,%)/description.xml : 
$(gb_Extension_XRMEXDEPS) $
-o $@ \
-m $${MERGEINPUT} \
-l all) && \
-   rm -rf $${MERGEINPUT}
+   rm -f $${MERGEINPUT}
$(call gb_Trace_EndRange,$*/description.xml,XRM)
 
 endif
 
 # rule to create oxt package in workdir
 # --filesync makes sure that all files in the oxt package will be removed that 
no longer are in $(FILES)
+# TODO: kinda pointless/ineffective to copy from one point in workdir to 
another, also makes the command
+# very long when building with all languages (nlpsolver extension for 
example), hence read list via pipe
 $(call gb_Extension_get_target,%) : \
$(call gb_Extension_get_workdir,%)/description.xml
$(call gb_Output_announce,$*,$(true),OXT,3)
$(call gb_Trace_StartRange,$*,OXT)
+   RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
$(WHITESPACE),$(NEWLINE),$(sort $(FILES && \
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \
$(if $(LICENSE),$(call 
gb_Extension_get_rootdir,$*)/registration) && \
@@ -108,10 +111,8 @@ $(call gb_Extension_get_target,%) : \
$(if $(LICENSE),cp -f $(LICENSE) $(call 
gb_Extension_get_rootdir,$*)/registration &&) \
$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp 
$(foreach lang,$(gb_Extension_TRANS_LANGS),$(call 
gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call 
gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
-   ZIPFILES=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(sort 
$(FILES))) && \
-   $(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
-   $(call gb_Extension_get_target,$*) \
-   `cat $${ZIPFILES} | tr -d ' '` && rm $${ZIPFILES})
+   cat $$RESPONSEFILE | $(gb_Extension_ZIPCOMMAND) -rX --filesync 
--must-match \
+   $(call gb_Extension_get_target,$*) --names-stdin) && rm 
-f $$RESPONSEFILE
$(call gb_Trace_EndRange,$*,OXT)
 
 # set file list and location of manifest and description files

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80a6564e071033fd64536cb6c538cd422a82c86a
Author: Christian Lohmaier 
AuthorDate: Wed Aug 2 16:11:10 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:30:48 2024 +0200

com_MSC_class: set MAKE=nmake in gb_NMAKE_VARS

Change-Id: I485a486efba39c12c52d7461f4b235163f009042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166325
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index eccc64e1b2f1..7e6b5e8d3b57 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -673,7 +673,7 @@ gb_NMAKE_VARS = \
INCLUDE="$(gb_ExternalProject_INCLUDE)" \
LIB="$(ILIB)" \
MAKEFLAGS= \
-   MAKE=
+   MAKE=nmake
 
 # InstallScript class
 

core.git: 2 commits - external/liblangtag officecfg/registry sc/source sc/uiconfig

[Christian Lohmaier (via logerrit)]

 external/liblangtag/ExternalProject_liblangtag.mk|8 --
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 ++
 sc/source/ui/inc/tpview.hxx  |2 
 sc/source/ui/optdlg/tpview.cxx   |   16 +
 sc/source/ui/view/gridwin4.cxx   |   10 +++
 sc/uiconfig/scalc/ui/tpviewpage.ui   |   42 +--
 6 files changed, 74 insertions(+), 12 deletions(-)

New commits:
commit a89dbe925d24968f5d4391ff02be2bee83f42867
Author: Christian Lohmaier 
AuthorDate: Wed Aug 2 16:05:26 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:30:07 2024 +0200

REAL_CC[_CFLAGS] are already set by gb_ExternalProject_run

(and that also takes care of proper quoting)

Change-Id: Ic8c29300a2e6d5381c0d8873572f7c076362c93d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166324
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/liblangtag/ExternalProject_liblangtag.mk 
b/external/liblangtag/ExternalProject_liblangtag.mk
index 1ce4b6eb7367..0f005e27b355 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -17,9 +17,6 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\
build \
 ))
 
-# disable ccache on windows, as it doesn't cope with the quoted defines
-# liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar).
-# Results in "cl : Command line error D8003 : missing source filename"
 $(call gb_ExternalProject_get_state_target,liblangtag,build):
$(call gb_Trace_StartRange,liblangtrag,EXTERNAL)
$(call gb_ExternalProject_run,build,\
@@ -39,10 +36,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__URELIB)
 \
$(if $(filter-out LINUX 
FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-rpath,\"\$$\$$ORIGIN) \
$(if $(filter-out 
SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin 
-Wl$(COMMA)-R$(COMMA)\"\$$\$$ORIGIN) \
-   && $(if $(filter WNT,$(OS)),\
-   REAL_CC="$(shell cygpath -w $(lastword $(filter-out 
-%,$(CC" \
-   REAL_CC_FLAGS="$(filter -%,$(CC))") \
-  $(if $(verbose),V=1) \
+   && $(if $(verbose),V=1) \
   $(MAKE) \
 LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \
$(if $(filter MACOSX,$(OS)),\
commit 1cfc2e2c92e1259341ee18cf87be63c4dcebd33d
Author: Sahil Gautam 
AuthorDate: Wed Apr 17 18:12:18 2024 +0530
Commit: Heiko Tietze 
CommitDate: Mon Apr 22 13:29:53 2024 +0200

tdf#63374 Change cell background color when in edit mode

Set the edit cell background (EditView) color to CALCCELLFOCUS
and allow enabling/disabling via a checkbox
tools > options > Calc > View > Edit cell background highlighting

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 5582b346910d..fb6edf076f17 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -137,6 +137,14 @@
   
   false
 
+
+  
+  
+Indicates whether the edit cell background highlighting is 
enabled or not.
+Edit cell background highlighting
+  
+  false
+
 
   
   
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 97addc9f530d..ace65836d800 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -47,6 +47,8 @@ class ScTpContentOptions : public SfxTabPage
 std::unique_ptr m_xValueImg;
 std::unique_ptr m_xColRowHighCB;
 std::unique_ptr m_xColRowHighImg;
+std::unique_ptr m_xEditCellBgHighCB;
+std::unique_ptr m_xEditCellBgHighImg;
 std::unique_ptr m_xAnchorCB;
 std::unique_ptr m_xAnchorImg;
 std::unique_ptr m_xRangeFindCB;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 779dcdd3a96c..d4d9f6731add 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -54,6 +54,8 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* 
pPage, weld::DialogContr
 , m_xValueImg(m_xBuilder->weld_widget("lockvalue"))
 , m_xColRowHighCB(m_xBuilder->weld_check_button("colrowhigh"))
 , 

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/HelpTarget.mk |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 44f48621a600b4b013115e2671c657725b77883c
Author: Christian Lohmaier 
AuthorDate: Thu Apr 11 12:04:15 2024 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:29:36 2024 +0200

help: don't use clean targets as .PHONY targets

Change-Id: Ic86270980823efb8dafd9d00ce33f986203cd975
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166323
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 75cb22153d91..98baa661e908 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -69,14 +69,9 @@ $(call gb_HelpTranslatePartTarget_get_target,%) : 
$(gb_HelpTranslatePartTarget_D
$(call gb_HelpTranslatePartTarget__command,$@,$*,$^)
$(call gb_Trace_EndRange,$*,HPX)
 
-.PHONY : $(call gb_HelpTranslatePartTarget_get_clean_target,%)
-$(call gb_HelpTranslatePartTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),HPX,1)
-   $(call gb_Helper_abbreviate_dirs,\
-   rm -rf \
-   $(call gb_HelpTranslatePartTarget_get_target,$*) \
-   $(call gb_HelpTranslatePartTarget_get_workdir,$*) \
-   )
+clear_HelpTranslatePartTarget:
+   $(call gb_Output_announce,clear HelpTranslatePartTarget,$(false),HPX,1)
+   rm -rf  $(call gb_HelpTranslatePartTarget_get_workdir)
 
 # Translate a set of .xhp files from one directory.
 #
@@ -145,7 +140,7 @@ define gb_HelpTranslateTarget__make_part
 $(call gb_HelpTranslatePartTarget_HelpTranslatePartTarget,$(2),$(3),$(wildcard 
$(gb_POLOCATION)/$(3)/$(patsubst %/,%,$(4)).po))
 
 $(call gb_HelpTranslateTarget_get_target,$(1)) : $(call 
gb_HelpTranslatePartTarget_get_target,$(2))
-$(call gb_HelpTranslateTarget_get_clean_target,$(1)) : $(call 
gb_HelpTranslatePartTarget_get_clean_target,$(2))
+$(call gb_HelpTranslateTarget_get_clean_target,$(1)) : 
clear_HelpTranslatePartTarget
 
 endef
 

core.git: solenv/gbuild

[Christian Lohmaier (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |3 ---
 solenv/gbuild/platform/windows.mk  |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit a7a4984b58cf7cb84b0157ca68ee9191043ca65b
Author: Christian Lohmaier 
AuthorDate: Tue Aug 8 12:42:42 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Apr 22 13:28:56 2024 +0200

configure already sets TMPDIR to mixed path

Change-Id: I72070b054fb505c25f03ff46e7e663d1c1733ad8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166322
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2f1b653bef47..e75fdcc171b1 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -17,9 +17,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-# set tmpdir to some mixed case path, suitable for native tools
-gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m 
/tmp))
-
 # please make generic Windows modifications to windows.mk
 include $(GBUILDDIR)/platform/windows.mk
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 57f906ad1c53..dc7a76d1515c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -17,7 +17,7 @@ gb_Helper_get_rcfile = $(1).ini
 
 gb_Helper_LIBRARY_PATH_VAR := PATH
 
-gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XX
+gb_MKTEMP := mktemp --tmpdir=$(TMPDIR) gbuild.XX
 
 # define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
 # current baseline is Windows 7 (NT 6.1)

translations.git: Changes to 'refs/tags/cp-24.04.1-3'

[Christian Lohmaier (via logerrit)]

Tag 'cp-24.04.1-3' created by Andras Timar  at 
2024-04-22 06:34 +

cp-24.04.1-3

Changes since cp-24.04.1-2-1:
---
 0 files changed
---

core.git: Branch 'distro/collabora/co-24.04' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit e077f49f0f1d578f0a614e74b9b97d339d825cd3
Author: Christian Lohmaier 
AuthorDate: Fri Apr 19 12:50:34 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Apr 19 12:50:34 2024 +0200

Update git submodules

* Update translations from branch 'distro/collabora/co-24.04'
  to d835b3bec673fcb88a3e9c4aed8067ec0e838773
  - update translations for 24.2.3 rc1

and force-fix errors using pocheck

Change-Id: Ia1332fb36e3ae8379e97f29b087b3431bb5707ea

  - update translations for 24.2.3 rc1

and force-fix errors using pocheck

Change-Id: Iaaf78b114dce75267640c50c3512e42ed334d9ab

diff --git a/translations b/translations
index a2ed0affdffd..d835b3bec673 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a2ed0affdffd40b46b6f5af094173ad32779293b
+Subproject commit d835b3bec673fcb88a3e9c4aed8067ec0e838773

translations.git: Branch 'distro/collabora/co-24.04' - 2 commits - source/ab source/af source/am source/an source/ar source/as source/ast source/az source/be source/bg source/bn source/bn-IN source/bo

[Christian Lohmaier (via logerrit)]

 source/ab/cui/messages.po  |4 
 source/ab/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|   16 
 source/ab/officecfg/registry/data/org/openoffice/Office.po |4 
 source/ab/readlicense_oo/docs.po   |   14 
 source/ab/setup_native/source/mac.po   |6 
 source/ab/sfx2/messages.po |4 
 source/ab/swext/mediawiki/help.po  |   16 
 source/af/cui/messages.po  |4 
 source/af/sfx2/messages.po |4 
 source/am/cui/messages.po  |4 
 source/am/helpcontent2/source/text/shared/04.po|8 
 source/am/sfx2/messages.po |4 
 source/an/cui/messages.po  |8 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  |5 
 source/an/sfx2/messages.po |4 
 source/ar/cui/messages.po  |4 
 source/ar/helpcontent2/source/text/shared/04.po|6 
 source/ar/sfx2/messages.po |4 
 source/as/cui/messages.po  |4 
 source/as/sfx2/messages.po |4 
 source/ast/chart2/messages.po  |   22 
 source/ast/cui/messages.po |   34 
 source/ast/extras/source/autocorr/emoji.po |   38 
 source/ast/helpcontent2/source/text/sbasic/shared.po   |   16 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po|4 
 source/ast/helpcontent2/source/text/scalc.po   |4 
 source/ast/helpcontent2/source/text/scalc/00.po|6 
 source/ast/helpcontent2/source/text/scalc/01.po|   14 
 source/ast/helpcontent2/source/text/scalc/05.po|   12 
 source/ast/helpcontent2/source/text/scalc/guide.po |   16 
 source/ast/helpcontent2/source/text/schart/01.po   |6 
 source/ast/helpcontent2/source/text/sdraw/01.po|8 
 source/ast/helpcontent2/source/text/shared.po  |4 
 source/ast/helpcontent2/source/text/shared/00.po   |   10 
 source/ast/helpcontent2/source/text/shared/01.po   |   32 
 source/ast/helpcontent2/source/text/shared/02.po   |   16 
 source/ast/helpcontent2/source/text/shared/04.po   |   10 
 source/ast/helpcontent2/source/text/shared/autopi.po   |4 
 source/ast/helpcontent2/source/text/shared/guide.po|   36 
 source/ast/helpcontent2/source/text/shared/help.po |6 
 source/ast/helpcontent2/source/text/shared/optionen.po |   10 
 source/ast/helpcontent2/source/text/simpress/00.po |4 
 source/ast/helpcontent2/source/text/simpress/01.po |8 
 source/ast/helpcontent2/source/text/simpress/02.po |4 
 source/ast/helpcontent2/source/text/simpress/guide.po  |6 
 source/ast/helpcontent2/source/text/smath/02.po|4 
 source/ast/helpcontent2/source/text/swriter.po |6 
 source/ast/helpcontent2/source/text/swriter/01.po  |   20 
 source/ast/helpcontent2/source/text/swriter/guide.po   |   12 
 source/ast/helpcontent2/source/text/swriter/librelogo.po   |6 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |   57 
 source/ast/sc/messages.po  |   15 
 source/ast/sd/messages.po  |   11 
 source/ast/sfx2/messages.po|   40 
 source/ast/svx/messages.po |   12 
 source/ast/sw/messages.po  |   20 
 source/ast/xmlsecurity/messages.po |8 
 source/az/cui/messages.po  |4 
 source/az/sfx2/messages.po |4 
 source/be/cui/messages.po  |4 
 source/be/sfx2/messages.po |4 
 source/bg/cui/messages.po  |4 
 source/bg/helpcontent2/source/text/shared/00.po|  368 -
 source/bg/helpcontent2/source/text/shared/01.po|  854 ++--
 source/bg/helpcontent2/source/text/shared/02.po|  180 
 source/bg/helpcontent2/source/text/shared/04.po  

core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit faadf7c15593521c0ebceb043f82f916ee5ccf9d
Author: Christian Lohmaier 
AuthorDate: Mon Apr 15 20:59:12 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 15 20:59:12 2024 +0200

Update git submodules

* Update translations from branch 'master'
  to 5bdfc7986299178af1b2f20fa2e9b2bb5dd82a6b
  - update translations for master

and force-fix errors using pocheck

Change-Id: Ib61c7bd3d884aadbf089a18ca3b7e5bafc980c3c

diff --git a/translations b/translations
index 162f2568c09f..5bdfc7986299 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 162f2568c09f9391b8ceb5a123757a9ed75e7898
+Subproject commit 5bdfc7986299178af1b2f20fa2e9b2bb5dd82a6b