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

[Andras Timar (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.2-1-85:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

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

New commits:
commit 31b6e2c056a836ad7a1dc7102c3caad561d36aa3
Author: Andras Timar 
AuthorDate: Tue May 21 16:43:17 2024 +0200
Commit: Andras Timar 
CommitDate: Tue May 21 16:43:17 2024 +0200

Bump version to 24.04.3.1

Change-Id: I31cf3fd1d7b98fd7b81d9e01d0c53ddb93451baf

diff --git a/configure.ac b/configure.ac
index f788bb346a2b..cff068a56799 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([Collabora Office],[24.04.2.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[24.04.3.1],[],[],[https://collaboraoffice.com/])
 
 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/cp-24.04.1-3'

[Andras Timar (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-80:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

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

New commits:
commit 3cb9a5ebaa7527efb1dd154be0db34db62c0c8e0
Author: Andras Timar 
AuthorDate: Mon Apr 22 08:29:39 2024 +0200
Commit: Andras Timar 
CommitDate: Mon Apr 22 08:29:39 2024 +0200

Bump version to 24.04.1.3

Change-Id: I4daf190e1d5816db1f49f5741d2a497a12a49e07

diff --git a/configure.ac b/configure.ac
index 507f473c34a3..46ee6aa34278 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([Collabora Office],[24.04.1.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[24.04.1.3],[],[],[https://collaboraoffice.com/])
 
 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 'distro/collabora/co-23.05' - desktop/source include/LibreOfficeKit include/svx libreofficekit/source svx/source

[Andras Timar (via logerrit)]

 desktop/source/lib/init.cxx  |1 
 include/LibreOfficeKit/LibreOfficeKitEnums.h |9 
 include/svx/svdmrkv.hxx  |2 
 libreofficekit/source/gtk/lokdocview.cxx |1 
 svx/source/svdraw/svdedxv.cxx|   10 
 svx/source/svdraw/svdmrkv.cxx|   56 ---
 6 files changed, 18 insertions(+), 61 deletions(-)

New commits:
commit 9f04d96ba8c851cbbdb4e74b2435f9f5135fb09e
Author: Andras Timar 
AuthorDate: Thu Apr 18 14:41:17 2024 +0200
Commit: Caolán McNamara 
CommitDate: Fri Apr 19 16:03:59 2024 +0200

Revert "LOK: send inner text boundry information of shapes/textbox on 
change"

This reverts commit 42547334938118511d1052678cbd612160db1b5c.
Reason of revert: we reverted the online part earlier, because we
found it risky in the stable branch.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 32523ab22784..ea3159ae80f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1852,7 +1852,6 @@ void CallbackFlushHandler::queue(const int type, 
CallbackData& aCallbackData)
 case LOK_CALLBACK_A11Y_FOCUSED_CELL_CHANGED:
 case LOK_CALLBACK_COLOR_PALETTES:
 case LOK_CALLBACK_TOOLTIP:
-case LOK_CALLBACK_SHAPE_INNER_TEXT:
 {
 if (removeAll(type))
 SAL_INFO("lok", "Removed dups of [" << type << "]: [" << 
aCallbackData.getPayload() << "].");
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 80bb82dc32c7..a894bd473ad9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -1045,13 +1045,6 @@ typedef enum
  */
 LOK_CALLBACK_TOOLTIP = 71,
 
-/**
- * Used for sending the rectangle for text inside a shape/textbox
- *
- *  Payload contains the rectangle details
- */
-LOK_CALLBACK_SHAPE_INNER_TEXT = 72,
-
 }
 LibreOfficeKitCallbackType;
 
@@ -1224,8 +1217,6 @@ static inline const char* lokCallbackTypeToString(int 
nType)
 return "LOK_CALLBACK_CORE_LOG";
 case LOK_CALLBACK_TOOLTIP:
 return "LOK_CALLBACK_TOOLTIP";
-case LOK_CALLBACK_SHAPE_INNER_TEXT:
-return "LOK_CALLBACK_SHAPE_INNER_TEXT";
 }
 
 assert(!"Unknown LibreOfficeKitCallbackType type.");
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 6421b51b0dba..162581fc5def 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -150,7 +150,6 @@ private:
 void UndirtyMrkPnt() const;
 
 void SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const 
SfxViewShell* pOtherShell);
-OString CreateInnerTextRectString() const;
 bool dumpGluePointsToJSON(boost::property_tree::ptree& rTree);
 
 protected:
@@ -247,7 +246,6 @@ public:
 /// whether all x coordinates in use are negated or not
 void SetNegativeX(bool bOn) { mbNegativeX = bOn; }
 bool IsNegativeX() const { return mbNegativeX; }
-void SetInnerTextAreaForLOKit() const;
 
 // migrate selections
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 60c3435ac28d..f025cf99a140 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1498,7 +1498,6 @@ callback (gpointer pData)
 case LOK_CALLBACK_A11Y_SELECTION_CHANGED:
 case LOK_CALLBACK_CORE_LOG:
 case LOK_CALLBACK_TOOLTIP:
-case LOK_CALLBACK_SHAPE_INNER_TEXT:
 {
 // TODO: Implement me
 break;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 083f0f1e932b..42be2aff97fb 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1972,10 +1972,7 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 if (mpModel)
 {
 if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
-{
 mpModel->SetChanged();
-SetInnerTextAreaForLOKit();
-}
 }
 
 /* Start chaining processing */
@@ -2167,10 +2164,7 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, 
vcl::Window* pWin)
 // It could execute CommandEventId::ExtTextInput, while 
SdrObjEditView::KeyInput
 // isn't called
 if (mpTextEditOutliner && mpTextEditOutliner->IsModified())
-{
 mpModel->SetChanged();
-SetInnerTextAreaForLOKit();
-}
 }
 return true;
 }
@@ -2434,10 +2428,8 @@ bool SdrObjEditView::SetAttributes(const 

core.git: Changes to 'refs/tags/cp-24.04.1-2'

[Andras Timar (via logerrit)]

Tag 'cp-24.04.1-2' created by Andras Timar  at 
2024-04-07 12:16 +

cp-24.04.1-2

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

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

[Andras Timar (via logerrit)]

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

New commits:
commit ec6dffaad2b5662c014e5cbf117e9117e3a9cbe8
Author: Andras Timar 
AuthorDate: Sun Apr 7 14:14:10 2024 +0200
Commit: Andras Timar 
CommitDate: Sun Apr 7 14:14:10 2024 +0200

Bump version to 24.04.1.2

Change-Id: I750c8df42f998de565cd98d58cc6a4aa2f1d49a9

diff --git a/configure.ac b/configure.ac
index 13b3b0690941..24daca98d8a2 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([Collabora Office],[24.04.1.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[24.04.1.2],[],[],[https://collaboraoffice.com/])
 
 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

translations.git: Changes to 'refs/tags/co-23.05.10-1'

[Andras Timar (via logerrit)]

Tag 'co-23.05.10-1' created by Andras Timar  at 
2024-04-02 13:38 +

co-23.05.10-1

Changes since cp-23.05.9-1:
Andras Timar (1):
  [cp] Remove reference to menu in dialog text

---
 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)
---

help.git: Changes to 'refs/tags/co-23.05.10-1'

[Andras Timar (via logerrit)]

Tag 'co-23.05.10-1' created by Andras Timar  at 
2024-04-02 13:38 +

co-23.05.10-1

Changes since cp-23.05.8-4:
Andras Timar (1):
  Too big enviroment on Windows can cause failure with xargs

---
 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---

dictionaries.git: Changes to 'refs/tags/co-23.05.10-1'

[Andras Timar (via logerrit)]

Tag 'co-23.05.10-1' created by Andras Timar  at 
2024-04-02 13:38 +

co-23.05.10-1

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-22.05' - 2 commits - configure.ac download.lst external/python3

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit 2b77eb7600eefe8ab676b863f16cd5eb12700f0f
Author: Andras Timar 
AuthorDate: Tue Mar 26 10:15:03 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Mar 27 15:38:30 2024 +0100

Bump version to 22.05.23.1

Change-Id: I4947db88e1faf5fd92174ceda05fd5ecfd4fe804

diff --git a/configure.ac b/configure.ac
index 1f01097740cd..d7fc37217fb7 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([Collabora Office],[22.05.22.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.23.1],[],[],[https://collaboraoffice.com/])
 
 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
commit d26c05fb8cdf1bfbd8f0af411c5220d778c3a3a8
Author: Michael Stahl 
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Mar 27 15:38:30 2024 +0100

python3: upgrade to release 3.8.19

Fixes CVE-2023-6597 and also CVE-2024-0450

Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 97f2e134b737..1f01097740cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9775,7 +9775,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 449a7a84a3b9..3c27bcbe0942 100644
--- a/download.lst
+++ b/download.lst
@@ -248,8 +248,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
 export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-export PYTHON_TARBALL := Python-3.8.16.tar.xz
+export PYTHON_SHA256SUM := 
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+export PYTHON_TARBALL := Python-3.8.19.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/python-3.3.0-darwin.patch.1 
b/external/python3/python-3.3.0-darwin.patch.1
index 39d3c9180a19..d262d55cd5b3 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -49,7 +49,7 @@ diff -ru python3.orig/Mac/Resources/app/Info.plist.in 
python3/Mac/Resources/app/
 -  Python
 +  LibreOfficePython
CFBundleGetInfoString
-   %version%, (c) 2001-2020 Python Software Foundation.
+   %version%, (c) 2001-2023 Python Software Foundation.
CFBundleHelpBookFolder
 diff -ru python3.orig/Mac/Resources/framework/Info.plist.in 
python3/Mac/Resources/framework/Info.plist.in
 --- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 
18:50:07.0 +0200

core.git: Branch 'distro/collabora/co-22.05' - 2 commits - configure.ac download.lst

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit c4dd5aa3b1d85df89d07a21a0194894b3de1de46
Author: Andras Timar 
AuthorDate: Tue Mar 26 10:15:03 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Mar 27 15:11:56 2024 +0100

Bump version to 22.05.23.1

Change-Id: I4947db88e1faf5fd92174ceda05fd5ecfd4fe804

diff --git a/configure.ac b/configure.ac
index 1f01097740cd..d7fc37217fb7 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([Collabora Office],[22.05.22.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.23.1],[],[],[https://collaboraoffice.com/])
 
 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
commit 2ca74d92ae483abda8c0246c44583196a76d78f3
Author: Michael Stahl 
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Mar 27 15:11:56 2024 +0100

python3: upgrade to release 3.8.19

Fixes CVE-2023-6597 and also CVE-2024-0450

Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 97f2e134b737..1f01097740cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9775,7 +9775,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 449a7a84a3b9..3c27bcbe0942 100644
--- a/download.lst
+++ b/download.lst
@@ -248,8 +248,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
 export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-export PYTHON_TARBALL := Python-3.8.16.tar.xz
+export PYTHON_SHA256SUM := 
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+export PYTHON_TARBALL := Python-3.8.19.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed

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

[Andras Timar (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |  205 
+-
 1 file changed, 194 insertions(+), 11 deletions(-)

New commits:
commit de3d376a3f17b16caabe1b2376c7981178137303
Author: Andras Timar 
AuthorDate: Wed Mar 27 12:22:47 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Mar 27 12:25:56 2024 +0100

[cp] Revert "tdf#159743: Revert all Shortcut modifications in German UI"

This reverts commit 9703fddea1058cb6018a5e693f03909d2b37315c.
We decided to revert the revert, because we wanted to have the
German shortcuts like in German MS Office. It is to be decided
what to do on the long run, because it is not possible to be
compatible with MS Office and to keep the old shortcuts at the
same time.

Change-Id: Ib3e4df9c87803c5e10cb3c4cedad6274e7cddb4c

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 7f8180d72a19..71dbd7c1c391 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -687,6 +687,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:SpacePara15
+.uno:Strikeout
   
 
 
@@ -717,14 +718,26 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:Shrink
-.uno:Shrink
+.uno:HideColumn
   
 
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:Grow
-.uno:Grow
+.uno:HideRow
+  
+
+
+  
+I10 SHORTCUTS - No 
TRANSLATE
+.uno:Zoom100Percent
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:FormatCellDialog
   
 
 
@@ -885,12 +898,38 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:Group
+.uno:SaveAs
   
 
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:Ungroup
+.uno:Group
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:Ungroup
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:Ungroup
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:Group
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:InsertAnnotation
   
 
 
@@ -905,6 +944,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:FunctionDialog
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:InsertAnnotation
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -921,6 +966,13 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:ChangeCaseRotateCase
+.uno:FunctionDialog
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:ChangeCaseRotateCase
   
 
 
@@ -933,6 +985,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:Navigator
+.uno:FocusCellAddress
   
 
 
@@ -957,6 +1010,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:InsertCurrentTime
+.uno:Shrink
   
 
 
@@ -1008,6 +1062,18 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:RepeatSearch
   
 
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+.uno:Navigator
+  
+
+
+  
+L10N SHORTCUTS - NO 
TRANSLATE
+vnd.sun.star.findbar:FocusToFindbar
+  
+
 
   
 L10N SHORTCUTS - NO 
TRANSLATE
@@ -1021,6 +1087,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:RepeatSearch
 .uno:Save
 .uno:Bold
+.uno:FocusCellAddress
   
 
 
@@ -1275,12 +1342,14 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for 
some emoji thing
   
 L10N SHORTCUTS - NO 
TRANSLATE
 .uno:InsertCurrentDate
+.uno:InsertCurrentDate
  

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.10-1' created by Andras Timar  at 
2024-03-26 20:51 +

cp-23.05.10-1

Changes since cp-23.05.9-1:
Andras Timar (1):
  [cp] Remove reference to menu in dialog text

---
 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.10-1'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.10-1' created by Andras Timar  at 
2024-03-26 20:51 +

cp-23.05.10-1

Changes since cp-23.05.8-4:
Andras Timar (1):
  Too big enviroment on Windows can cause failure with xargs

---
 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.10-1'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.10-1' created by Andras Timar  at 
2024-03-26 20:51 +

cp-23.05.10-1

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-22.05' - 3 commits - configure.ac download.lst external/expat

[Andras Timar (via logerrit)]

 configure.ac|2 -
 download.lst|8 ++--
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 -
 4 files changed, 5 insertions(+), 55 deletions(-)

New commits:
commit 1e89c80eeefa9714ff2c04474d71618f66727a62
Author: Andras Timar 
AuthorDate: Tue Mar 26 10:15:03 2024 +0100
Commit: Andras Timar 
CommitDate: Tue Mar 26 10:15:03 2024 +0100

Bump version to 22.05.23.1

Change-Id: I4947db88e1faf5fd92174ceda05fd5ecfd4fe804

diff --git a/configure.ac b/configure.ac
index 97f2e134b737..6ea508f7683b 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([Collabora Office],[22.05.22.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.23.1],[],[],[https://collaboraoffice.com/])
 
 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
commit 05e7564acd09873502e46a71c941b7cbfa0a95f2
Author: Michael Stahl 
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Andras Timar 
CommitDate: Tue Mar 26 10:10:16 2024 +0100

python3: upgrade to release 3.8.19

Fixes CVE-2023-6597 and also CVE-2024-0450

Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 449a7a84a3b9..3c27bcbe0942 100644
--- a/download.lst
+++ b/download.lst
@@ -248,8 +248,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
 export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-export PYTHON_TARBALL := Python-3.8.16.tar.xz
+export PYTHON_SHA256SUM := 
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+export PYTHON_TARBALL := Python-3.8.19.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
commit 2c6b04c863dfe6023aebe7b482b929ee405f3967
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Andras Timar 
CommitDate: Tue Mar 26 10:08:43 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165177
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 0b22fab601e4..449a7a84a3b9 100644
--- a/download.lst
+++ b/download.lst
@@ -50,8 +50,8 @@ export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
 export ETONYEK_SHA256SUM := 
b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a
 export ETONYEK_VERSION_MICRO := 10
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM := 
cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
-export EXPAT_TARBALL := expat-2.6.0.tar.xz
+export EXPAT_SHA256SUM := 
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
+export EXPAT_TARBALL := expat-2.6.2.tar.xz
 export FIREBIRD_SHA256SUM := 
acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
 export FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
 export FONTCONFIG_SHA256SUM := 
a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
diff --git a/external/expat/0001-Fix-compiler-warnings.patch 
b/external/expat/0001-Fix-compiler-warnings.patch
deleted file mode 100644
index adec5ed0d9be..
--- a/external/expat/0001-Fix-compiler-warnings.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001
-From: Taichi Haradaguchi <20001...@ymail.ne.jp>
-Date: Fri, 9 Feb 2024 19:28:35 +0900
-Subject: [PATCH] Fix compiler warnings
-
-> In file included from 

core.git: Branch 'distro/collabora/co-23.05' - 3 commits - configure.ac download.lst external/expat

[Andras Timar (via logerrit)]

 configure.ac|4 +-
 download.lst|8 ++--
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 -
 4 files changed, 6 insertions(+), 56 deletions(-)

New commits:
commit 7e698f51550e366e76fadd19eea5461a70140043
Author: Andras Timar 
AuthorDate: Mon Mar 25 18:51:16 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 25 20:20:16 2024 +0100

Bump version to 23.05.10.1

Change-Id: I44284fe9816161a4ec98d1ee079cfde84951c421

diff --git a/configure.ac b/configure.ac
index 665e59b9a1f3..ea178f56c8e4 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([Collabora Office],[23.05.9.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.10.1],[],[],[https://collaboraoffice.com/])
 
 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
commit 64ea22d83d791351f33d6d30a8036bd7b1c36b96
Author: Michael Stahl 
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 25 20:20:16 2024 +0100

python3: upgrade to release 3.8.19

Fixes CVE-2023-6597 and also CVE-2024-0450

Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index e512feac736f..665e59b9a1f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10002,7 +10002,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 75b05604496a..0f41363c1b28 100644
--- a/download.lst
+++ b/download.lst
@@ -534,8 +534,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PYTHON_SHA256SUM := 
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
-PYTHON_TARBALL := Python-3.8.18.tar.xz
+PYTHON_SHA256SUM := 
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+PYTHON_TARBALL := Python-3.8.19.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit 2f92cb37f7df574d0e6322107d01b000933a52cc
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 25 20:20:16 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165177
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 1145fa8d08e1..75b05604496a 100644
--- a/download.lst
+++ b/download.lst
@@ -106,8 +106,8 @@ ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-EXPAT_SHA256SUM := 
cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
-EXPAT_TARBALL := expat-2.6.0.tar.xz
+EXPAT_SHA256SUM := 
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
+EXPAT_TARBALL := expat-2.6.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/expat/0001-Fix-compiler-warnings.patch 
b/external/expat/0001-Fix-compiler-warnings.patch
deleted file mode 100644
index adec5ed0d9be..
--- a/external/expat/0001-Fix-compiler-warnings.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001
-From: Taichi Haradaguchi <20001...@ymail.ne.jp>
-Date: Fri, 9 Feb 2024 19:28:35 +0900
-Subject: [PATCH] Fix compiler warnings
-
-> In file included from ./../lib/internal.h:149,
->

core.git: Branch 'distro/collabora/co-24.04' - postprocess/Module_postprocess.mk

[Andras Timar (via logerrit)]

 postprocess/Module_postprocess.mk |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 50e324d2101253ce08d6ce1032d65afdb7ffa74d
Author: Andras Timar 
AuthorDate: Fri Mar 22 15:51:36 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Mar 22 15:54:01 2024 +0100

[cp] Do not sign individual EXE/DLL files

Change-Id: I3137b3e3318dfade3dd8318fae2af94cc290d2d1

diff --git a/postprocess/Module_postprocess.mk 
b/postprocess/Module_postprocess.mk
index 0fbede6a9f2b..56ecd75db150 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -28,11 +28,12 @@ $(eval $(call gb_Module_add_l10n_targets,postprocess,\
Package_registry \
 ))
 
-ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
-$(eval $(call gb_Module_add_targets,postprocess,\
-   CustomTarget_signing \
-))
-endif
+# Do not sign individual EXE/DLL files
+# ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
+# $(eval $(call gb_Module_add_targets,postprocess,\
+#  CustomTarget_signing \
+# ))
+# endif
 
 # For configurations that use fontconfig (cf. inclusion of
 # vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add

core.git: Branch 'distro/collabora/co-23.05' - postprocess/Module_postprocess.mk

[Andras Timar (via logerrit)]

 postprocess/Module_postprocess.mk |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 854e7d9c3241f6becf5baa471fd1e0ffc58cb0ae
Author: Andras Timar 
AuthorDate: Fri Mar 22 15:51:36 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Mar 22 15:51:44 2024 +0100

[cp] Do not sign individual EXE/DLL files

Change-Id: I3137b3e3318dfade3dd8318fae2af94cc290d2d1

diff --git a/postprocess/Module_postprocess.mk 
b/postprocess/Module_postprocess.mk
index 0fbede6a9f2b..56ecd75db150 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -28,11 +28,12 @@ $(eval $(call gb_Module_add_l10n_targets,postprocess,\
Package_registry \
 ))
 
-ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
-$(eval $(call gb_Module_add_targets,postprocess,\
-   CustomTarget_signing \
-))
-endif
+# Do not sign individual EXE/DLL files
+# ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
+# $(eval $(call gb_Module_add_targets,postprocess,\
+#  CustomTarget_signing \
+# ))
+# endif
 
 # For configurations that use fontconfig (cf. inclusion of
 # vcl/unx/generic/fontmanager/fontconfig.cxx in Library_vcl), add

core.git: Changes to 'refs/tags/cp-24.04.1-1'

[Andras Timar (via logerrit)]

Tag 'cp-24.04.1-1' created by Andras Timar  at 
2024-03-17 21:08 +

cp-24.04.1-1

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

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

[Andras Timar (via logerrit)]

Tag 'cp-24.04.1-1' created by Andras Timar  at 
2024-03-17 21:08 +

cp-24.04.1-1

Changes since cp-24.04.0-1:
Andras Timar (1):
  [cp] Remove reference to menu in dialog text

---
 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)
---

help.git: Changes to 'refs/tags/cp-24.04.1-1'

[Andras Timar (via logerrit)]

Tag 'cp-24.04.1-1' created by Andras Timar  at 
2024-03-17 21:08 +

cp-24.04.1-1

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

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

[Andras Timar (via logerrit)]

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

New commits:
commit d28e45df219b0dbcec983f863c5a3fe20fec
Author: Andras Timar 
AuthorDate: Sun Mar 17 22:08:13 2024 +0100
Commit: Andras Timar 
CommitDate: Sun Mar 17 22:08:13 2024 +0100

Bump version to 24.04.1.1

Change-Id: I8e6c84ba97c9ef90933128afa29a56a0cbecf45c

diff --git a/configure.ac b/configure.ac
index 01cb022ea1d4..4fcc847630d2 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([Collabora Office],[24.04.0.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[24.04.1.1],[],[],[https://collaboraoffice.com/])
 
 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: helpcontent2

[Andras Timar (via logerrit)]

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

New commits:
commit 72d9d1ccbe54ff3cee6f11a81e05d2e358d359fc
Author: Andras Timar 
AuthorDate: Tue Mar 12 16:16:24 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Mar 12 16:16:24 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5dfde9a9192cb30ec373585ff1bfe2121cd6bccf
  - Too big environment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163117
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index 04dcd1b95168..5dfde9a9192c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 04dcd1b951689689f9449408fd6f512a9c87aa0d
+Subproject commit 5dfde9a9192cb30ec373585ff1bfe2121cd6bccf

help.git: CustomTarget_html.mk

[Andras Timar (via logerrit)]

 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5dfde9a9192cb30ec373585ff1bfe2121cd6bccf
Author: Andras Timar 
AuthorDate: Thu Feb 8 14:14:22 2024 +0100
Commit: Andras Timar 
CommitDate: Tue Mar 12 16:16:23 2024 +0100

Too big environment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163117
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index ac3f21956a..a3a9cec55f 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -53,7 +53,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
( \
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
helpcontent2/source/text/,,$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), ))) 
 && \
echo 'var hid2fileMap = {' \
-   && cd $(SRCDIR)/helpcontent2/source/text && $(call 
gb_ExternalExecutable_get_command,xsltproc,xargs) $< <$$RESPONSEFILE || { rm 
$$RESPONSEFILE; exit 1 ; } \
+   && cd $(SRCDIR)/helpcontent2/source/text && $(call 
gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i 
$(gb_Helper_set_ld_path)) xargs) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE; 
exit 1 ; } \
&& rm "$$RESPONSEFILE" \
&& echo '};' \
) > $@
@@ -289,7 +289,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
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,xargs) \
+   $(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') \

core.git: Changes to 'refs/tags/cp-21.06.41-1'

[Andras Timar (via logerrit)]

Tag 'cp-21.06.41-1' created by Andras Timar  at 
2024-03-11 12:43 +

cp-21.06.41-1

Changes since cp-21.06.40-1-1:
---
 0 files changed
---

core.git: Branch 'distro/collabora/co-2021' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 9d1f0984a0d604165c948112369d8c51df428377
Author: Andras Timar 
AuthorDate: Mon Mar 11 13:43:02 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 11 13:43:02 2024 +0100

Bump version to 21.06.41.1

diff --git a/configure.ac b/configure.ac
index cff196ca6e17..af6e05ab3737 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([Collabora Office],[21.06.40.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.41.1],[],[],[https://collaboraoffice.com/])
 
 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' - helpcontent2

[Andras Timar (via logerrit)]

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

New commits:
commit 059d3c514d28b075793be75fd9c1739ec1aeea99
Author: Andras Timar 
AuthorDate: Sun Mar 10 21:44:05 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Mar 10 21:44:05 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-24-2'
  to 87aff2af247c6f6bfc2a656fcc7c9c5c4d83a077
  - fix Helpex warnings: 'No string specified!'

Change-Id: I70ad73b6859cd989e6046c3bd5a76c54c27f416d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164631
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 99537726eca951a450182d7672458afeb2b65e66)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164615
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 1eed95f9a3d9..87aff2af247c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1eed95f9a3d99dc12aa83fecbf7767630dfb79bd
+Subproject commit 87aff2af247c6f6bfc2a656fcc7c9c5c4d83a077

help.git: Branch 'libreoffice-24-2' - source/text

[Andras Timar (via logerrit)]

 source/text/shared/guide/pdf_params.xhp  |4 ++--
 source/text/shared/guide/usingthemes.xhp |1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 87aff2af247c6f6bfc2a656fcc7c9c5c4d83a077
Author: Andras Timar 
AuthorDate: Sun Mar 10 11:51:52 2024 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Mar 10 21:44:05 2024 +0100

fix Helpex warnings: 'No string specified!'

Change-Id: I70ad73b6859cd989e6046c3bd5a76c54c27f416d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164631
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 99537726eca951a450182d7672458afeb2b65e66)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/164615
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/pdf_params.xhp 
b/source/text/shared/guide/pdf_params.xhp
index 04d172be1d..04d51074dd 100644
--- a/source/text/shared/guide/pdf_params.xhp
+++ b/source/text/shared/guide/pdf_params.xhp
@@ -926,7 +926,7 @@
 PreparedPasswords
 
 
-
+
 
 
 
@@ -940,7 +940,7 @@
 PreparedPermissionPassword
 
 
-
+
 
 
 string
diff --git a/source/text/shared/guide/usingthemes.xhp 
b/source/text/shared/guide/usingthemes.xhp
index df1ab52bd9..26ead5291b 100644
--- a/source/text/shared/guide/usingthemes.xhp
+++ b/source/text/shared/guide/usingthemes.xhp
@@ -22,7 +22,6 @@
 
 
 Using Document 
Themes
-
 
 Theme is the 
concept of bundling color, font and format settings. The colors, fonts and 
format settings names are hard coded in the document. When switching themes in 
the document, the elements containing the hardcoded names switch colors, fonts 
and format settings accordingly to the new theme.
 To Apply a Theme to the Document

help.git: source/text

[Andras Timar (via logerrit)]

 source/text/sbasic/python/python_shell.xhp |1 -
 source/text/shared/guide/pdf_params.xhp|4 ++--
 source/text/shared/guide/usingthemes.xhp   |1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 99537726eca951a450182d7672458afeb2b65e66
Author: Andras Timar 
AuthorDate: Sun Mar 10 11:51:52 2024 +0100
Commit: Olivier Hallot 
CommitDate: Sun Mar 10 17:48:46 2024 +0100

fix Helpex warnings: 'No string specified!'

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

diff --git a/source/text/sbasic/python/python_shell.xhp 
b/source/text/sbasic/python/python_shell.xhp
index d56acf74a8..3a699f9fac 100644
--- a/source/text/sbasic/python/python_shell.xhp
+++ b/source/text/sbasic/python/python_shell.xhp
@@ -24,7 +24,6 @@
 Running Python Interactive 
Console
 
 The Python interactive console, 
also known as Python interpreter or Python shell, provides programmers with a 
quick way to execute commands and try out and test code without creating a 
file. UNO objects introspection as well as %PRODUCTNAME Python modules 
documentation can be obtained from the terminal.
-
 
 

diff --git a/source/text/shared/guide/pdf_params.xhp 
b/source/text/shared/guide/pdf_params.xhp
index 04d172be1d..04d51074dd 100644
--- a/source/text/shared/guide/pdf_params.xhp
+++ b/source/text/shared/guide/pdf_params.xhp
@@ -926,7 +926,7 @@
 PreparedPasswords
 
 
-
+
 
 
 
@@ -940,7 +940,7 @@
 PreparedPermissionPassword
 
 
-
+
 
 
 string
diff --git a/source/text/shared/guide/usingthemes.xhp 
b/source/text/shared/guide/usingthemes.xhp
index df1ab52bd9..26ead5291b 100644
--- a/source/text/shared/guide/usingthemes.xhp
+++ b/source/text/shared/guide/usingthemes.xhp
@@ -22,7 +22,6 @@
 
 
 Using Document 
Themes
-
 
 Theme is the 
concept of bundling color, font and format settings. The colors, fonts and 
format settings names are hard coded in the document. When switching themes in 
the document, the elements containing the hardcoded names switch colors, fonts 
and format settings accordingly to the new theme.
 To Apply a Theme to the Document

core.git: helpcontent2

[Andras Timar (via logerrit)]

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

New commits:
commit 9561465c43da93bee0f259fe57748785ac1cb8b5
Author: Andras Timar 
AuthorDate: Sun Mar 10 17:48:46 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Sun Mar 10 17:48:46 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 99537726eca951a450182d7672458afeb2b65e66
  - fix Helpex warnings: 'No string specified!'

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

diff --git a/helpcontent2 b/helpcontent2
index d2beb0a61359..99537726eca9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2beb0a61359f458b5b909fba1dd3452a1d2920d
+Subproject commit 99537726eca951a450182d7672458afeb2b65e66

core.git: Changes to 'refs/tags/cp-23.05.9-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-4' created by Andras Timar  at 
2024-03-08 15:19 +

cp-23.05.9-4

Changes since cp-23.05.9-3-5:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cp-23.05.9-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-4' created by Andras Timar  at 
2024-03-08 15:19 +

cp-23.05.9-4

Changes since cp-23.05.9-1:
Andras Timar (1):
  [cp] Remove reference to menu in dialog text

---
 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.9-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-4' created by Andras Timar  at 
2024-03-08 15:19 +

cp-23.05.9-4

Changes since cp-23.05.8-4:
Andras Timar (1):
  Too big enviroment on Windows can cause failure with xargs

---
 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.9-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-4' created by Andras Timar  at 
2024-03-08 15:19 +

cp-23.05.9-4

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 058ade62ea47bb84525b21a21df73c86ec4a363f
Author: Andras Timar 
AuthorDate: Fri Mar 8 16:19:26 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Mar 8 16:19:26 2024 +0100

Bump version to 23.05.9.4

Change-Id: Ice55fc9478d086c90d7e6c2cdcf224247d1ca1ad

diff --git a/configure.ac b/configure.ac
index 490065a64534..e512feac736f 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([Collabora Office],[23.05.9.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.9.4],[],[],[https://collaboraoffice.com/])
 
 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 'distro/collabora/co-24.04' - 50 commits - accessibility/inc accessibility/source basic/source chart2/qa chart2/source comphelper/source config_host.mk.in configure.ac download.lst dr

[Andras Timar (via logerrit)]

 accessibility/inc/standard/vclxaccessiblelist.hxx  |2 
 accessibility/source/standard/vclxaccessiblelist.cxx   |   10 
 basic/source/comp/loops.cxx|5 
 chart2/qa/extras/data/ods/tdf153706_XY_scatter_chart.ods   |binary
 chart2/qa/extras/uichart.cxx   |   54 
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx  |   10 
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx  |   11 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx   |2 
 comphelper/source/misc/storagehelper.cxx   |1 
 config_host.mk.in  |1 
 configure.ac   |   20 
 download.lst   |   26 
 drawinglayer/inc/texture/texture3d.hxx |2 
 drawinglayer/source/texture/texture3d.cxx  |   12 
 editeng/source/misc/svxacorr.cxx   |2 
 external/boost/UnpackedTarball_boost.mk|1 
 external/boost/windows-no-utf8-locales.patch.0 |   23 
 external/gpgmepp/ExternalPackage_gpgmepp.mk|4 
 external/gpgmepp/Library_gpgmepp.mk|1 
 external/gpgmepp/Wincompatible-function-pointer-types.patch|4 
 external/gpgmepp/w32-build-fixes.patch.1   |   19 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk  |1 
 external/harfbuzz/tdf159529.patch.0|   28 
 external/libxml2/ExternalPackage_libxml2.mk|2 
 external/libxml2/libxml2-global-symbols.patch  |8 
 external/more_fonts/ExternalPackage_noto_kufi_arabic.mk|4 
 external/more_fonts/UnpackedTarball_noto_kufi_arabic.mk|2 
 external/xmlsec/BCryptKeyDerivation.patch.1|   51 
 external/xmlsec/UnpackedTarball_xmlsec.mk  |2 
 filter/source/xsltfilter/LibXSLTTransformer.cxx|   16 
 helpcompiler/source/HelpCompiler.cxx   |   14 
 include/svx/dlgctl3d.hxx   |1 
 include/svx/sidebar/ValueSetWithTextControl.hxx|1 
 include/vcl/print.hxx  |1 
 include/vcl/rendercontext/State.hxx|4 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |  205 
 officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |4 
 package/source/zippackage/ZipPackage.cxx   |5 
 readlicense_oo/license/CREDITS.fodt| 4365 
+-
 ridljar/Jar_libreoffice.mk |6 
 ridljar/Jar_unoloader.mk   |8 
 sc/CppunitTest_sc_filters_test.mk  |1 
 sc/inc/clipcontext.hxx |5 
 sc/inc/drwlayer.hxx|3 
 sc/inc/filterentries.hxx   |7 
 sc/qa/uitest/autofilter2/tdf159420.py  |  126 
 sc/qa/unit/data/ods/tdf160003_page_anchored_object.ods |binary
 sc/qa/unit/scshapetest.cxx |   24 
 sc/source/core/data/clipcontext.cxx|4 
 sc/source/core/data/column.cxx |6 
 sc/source/core/data/column3.cxx|   17 
 sc/source/core/data/document.cxx   |   14 
 sc/source/core/data/drwlayer.cxx   |  142 
 sc/source/filter/excel/excel.cxx   |4 
 sc/source/ui/app/inputhdl.cxx  |2 
 sd/source/ui/animations/CustomAnimationList.cxx|8 
 sfx2/source/view/viewfrm.cxx   |  117 
 solenv/bin/assemble-flatpak-appdata.sh |1 
 solenv/gbuild/JavaClassSet.mk  |6 
 starmath/source/document.cxx   |   10 
 svgio/inc/svgstyleattributes.hxx   |   12 
 svgio/inc/svgtoken.hxx |1 
 svgio/qa/cppunit/SvgImportTest.cxx |   17 
 svgio/qa/cppunit/data/tdf159968.svg|   37 
 svgio/source/svgreader/svgstyleattributes.cxx  |   38 
 svgio/source/svgreader/svgtoken.cxx|1 
 svl/source/items/srchitem.cxx  |2 
 svx/source/dialog/dlgctl3d.cxx |5 
 svx/source/form/labelitemwindow.cxx|2 
 

core.git: Changes to 'refs/tags/cp-23.05.9-3'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-3' created by Andras Timar  at 
2024-03-04 13:44 +

cp-23.05.9-3

Changes since cp-23.05.9-2-19:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-3' created by Andras Timar  at 
2024-03-04 13:44 +

cp-23.05.9-3

Changes since cp-23.05.9-1:
Andras Timar (1):
  [cp] Remove reference to menu in dialog text

---
 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.9-3'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-3' created by Andras Timar  at 
2024-03-04 13:44 +

cp-23.05.9-3

Changes since cp-23.05.8-4:
Andras Timar (1):
  Too big enviroment on Windows can cause failure with xargs

---
 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.9-3'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-3' created by Andras Timar  at 
2024-03-04 13:44 +

cp-23.05.9-3

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit a9f0089eb2186cf0036a82df07e264d08e9c4b2b
Author: Andras Timar 
AuthorDate: Mon Mar 4 14:43:58 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 4 14:43:58 2024 +0100

Bump version to 23.05.9.3

Change-Id: I14522d60e0529e7c8521937f02680dd49c160e19

diff --git a/configure.ac b/configure.ac
index 5b3c5732c589..490065a64534 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([Collabora Office],[23.05.9.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.9.3],[],[],[https://collaboraoffice.com/])
 
 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/cp-23.05.9-2'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-2' created by Andras Timar  at 
2024-02-26 15:57 +

cp-23.05.9-2

Changes since cp-23.05.9-1-33:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cp-23.05.9-2'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-2' created by Andras Timar  at 
2024-02-26 15:57 +

cp-23.05.9-2

Changes since cp-23.05.9-1:
Andras Timar (1):
  [cp] Remove reference to menu in dialog text

---
 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.9-2'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-2' created by Andras Timar  at 
2024-02-26 15:57 +

cp-23.05.9-2

Changes since cp-23.05.8-4:
Andras Timar (1):
  Too big enviroment on Windows can cause failure with xargs

---
 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.9-2'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-2' created by Andras Timar  at 
2024-02-26 15:57 +

cp-23.05.9-2

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 3f7a66d69aa47b63b3247266ebf706d63e92b50b
Author: Andras Timar 
AuthorDate: Mon Feb 26 16:57:23 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 26 16:57:23 2024 +0100

Bump version to 23.05.9.2

Change-Id: I6f9ede0bfa286e0ee2490a525bd673e2271823bd

diff --git a/configure.ac b/configure.ac
index ee308389403b..5b3c5732c589 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([Collabora Office],[23.05.9.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.9.2],[],[],[https://collaboraoffice.com/])
 
 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 'distro/collabora/libreoffice-7-5+backports' - 5 commits - configure.ac download.lst external/nss external/openssl

[Andras Timar (via logerrit)]

 configure.ac   |2 -
 download.lst   |8 +++
 external/nss/README|   26 ++---
 external/openssl/configurable-z-option.patch.0 |   14 ++---
 4 files changed, 23 insertions(+), 27 deletions(-)

New commits:
commit b9549d52decac9570cf4796652a0a6e64c1f449b
Author: Andras Timar 
AuthorDate: Fri Feb 23 11:00:13 2024 +0100
Commit: Andras Timar 
CommitDate: Fri Feb 23 11:00:13 2024 +0100

Bump version to 7.5.9.4

Change-Id: I7413926adaf629edfc91a62488661b9071b667b8

diff --git a/configure.ac b/configure.ac
index 123c56fc0852..4faf9002896c 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.5.9.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.9.4],[],[],[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
commit 0b4f9426d7c131e70bb98ef9e6aab99464702a0c
Author: Mike Kaganski 
AuthorDate: Fri Feb 16 13:43:20 2024 +0600
Commit: Andras Timar 
CommitDate: Fri Feb 23 10:59:46 2024 +0100

OpenSSL: upgrade to 3.0.13

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

diff --git a/download.lst b/download.lst
index b7d70460336d..1133601065bf 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
-OPENSSL_TARBALL := openssl-3.0.11.tar.gz
+OPENSSL_SHA256SUM := 
88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
+OPENSSL_TARBALL := openssl-3.0.13.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit c36996abf3b792fc7da953275a7ba58ca7b0fd0f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Andras Timar 
CommitDate: Fri Feb 23 10:59:04 2024 +0100

openssl: upgrade to release 3.0.11

Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163522
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 5abd5b8039bc..b7d70460336d 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
-OPENSSL_TARBALL := openssl-3.0.10.tar.gz
+OPENSSL_SHA256SUM := 
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
+OPENSSL_TARBALL := openssl-3.0.11.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openssl/configurable-z-option.patch.0 
b/external/openssl/configurable-z-option.patch.0
index 9a4426edd5d2..d9478b6a9701 100644
--- a/external/openssl/configurable-z-option.patch.0
+++ b/external/openssl/configurable-z-option.patch.0
@@ -1,15 +1,15 @@
 Configurations/10-main.conf.sav2021-08-24 13:38:47.0 +
-+++ Configurations/10-main.conf2021-11-02 22:20:44.377653700 +
-@@ -13,7 +13,7 @@
+--- Configurations/10-main.conf.sav2023-09-19 22:02:31.0 +0900
 Configurations/10-main.conf2023-09-30 23:47:49.734377000 +0900
+@@ -14,7 +14,7 @@
  } elsif ($disabled{asm}) {
  # assembler is still used to compile uplink shim
  $vc_win64a_info = { AS=> "ml64",
 -ASFLAGS   => "/nologo /Zi",
 +ASFLAGS   => "/nologo $$(DEBUG_FLAGS_VALUE)",
  asflags   => "/c /Cp /Cx",
- asoutflag => "/Fo" };
- } else {
-@@ -41,7 +41,7 @@
+ asoutflag => "/Fo",
+ perlasm_scheme => "masm" };
+@@ -44,7 +44,7 @@
  } elsif ($disabled{asm}) {
  # not actually used, uplink shim is inlined into C code
  $vc_win32_info = { AS=> "ml",
@@ -18,7 +18,7 @@
 asflags   => "/Cp /coff /c /Cx",
 asoutflag => "/Fo",

translations.git: Branch 'distro/collabora/co-24.04' - source/ar source/bg source/ca source/cs source/da source/de source/el source/en-GB source/eo source/es source/eu source/fi source/fr source/gl so

[Andras Timar (via logerrit)]

 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)

New commits:
commit ced8f5a17e47cf094e7b82b6a84e46766e10621c
Author: Andras Timar 
AuthorDate: Thu Feb 22 23:12:43 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 22 23:28:24 2024 +0100

[cp] Remove reference to menu in dialog text

Change-Id: Ifabd27fba28f8189f4be3f3c3604982eba4602bc

diff --git a/source/ar/sc/messages.po b/source/ar/sc/messages.po
index a10378a5540..2eca88f9b15 100644
--- a/source/ar/sc/messages.po
+++ b/source/ar/sc/messages.po
@@ -19821,14 +19821,8 @@ msgstr ""
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' from the 'Tools' menu."
-msgstr ""
-"لن تعمل حماية الخلية إلا بعد حماية الورقة الحالية.
"
-"
"
-"اختر ’احمِ الورقة‘ من قائمة ’أدوات‘."
+msgid "Cell protection is only effective after the current sheet has been 
protected."
+msgstr "لن تعمل حماية الخلية إلا بعد حماة الورقة الحالية."
 
 #. bVREg
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:121
diff --git a/source/bg/sc/messages.po b/source/bg/sc/messages.po
index f154d15321d..028376de5ef 100644
--- a/source/bg/sc/messages.po
+++ b/source/bg/sc/messages.po
@@ -19545,14 +19545,8 @@ msgstr "Скрива формулите и съдържанието на изб
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' from the 'Tools' menu."
-msgstr ""
-"Защитаването на клетки има ефект само ако текущият лист е защитен.
"
-"
"
-"Изберете „Защитаване на лист“ от менюто „Инструменти“."
+msgid "Cell protection is only effective after the current sheet has been 
protected."
+msgstr "Защитаването на клетки има ефект само ако текущият лист е защитен."
 
 #. bVREg
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:121
diff --git a/source/ca/sc/messages.po b/source/ca/sc/messages.po
index ef756770d89..bba7e9bfb59 100644
--- a/source/ca/sc/messages.po
+++ b/source/ca/sc/messages.po
@@ -19544,14 +19544,8 @@ msgstr "Amaga les fórmules i els continguts de les 
cel·les seleccionades."
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' from the 'Tools' menu."
-msgstr ""
-"La protecció de cel·les només és efectiva després d'haver protegit el full 
actual.
"
-"
"
-"Seleccioneu «Protegeix el full» al menú «Eines»."
+msgid "Cell protection is only effective after the current sheet has been 
protected."
+msgstr "La protecció de cel·les només és efectiva després d'haver protegit el 
full actual."
 
 #. bVREg
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:121
diff --git a/source/cs/sc/messages.po b/source/cs/sc/messages.po
index 7d14c9d4a55..0f5e4aa44b4 100644
--- a/source/cs/sc/messages.po
+++ b/source/cs/sc/messages.po
@@ -19550,14 +19550,8 @@ msgstr "Skryje vzorce a obsah vybraných buněk."
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' 

core.git: Branch 'distro/collabora/co-24.04' - 2 commits - sc/uiconfig translations

[Andras Timar (via logerrit)]

 sc/uiconfig/scalc/ui/cellprotectionpage.ui |4 +---
 translations   |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 77f69dc3b530eabcb15939e60f2c702374279d3d
Author: Andras Timar 
AuthorDate: Thu Feb 22 23:29:12 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 22 23:29:12 2024 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-24.04'
  to ced8f5a17e47cf094e7b82b6a84e46766e10621c
  - [cp] Remove reference to menu in dialog text

Change-Id: Ifabd27fba28f8189f4be3f3c3604982eba4602bc

diff --git a/translations b/translations
index a90a713acbaa..ced8f5a17e47 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a90a713acbaa675695628c7553fbfc65d3847c30
+Subproject commit ced8f5a17e47cf094e7b82b6a84e46766e10621c
commit eb9284352e3ec96ffd0370918f52f4e47667ec3c
Author: Hubert Figuière 
AuthorDate: Thu Feb 22 10:50:53 2024 -0500
Commit: Andras Timar 
CommitDate: Thu Feb 22 23:29:01 2024 +0100

[cp] tdf#159748 Remove reference to menu in dialog text

This menu doesn't exist when using the tabbed UI

Change-Id: I2dc89e630049171777684aff55b51872121b6e39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163776
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 581ca37c96ee5b1d029d79bf7bb4c7b6baf5487c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163764

diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui 
b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
index b9a2d90a72c6..9074d3a04aff 100644
--- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui
+++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
@@ -96,9 +96,7 @@
 False
 end
 True
-Cell protection is only effective after the 
current sheet has been protected.
-
-Select 'Protect Sheet' from the 'Tools' menu.
+Cell protection is only effective after the 
current sheet has been protected.
 True
 52
 0

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

[Andras Timar (via logerrit)]

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

New commits:
commit ea94227b5691d8ccaaf395b4b03d30a8f21a0416
Author: Andras Timar 
AuthorDate: Thu Feb 22 23:12:51 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 22 23:12:51 2024 +0100

Update git submodules

* Update translations from branch 'distro/collabora/co-23.05'
  to b7278f5d10b67302ccdff518780d3ec1c35bb716
  - [cp] Remove reference to menu in dialog text

Change-Id: Ifabd27fba28f8189f4be3f3c3604982eba4602bc

diff --git a/translations b/translations
index 4d2a86a36c1f..b7278f5d10b6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4d2a86a36c1f0c6809014cc879e3915ceedee7d1
+Subproject commit b7278f5d10b67302ccdff518780d3ec1c35bb716

translations.git: Branch 'distro/collabora/co-23.05' - source/ar source/bg source/ca source/cs source/da source/de source/el source/en-GB source/eo source/es source/eu source/fi source/fr source/gl so

[Andras Timar (via logerrit)]

 source/ar/sc/messages.po|   10 ++
 source/bg/sc/messages.po|   10 ++
 source/ca/sc/messages.po|   10 ++
 source/cs/sc/messages.po|   10 ++
 source/da/sc/messages.po|   10 ++
 source/de/sc/messages.po|   10 ++
 source/el/sc/messages.po|   10 ++
 source/en-GB/sc/messages.po |   10 ++
 source/eo/sc/messages.po|   10 ++
 source/es/sc/messages.po|   10 ++
 source/eu/sc/messages.po|   10 ++
 source/fi/sc/messages.po|   10 ++
 source/fr/sc/messages.po|   10 ++
 source/gl/sc/messages.po|   10 ++
 source/hr/sc/messages.po|   10 ++
 source/hu/sc/messages.po|   10 ++
 source/id/sc/messages.po|   10 ++
 source/is/sc/messages.po|   10 ++
 source/it/sc/messages.po|   10 ++
 source/ja/sc/messages.po|   10 ++
 source/ko/sc/messages.po|   10 ++
 source/nb/sc/messages.po|   10 ++
 source/nl/sc/messages.po|   10 ++
 source/oc/sc/messages.po|   10 ++
 source/pl/sc/messages.po|   10 ++
 source/pt-BR/sc/messages.po |   10 ++
 source/pt/sc/messages.po|   10 ++
 source/ru/sc/messages.po|   10 ++
 source/sk/sc/messages.po|   10 ++
 source/sl/sc/messages.po|   10 ++
 source/sv/sc/messages.po|   10 ++
 source/tr/sc/messages.po|   10 ++
 source/uk/sc/messages.po|   10 ++
 source/zh-CN/sc/messages.po |   10 ++
 source/zh-TW/sc/messages.po |   10 ++
 35 files changed, 70 insertions(+), 280 deletions(-)

New commits:
commit b7278f5d10b67302ccdff518780d3ec1c35bb716
Author: Andras Timar 
AuthorDate: Thu Feb 22 23:12:43 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 22 23:12:43 2024 +0100

[cp] Remove reference to menu in dialog text

Change-Id: Ifabd27fba28f8189f4be3f3c3604982eba4602bc

diff --git a/source/ar/sc/messages.po b/source/ar/sc/messages.po
index 64d94cc2e00..bf0c2e6eee5 100644
--- a/source/ar/sc/messages.po
+++ b/source/ar/sc/messages.po
@@ -19571,14 +19571,8 @@ msgstr ""
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' from the 'Tools' menu."
-msgstr ""
-"لن تعمل حماية الخلية إلا بعد حماية الورقة الحالية.
"
-"
"
-"اختر ’احمِ الورقة‘ من قائمة ’أدوات‘."
+msgid "Cell protection is only effective after the current sheet has been 
protected."
+msgstr "لن تعمل حماية الخلية إلا بعد حماة الورقة الحالية."
 
 #. bVREg
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:121
diff --git a/source/bg/sc/messages.po b/source/bg/sc/messages.po
index da73398ed31..1e927186e9d 100644
--- a/source/bg/sc/messages.po
+++ b/source/bg/sc/messages.po
@@ -19302,14 +19302,8 @@ msgstr "Скрива формулите и съдържанието на изб
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' from the 'Tools' menu."
-msgstr ""
-"Защитаването на клетки има ефект само ако текущият лист е защитен.
"
-"
"
-"Изберете „Защитаване на лист“ от менюто „Инструменти“."
+msgid "Cell protection is only effective after the current sheet has been 
protected."
+msgstr "Защитаването на клетки има ефект само ако текущият лист е защитен."
 
 #. bVREg
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:121
diff --git a/source/ca/sc/messages.po b/source/ca/sc/messages.po
index c0a14b2f701..7c1c74fb7b7 100644
--- a/source/ca/sc/messages.po
+++ b/source/ca/sc/messages.po
@@ -19301,14 +19301,8 @@ msgstr "Amaga les fórmules i els continguts de les 
cel·les seleccionades."
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' from the 'Tools' menu."
-msgstr ""
-"La protecció de cel·les només és efectiva després d'haver protegit el full 
actual.
"
-"
"
-"Seleccioneu «Protegeix el full» al menú «Eines»."
+msgid "Cell protection is only effective after the current sheet has been 
protected."
+msgstr "La protecció de cel·les només és efectiva després d'haver protegit el 
full actual."
 
 #. bVREg
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:121
diff --git a/source/cs/sc/messages.po b/source/cs/sc/messages.po
index 80ad58ad159..bbb737cffb1 100644
--- a/source/cs/sc/messages.po
+++ b/source/cs/sc/messages.po
@@ -19305,14 +19305,8 @@ msgstr "Skryje vzorce a obsah vybraných buněk."
 #. fBWyS
 #: sc/uiconfig/scalc/ui/cellprotectionpage.ui:99
 msgctxt "cellprotectionpage|label1"
-msgid ""
-"Cell protection is only effective after the current sheet has been protected.
"
-"
"
-"Select 'Protect Sheet' 

core.git: Changes to 'refs/tags/cp-22.05.22-2'

[Andras Timar (via logerrit)]

Tag 'cp-22.05.22-2' created by Andras Timar  at 
2024-02-19 08:15 +

cp-22.05.22-2

Changes since cp-22.05.22-1-4:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cp-22.05.22-2'

[Andras Timar (via logerrit)]

Tag 'cp-22.05.22-2' created by Andras Timar  at 
2024-02-19 08:15 +

cp-22.05.22-2

Changes since cp-22.05.10-1-1:
---
 0 files changed
---

help.git: Changes to 'refs/tags/cp-22.05.22-2'

[Andras Timar (via logerrit)]

Tag 'cp-22.05.22-2' created by Andras Timar  at 
2024-02-19 08:15 +

cp-22.05.22-2

Changes since cp-22.05.20-1-3:
---
 0 files changed
---

core.git: Branch 'distro/collabora/co-22.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit d02b2d23c8d3dec8585df17cd2fe6f68e0a707b3
Author: Andras Timar 
AuthorDate: Mon Feb 19 09:15:37 2024 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 19 09:15:37 2024 +0100

Bump version to 22.05.22.2

Change-Id: I2dccdfdf26e570fde9065b7239b7100489bf04fb

diff --git a/configure.ac b/configure.ac
index e6ead5547b46..97f2e134b737 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([Collabora Office],[22.05.22.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.22.2],[],[],[https://collaboraoffice.com/])
 
 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' - download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74486211adfb81a8b4d23c51457ff62acd804956
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 16 13:07:49 2024 +0100

nss: upgrade to release 3.97

Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163407
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 7c8b82259070..a4c01a1db57e 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
-NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'libreoffice-7-6' - download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 85c6a7a4944efa5b91e25a35860997e254d35f4c
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 16 11:55:43 2024 +0100

nss: upgrade to release 3.97

Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163408
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 2022db8bba0f..8a4c256adede 100644
--- a/download.lst
+++ b/download.lst
@@ -397,8 +397,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
-NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'distro/collabora/co-22.05' - download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4e2fa6689816c958c36d062f520b7592094d9e7
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 16 09:49:30 2024 +0100

nss: upgrade to release 3.97

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

diff --git a/download.lst b/download.lst
index 4e3aab3a045d..b3769bb4206f 100644
--- a/download.lst
+++ b/download.lst
@@ -217,8 +217,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
 export NEON_TARBALL := neon-0.31.2.tar.gz
-export NSS_SHA256SUM := 
fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a
-export NSS_TARBALL := nss-3.88.1-with-nspr-4.35.tar.gz
+export NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+export NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 export ODFGEN_SHA256SUM := 
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
 export ODFGEN_VERSION_MICRO := 8
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz

core.git: Branch 'distro/collabora/co-23.05' - download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5108755200da57a51c2756ec8336f3606fa91e0
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 16 09:49:13 2024 +0100

nss: upgrade to release 3.97

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

diff --git a/download.lst b/download.lst
index 7555fe0ba249..952fd21e0c85 100644
--- a/download.lst
+++ b/download.lst
@@ -461,8 +461,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a
-NSS_TARBALL := nss-3.88.1-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Caolán McNamara 
CommitDate: Fri Feb 16 09:48:51 2024 +0100

nss: upgrade to release 3.97

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

diff --git a/download.lst b/download.lst
index 15482ddb49b1..626891289b59 100644
--- a/download.lst
+++ b/download.lst
@@ -477,8 +477,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
-NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Changes to 'refs/tags/cp-22.05.22-1'

[Andras Timar (via logerrit)]

Tag 'cp-22.05.22-1' created by Andras Timar  at 
2024-02-15 12:56 +

cp-22.05.22-1

Changes since cp-22.05.21-1-4:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-22.05.22-1' created by Andras Timar  at 
2024-02-15 12:56 +

cp-22.05.22-1

Changes since cp-22.05.10-1-1:
---
 0 files changed
---

help.git: Changes to 'refs/tags/cp-22.05.22-1'

[Andras Timar (via logerrit)]

Tag 'cp-22.05.22-1' created by Andras Timar  at 
2024-02-15 12:56 +

cp-22.05.22-1

Changes since cp-22.05.20-1-3:
---
 0 files changed
---

core.git: Branch 'distro/collabora/co-22.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit e9a4dc879d6f8ee7f2326e503a2e76ca36909f06
Author: Andras Timar 
AuthorDate: Thu Feb 15 13:55:39 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 15 13:55:39 2024 +0100

Bump version to 22.05.22.1

Change-Id: Ibe671708c3e722b1dab2a6bb89f1d4dac5ef27d3

diff --git a/configure.ac b/configure.ac
index ac14c5440705..e6ead5547b46 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([Collabora Office],[22.05.21.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.22.1],[],[],[https://collaboraoffice.com/])
 
 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 'distro/collabora/co-24.04' - download.lst

[Andras Timar (via logerrit)]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3682749333934523e24521eebb34570cfb283713
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 15 08:18:02 2024 +0100

nss: upgrade to release 3.97

Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163391
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 75917e55d553..db9dde12b00a 100644
--- a/download.lst
+++ b/download.lst
@@ -540,8 +540,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
-NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

help.git: Changes to 'refs/tags/cp-24.04.0-1'

[Andras Timar (via logerrit)]

Tag 'cp-24.04.0-1' created by Andras Timar  at 
2024-02-14 17:29 +

cp-24.04.0-1

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

core.git: Changes to 'refs/tags/cp-23.05.9-1'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-1' created by Andras Timar  at 
2024-02-14 12:04 +

cp-23.05.9-1

Changes since cp-23.05.8-4-26:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-1' created by Andras Timar  at 
2024-02-14 12:04 +

cp-23.05.9-1

Changes since cp-23.05.6-4:
Andras Timar (1):
  Update German translation (easy conditional formatting dialog)

---
 source/de/sc/messages.po |  981 +++
 1 file changed, 494 insertions(+), 487 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.9-1'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-1' created by Andras Timar  at 
2024-02-14 12:04 +

cp-23.05.9-1

Changes since cp-23.05.8-4:
Andras Timar (1):
  Too big enviroment on Windows can cause failure with xargs

---
 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.9-1'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.9-1' created by Andras Timar  at 
2024-02-14 12:04 +

cp-23.05.9-1

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 959a80bf7b140cd7a0bd1dea67ade602529a2457
Author: Andras Timar 
AuthorDate: Wed Feb 14 13:03:47 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 14 13:03:47 2024 +0100

Bump version to 23.05.9.1

Change-Id: Ie7ce6f8a14322f75059d2190c89b5a3d8d9a69b2

diff --git a/configure.ac b/configure.ac
index 2d79013f0258..ee308389403b 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([Collabora Office],[23.05.8.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.9.1],[],[],[https://collaboraoffice.com/])
 
 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 'distro/collabora/co-24.04' - helpcontent2

[Andras Timar (via logerrit)]

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

New commits:
commit fbe0fe6ccc2a0d83695cde653f5f377f01d8dc9f
Author: Andras Timar 
AuthorDate: Sun Feb 11 00:20:06 2024 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Feb 10 23:20:06 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'distro/collabora/co-24.04'
  to e5d0bcb12bde1a726205c3e21338a625fba625a5
  - remove references to missing embeds

Change-Id: I9e98ae0a4b283cafc7d6066d399226e661da3aed

  - remove references to missing embeds

Change-Id: Icb87f444535516b6aa02db6fdd1f975f612afe99

  - added 2 missing HIDs (2nd attempt)

Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126

  - added 2 missing HIDs

Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250

  - add a bookmark to Calc's Page Style page - COOL looks for this

Change-Id: I74f42cc2e19761c380dde43c725d18ab482ef603

  - add a bookmark to Document Properties page - COOL looks for this

Change-Id: If62790ac10535fd560844c7a1931c7e2040ba3d5

  - add a bookmark to Accessibility Check page - COOL looks for this

Change-Id: I7a7ccb275f7865d9e0efca9dd0199ba0b0b345fc

  - [cp] Xapian Omega setup for help.collaboraoffice.com

Change-Id: Iaa28803be627db8915e7f426b400ac3b26e7b3a2

  - [cp] help page footer

Change-Id: I257d7dd85a896ff69e391a05206c1cb419997331

  - [cp] Hide 'Please support us!' button

Change-Id: I003b30b6b47e1323f4ef2a504ed72585561a386f

  - [cp] Revert the .xhp parts of "Deploy videos in New Help (WIP)"

Partially reverts commit 93ebf037016819613322ef1c39951a3de893ec14.

Change-Id: I21224f97e9c47d5dfeb8e000102237a5664d3d41

  - [cp] Exchange the logo.

Change-Id: I138d97fd40764ff455354f4ad53f9a7fb72faba8
Reviewed-on: https://gerrit.libreoffice.org/58797
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index d6423aa35068..e5d0bcb12bde 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d6423aa350685e984ac30209a0269b02c1cc145a
+Subproject commit e5d0bcb12bde1a726205c3e21338a625fba625a5

help.git: Branch 'distro/collabora/co-24.04' - 12 commits - AllLangHelp_shared.mk help3xsl/default.css help3xsl/online_transform.xsl help3xsl/xap_templ_query.xsl Package_html_media.mk source/media sou

[Andras Timar (via logerrit)]

 AllLangHelp_shared.mk |1 
 Package_html_media.mk |3 
 help3xsl/default.css  |7 +-
 help3xsl/online_transform.xsl |   14 +---
 help3xsl/xap_templ_query.xsl  |2 
 source/media/navigation/collabora-online-logo.svg |   77 ++
 source/media/navigation/libo-symbol-black.svg |3 
 source/media/navigation/libo-symbol-white.svg |1 
 source/text/sbasic/shared/main0601.xhp|1 
 source/text/scalc/01/0507.xhp |1 
 source/text/scalc/main.xhp|1 
 source/text/schart/main.xhp   |1 
 source/text/sdatabase/main.xhp|1 
 source/text/sdraw/main.xhp|1 
 source/text/shared/01/0110.xhp|1 
 source/text/shared/01/05210200.xhp|2 
 source/text/shared/01/themescolordialog.xhp   |1 
 source/text/shared/01/themesdialog.xhp|3 
 source/text/shared/05/new_help.xhp|1 
 source/text/shared/06/youtubevideos.xhp   |   24 --
 source/text/simpress/main.xhp |1 
 source/text/smath/main.xhp|1 
 source/text/swriter/01/accessibility_check.xhp|1 
 source/text/swriter/01/pagenumbering.xhp  |4 -
 source/text/swriter/main.xhp  |1 
 25 files changed, 94 insertions(+), 60 deletions(-)

New commits:
commit e5d0bcb12bde1a726205c3e21338a625fba625a5
Author: Andras Timar 
AuthorDate: Sun Oct 8 21:55:51 2023 +0200
Commit: Andras Timar 
CommitDate: Sat Feb 10 21:01:33 2024 +0100

remove references to missing embeds

Change-Id: I9e98ae0a4b283cafc7d6066d399226e661da3aed

diff --git a/source/text/shared/01/themescolordialog.xhp 
b/source/text/shared/01/themescolordialog.xhp
index 569d33cf67..64fcac15d3 100644
--- a/source/text/shared/01/themescolordialog.xhp
+++ b/source/text/shared/01/themescolordialog.xhp
@@ -27,7 +27,6 @@
 Creates a color 
theme.
 
 
-
 Choose 
Format - Theme and click on 
Add.
 
 
diff --git a/source/text/shared/01/themesdialog.xhp 
b/source/text/shared/01/themesdialog.xhp
index c374955425..ebf18b4b91 100644
--- a/source/text/shared/01/themesdialog.xhp
+++ b/source/text/shared/01/themesdialog.xhp
@@ -27,10 +27,7 @@
 The bundling of 
color, font and format settings is possible under the concept of 
Theme.
 
 
-
 Choose 
Format - Themes.
-
-Open the 
Design panel.
 
 Theme 
colors is a set of twelve colors, each color has 5 variations computed 
internally, defined by their RGB-value and only the RGB-value is written to 
document file. A color of an object can be defined by a reference into a color 
of the Theme colors set. This reference is done by keyword or 
index, depending on the context. 
 
commit fd3ac75dccdf977d1d26952e546b3a530db7202f
Author: Andras Timar 
AuthorDate: Sun Oct 8 20:16:17 2023 +0200
Commit: Andras Timar 
CommitDate: Sat Feb 10 21:01:23 2024 +0100

remove references to missing embeds

Change-Id: Icb87f444535516b6aa02db6fdd1f975f612afe99

diff --git a/source/text/swriter/01/pagenumbering.xhp 
b/source/text/swriter/01/pagenumbering.xhp
index 5e54de2baf..ada78ec078 100644
--- a/source/text/swriter/01/pagenumbering.xhp
+++ b/source/text/swriter/01/pagenumbering.xhp
@@ -25,11 +25,7 @@
 Use this command to 
quickly insert a page number in the header or footer of the current page 
style.
 
 
-
 Choose 
Insert - Page Number.
-
-Choose 
Layout - Page Number.
-In the 
Insert menu of the Insert tab, choose 
Page Numbers.
 
 
 Position
commit 72d99d70b3fcae4d16df95f3c1910edb97762f92
Author: Andras Timar 
AuthorDate: Sun Nov 19 23:11:00 2023 +0100
Commit: Andras Timar 
CommitDate: Sat Feb 10 20:57:23 2024 +0100

added 2 missing HIDs (2nd attempt)

Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126

diff --git a/source/text/shared/01/05210200.xhp 
b/source/text/shared/01/05210200.xhp
index 52424f1322..4b2adfb10f 100644
--- a/source/text/shared/01/05210200.xhp
+++ b/source/text/shared/01/05210200.xhp
@@ -30,8 +30,8 @@
 
 
 
-
-
+
+
 
 colors;palette
 palette;document colors
commit 85fc2f4d232ebd726462a3c4a9896d7b7ac2ca18
Author: Andras Timar 
AuthorDate: Sun Nov 19 22:23:34 2023 +0100
Commit: Andras Timar 
CommitDate: Sat Feb 10 20:57:22 2024 +0100

added 2 missing HIDs

Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250

diff --git a/source/text/shared/01/05210200.xhp 
b/source/text/shared/01/05210200.xhp
index dafde66c1f..52424f1322 100644
--- a/source/text/shared/01/05210200.xhp
+++ b/source/text/shared/01/05210200.xhp
@@ -30,6 +30,8 @@
 
 
 
+
+
 
 colors;palette
 palette;document colors
commit ee386edd45a3b8f251cdd5cb18934b1efed2b35c
Author: 

core.git: Branch 'distro/collabora/co-24.04' - compilerplugins/clang sfx2/source

[Andras Timar (via logerrit)]

 compilerplugins/clang/badstatics.cxx   |3 +--
 sfx2/source/notebookbar/SfxNotebookBar.cxx |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 207a66268ff09990a415b2828765bab79ca08a2a
Author: Andras Timar 
AuthorDate: Sat Feb 10 13:34:18 2024 +0100
Commit: Andras Timar 
CommitDate: Sat Feb 10 13:34:18 2024 +0100

sfx2: fix clang plugin errors

Change-Id: I595a5dd9edc37fa7b383bb02a3378b359d97524f

diff --git a/compilerplugins/clang/badstatics.cxx 
b/compilerplugins/clang/badstatics.cxx
index adbdf08ed3d2..1d003acdb8a6 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -210,8 +210,7 @@ public:
 || name == "s_aLOKWindowsMap" // LOK only, guarded by assert, 
and LOK never tries to perform a VCL cleanup
 || name == "s_aLOKWeldBuildersMap" // LOK only, similar case 
as above
 || name == "s_aLOKPopupsMap" // LOK only, similar case as above
-|| name == "m_pNotebookBarWeldedWrapper" // LOK only, warning 
about map's key, no VCL cleanup performed
-|| name == "m_pNotebookBarInstance" // LOK only case, when 
notebookbar is closed - VclPtr instance is removed
+|| name == "gNotebookBarManager" // LOK only case, when 
notebookbar is closed - VclPtr instance is removed
 || name == "gStaticManager" // vcl/source/graphic/Manager.cxx 
- stores non-owning pointers
 || name == "aThreadedInterpreterPool"// 
ScInterpreterContext(Pool), not owning
 || name == "aNonThreadedInterpreterPool" // 
ScInterpreterContext(Pool), not owning
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index a5287a82a3b9..41ae9c3c2666 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -61,7 +61,7 @@ struct NotebookBarViewData
 };
 
 /** Notebookbar instance manager is a singleton that is used for track the
- *  per-view instances of view specifc data contained in NotebookBarViewData
+ *  per-view instances of view specific data contained in NotebookBarViewData
  *  class.
  **/
 class NotebookBarViewManager final
@@ -81,8 +81,8 @@ public:
 // Singleton get method - creates an instance on first get() call
 static NotebookBarViewManager& get()
 {
-static NotebookBarViewManager gManager;
-return gManager;
+static NotebookBarViewManager gNotebookBarManager;
+return gNotebookBarManager;
 }
 
 NotebookBarViewData& getViewData(const SfxViewShell* pViewShell)

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

[Andras Timar (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9be657c2c9c4e43a474a8d6efd02bdbd4ab7020e
Author: Andras Timar 
AuthorDate: Sat Feb 10 13:26:34 2024 +0100
Commit: Andras Timar 
CommitDate: Sat Feb 10 13:26:34 2024 +0100

sw: fix clang plugin errors

Change-Id: I212ec698107fc6e5c8b6e4f59bd71bbc27ea3286

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index f690b4ec8a40..8dccfeb9271a 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -4133,7 +4133,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, 
testSwitchingChartToDarkMode)
 }
 );
 comphelper::dispatchCommand(".uno:ChangeTheme", xFrame, aPropertyValues);
-CPPUNIT_ASSERT_EQUAL(OString("S;Dark"), 
pXTextDocument->getViewRenderState());
+CPPUNIT_ASSERT_EQUAL("S;Dark"_ostr, pXTextDocument->getViewRenderState());
 
 Bitmap aBitmap(getTile(pXTextDocument));
 Size aSize = aBitmap.GetSizePixel();
@@ -4147,9 +4147,9 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, 
testSwitchingChartToDarkMode)
 int nBlackPixels = 0;
 int nWhitePixels = 0;
 BitmapScopedReadAccess pAccess(aBitmap);
-for (int x = 0; x < aSize.Width(); ++x)
+for (tools::Long x = 0; x < aSize.Width(); ++x)
 {
-for (int y = 0; y < aSize.Height(); ++y)
+for (tools::Long y = 0; y < aSize.Height(); ++y)
 {
 Color aActualColor(pAccess->GetPixel(y, x));
 if (aActualColor.IsDark()) // ignore antialiasing

core.git: Branch 'distro/mimo/mimo-7-5' - helpcontent2

[Andras Timar (via logerrit)]

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

New commits:
commit d31881de9d4aea834561efa84058f4a565f204f6
Author: Andras Timar 
AuthorDate: Fri Feb 9 10:32:26 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Feb 9 10:32:26 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'distro/mimo/mimo-7-5'
  to 62caa4586e08b6464396189f1f6e68f57f76bce3
  - Too big enviroment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9

diff --git a/helpcontent2 b/helpcontent2
index 00127ea86820..62caa4586e08 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 00127ea86820b1f59d1c25c10a3dee7a545dc07f
+Subproject commit 62caa4586e08b6464396189f1f6e68f57f76bce3

help.git: Changes to 'distro/mimo/mimo-7-5'

[Andras Timar (via logerrit)]

New branch 'distro/mimo/mimo-7-5' available with the following commits:
commit 62caa4586e08b6464396189f1f6e68f57f76bce3
Author: Andras Timar 
Date:   Thu Feb 8 14:14:22 2024 +0100

Too big enviroment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9

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

[Andras Timar (via logerrit)]

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

New commits:
commit 6bf15395ee888f3cca1c9dab68c2d873562522b9
Author: Andras Timar 
AuthorDate: Thu Feb 8 15:15:32 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 8 15:15:32 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'distro/collabora/co-24.04'
  to 8754781f8e55e17c177e0b5f2d632f7c45842e5b
  - Too big environment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163141
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index b03d13cc06f9..8754781f8e55 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b03d13cc06f9777ff94c65fc37f6394196446dd4
+Subproject commit 8754781f8e55e17c177e0b5f2d632f7c45842e5b

help.git: Branch 'distro/collabora/co-24.04' - CustomTarget_html.mk

[Andras Timar (via logerrit)]

 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8754781f8e55e17c177e0b5f2d632f7c45842e5b
Author: Andras Timar 
AuthorDate: Thu Feb 8 14:14:22 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 8 15:15:32 2024 +0100

Too big environment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/163141
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 167c947d97..3caa7163b9 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -52,7 +52,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
( \
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
helpcontent2/source/text/,,$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), ))) 
 && \
echo 'var hid2fileMap = {' \
-   && cd $(SRCDIR)/helpcontent2/source/text && $(call 
gb_ExternalExecutable_get_command,xsltproc,xargs) $< <$$RESPONSEFILE || { rm 
$$RESPONSEFILE; exit 1 ; } \
+   && cd $(SRCDIR)/helpcontent2/source/text && $(call 
gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i 
$(gb_Helper_set_ld_path)) xargs) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE; 
exit 1 ; } \
&& rm "$$RESPONSEFILE" \
&& echo '};' \
) > $@
@@ -288,7 +288,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
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,xargs) \
+   $(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') \

core.git: Branch 'distro/collabora/co-23.05' - helpcontent2

[Andras Timar (via logerrit)]

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

New commits:
commit 1ee05633aa5e2de0fed3bb938db95526a9d6ad39
Author: Andras Timar 
AuthorDate: Thu Feb 8 14:14:26 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 8 14:14:26 2024 +0100

Update git submodules

* Update helpcontent2 from branch 'distro/collabora/co-23.05'
  to c08f568e634dd97367f03b565ce53c2a0cc97755
  - Too big enviroment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9

diff --git a/helpcontent2 b/helpcontent2
index 11f4f5d8bb6b..c08f568e634d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 11f4f5d8bb6b45210eb534b4168309a794b68b2e
+Subproject commit c08f568e634dd97367f03b565ce53c2a0cc97755

help.git: Branch 'distro/collabora/co-23.05' - CustomTarget_html.mk

[Andras Timar (via logerrit)]

 CustomTarget_html.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c08f568e634dd97367f03b565ce53c2a0cc97755
Author: Andras Timar 
AuthorDate: Thu Feb 8 14:14:22 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 8 14:14:22 2024 +0100

Too big enviroment on Windows can cause failure with xargs

Change-Id: I5d796dbf6ad4d93dd133583a1dac95a210674ef9

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 627623aa2a..fbeee63de3 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -51,7 +51,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
( \
RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(subst 
helpcontent2/source/text/,,$(gb_html_allhelpfiles)$(if $(filter WNT,$(OS)), ))) 
 && \
echo 'var hid2fileMap = {' \
-   && cd $(SRCDIR)/helpcontent2/source/text && $(call 
gb_ExternalExecutable_get_command,xsltproc,xargs) $< <$$RESPONSEFILE || { rm 
$$RESPONSEFILE; exit 1 ; } \
+   && cd $(SRCDIR)/helpcontent2/source/text && $(call 
gb_ExternalExecutable_get_command,xsltproc,$(if $(filter WNT,$(OS)),env -i 
$(gb_Helper_set_ld_path)) xargs) $< <$$RESPONSEFILE || { rm $$RESPONSEFILE; 
exit 1 ; } \
&& rm "$$RESPONSEFILE" \
&& echo '};' \
) > $@
@@ -275,7 +275,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
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,xargs) \
+   $(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') \

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

[Andras Timar (via logerrit)]

 sfx2/source/appl/sfxhelp.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3eb73e8bca02d2f0b16bc38c880dc529c83e23bc
Author: Andras Timar 
AuthorDate: Fri Jan 19 15:49:49 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 8 13:31:13 2024 +0100

LOK: disable popup bubble for hyperlinks

Change-Id: I0ca21a90561affa453bd249c86e58793618f809e
(cherry picked from commit 88fea772610a4feef018ba03fd19749841772225)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162287
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b596a4e33efa..785872ddee0b 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -665,6 +665,10 @@ OUString SfxHelp::GetHelpText(const OUString& aCommandURL, 
const weld::Widget* p
 
 OUString SfxHelp::GetURLHelpText(std::u16string_view aURL)
 {
+// hyperlinks are handled differently in Online
+if (comphelper::LibreOfficeKit::isActive())
+return OUString();
+
 bool bCtrlClickHlink = 
SvtSecurityOptions::IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink);
 
 // "ctrl-click to follow link:" for not MacOS

core.git: Branch 'distro/collabora/co-23.05' - readlicense_oo/license

[Andras Timar (via logerrit)]

 readlicense_oo/license/EULA_en-US.rtf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7cf3c37c8e8350cfb2fa84ee4f3c7a21ff623db9
Author: Andras Timar 
AuthorDate: Thu Feb 8 00:03:29 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 8 00:04:02 2024 +0100

[cp] email address in EULA

Change-Id: I0eab8565b804d77d7770b1d6c3976075ebdacea0

diff --git a/readlicense_oo/license/EULA_en-US.rtf 
b/readlicense_oo/license/EULA_en-US.rtf
index b5f8e682645b..ebdfa60c3bf7 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -101,5 +101,5 @@ MAINTENANCE SERVICES. 0s24\par
 
 \pard\qcs16 Collabora Productivity Ltd. The Platinum Building, St John quote 
s Innovation Park, Cambridge, CB4 0DS, United Kingdom\par
 Registered in England and Wales with company number 08644931\par
-Telephone +44 (0)1223 362967libreoff...@collabora.com{{ield{\*
ldinst{HYPERLINK http://CollaboraOffice.com }}{
ldrslt{http://CollaboraOffice.com\ul0+Telephone +44 (0)1223 362967
he...@collaboraoffice.com{{ield{\*ldinst{HYPERLINK 
http://CollaboraOffice.com }}{ldrslt{http://CollaboraOffice.com\ul0 }

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

[Andras Timar (via logerrit)]

 readlicense_oo/license/EULA_en-US.rtf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb6d29c5ca521014d648c835ed307853c80948b9
Author: Andras Timar 
AuthorDate: Thu Feb 8 00:03:29 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 8 00:03:29 2024 +0100

[cp] email address in EULA

Change-Id: I0eab8565b804d77d7770b1d6c3976075ebdacea0

diff --git a/readlicense_oo/license/EULA_en-US.rtf 
b/readlicense_oo/license/EULA_en-US.rtf
index b5f8e682645b..ebdfa60c3bf7 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -101,5 +101,5 @@ MAINTENANCE SERVICES. 0s24\par
 
 \pard\qcs16 Collabora Productivity Ltd. The Platinum Building, St John quote 
s Innovation Park, Cambridge, CB4 0DS, United Kingdom\par
 Registered in England and Wales with company number 08644931\par
-Telephone +44 (0)1223 362967libreoff...@collabora.com{{ield{\*
ldinst{HYPERLINK http://CollaboraOffice.com }}{
ldrslt{http://CollaboraOffice.com\ul0+Telephone +44 (0)1223 362967
he...@collaboraoffice.com{{ield{\*ldinst{HYPERLINK 
http://CollaboraOffice.com }}{ldrslt{http://CollaboraOffice.com\ul0 }

core.git: Changes to 'refs/tags/cp-23.05.8-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-4' created by Andras Timar  at 
2024-02-01 14:51 +

cp-23.05.8-4

Changes since cp-23.05.8-3-8:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cp-23.05.8-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-4' created by Andras Timar  at 
2024-02-01 14:51 +

cp-23.05.8-4

Changes since cp-23.05.6-4:
Andras Timar (1):
  Update German translation (easy conditional formatting dialog)

---
 source/de/sc/messages.po |  981 +++
 1 file changed, 494 insertions(+), 487 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.8-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-4' created by Andras Timar  at 
2024-02-01 14:51 +

cp-23.05.8-4

Changes since cp-23.05.5-4-1:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.8-4'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-4' created by Andras Timar  at 
2024-02-01 14:51 +

cp-23.05.8-4

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Branch 'distro/collabora/co-23.05' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit c5262f7f0d259a903ee33595ff15386a7c4c8af6
Author: Andras Timar 
AuthorDate: Thu Feb 1 15:51:31 2024 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 1 15:51:31 2024 +0100

Bump version to 23.05.8.4

Change-Id: Ice99d3ccd0c562519a7945f9052bae34076aa099

diff --git a/configure.ac b/configure.ac
index 6fe4f08d4c31..2d79013f0258 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([Collabora Office],[23.05.8.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.8.4],[],[],[https://collaboraoffice.com/])
 
 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 'distro/collabora/libreoffice-7-5+backports' - dictionaries

[Andras Timar (via logerrit)]

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

New commits:
commit 4e2cdabd049881ea515230b27ddcdd63f1c87e1f
Author: Andras Timar 
AuthorDate: Wed Jan 31 19:45:34 2024 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 31 19:45:34 2024 +0100

Update git submodules

* Update dictionaries from branch 
'distro/collabora/libreoffice-7-5+backports'
  to d2a1f2a5c381832aafc635a52b335e87c5abb4c0
  - Make Italian dictionary usable e.g. for Italian (Switzerland)

Change-Id: I16bd7e8735e96009bf7138519c1db962d11b98d2

diff --git a/dictionaries b/dictionaries
index 783d19be581e..d2a1f2a5c381 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 783d19be581e5f6c623732d9626e06b5fdfec40a
+Subproject commit d2a1f2a5c381832aafc635a52b335e87c5abb4c0

dictionaries.git: Branch 'distro/collabora/libreoffice-7-5+backports' - it_IT/dictionaries.xcu

[Andras Timar (via logerrit)]

 it_IT/dictionaries.xcu |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d2a1f2a5c381832aafc635a52b335e87c5abb4c0
Author: Andras Timar 
AuthorDate: Wed Jan 31 19:44:42 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 31 19:45:31 2024 +0100

Make Italian dictionary usable e.g. for Italian (Switzerland)

Change-Id: I16bd7e8735e96009bf7138519c1db962d11b98d2

diff --git a/it_IT/dictionaries.xcu b/it_IT/dictionaries.xcu
index 4288679..dc3b008 100644
--- a/it_IT/dictionaries.xcu
+++ b/it_IT/dictionaries.xcu
@@ -11,7 +11,7 @@
 DICT_SPELL
 
 
-it-IT
+it
 
 
 
@@ -22,7 +22,7 @@
 DICT_HYPH
 
 
-it-IT
+it
 
 
 
@@ -33,7 +33,7 @@
 DICT_THES
 
 
-it-IT
+it
 
 
 

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

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-3' created by Andras Timar  at 
2024-01-31 16:28 +

cp-23.05.8-3

Changes since cp-23.05.6-4:
Andras Timar (1):
  Update German translation (easy conditional formatting dialog)

---
 source/de/sc/messages.po |  981 +++
 1 file changed, 494 insertions(+), 487 deletions(-)
---

help.git: Changes to 'refs/tags/cp-23.05.8-3'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-3' created by Andras Timar  at 
2024-01-31 16:28 +

cp-23.05.8-3

Changes since cp-23.05.5-4-1:
---
 0 files changed
---

dictionaries.git: Changes to 'refs/tags/cp-23.05.8-3'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-3' created by Andras Timar  at 
2024-01-31 16:28 +

cp-23.05.8-3

Changes since co-23.05-branch-point:
Andras Timar (1):
  On Linux dictionaries are packaged separately

---
 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---

core.git: Changes to 'refs/tags/cp-23.05.8-3'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-3' created by Andras Timar  at 
2024-01-31 16:28 +

cp-23.05.8-3

Changes since cp-23.05.8-2-21:
---
 0 files changed
---

core.git: Branch 'distro/collabora/co-23.05' - 3 commits - configure.ac download.lst

[Andras Timar (via logerrit)]

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7e4f6df850ffb9488eff7aa5f3e548052ae57062
Author: Andras Timar 
AuthorDate: Wed Jan 31 17:27:55 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 31 17:27:55 2024 +0100

Bump version to 23.05.8.3

Change-Id: I557f4fdee141abecdd56f3ed4f48c69fae6cdc08

diff --git a/configure.ac b/configure.ac
index 8e06687ee26c..6fe4f08d4c31 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([Collabora Office],[23.05.8.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[23.05.8.3],[],[],[https://collaboraoffice.com/])
 
 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
commit a990e726efb2bcb4cb8de9aaade0f35e429ea330
Author: Michael Stahl 
AuthorDate: Wed Jan 31 10:30:18 2024 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 31 17:27:20 2024 +0100

curl: upgrade to release 8.6.0

Fixes CVE-2024-0853

Change-Id: Iabba0748f7c48ee03a8223aef9ca81bf379738e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162793
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 9667ea7e274c4e29cf7c35d9e124a8fbcb2af3da)

diff --git a/download.lst b/download.lst
index 5ce7604e1f32..7555fe0ba249 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
-CURL_TARBALL := curl-8.5.0.tar.xz
+CURL_SHA256SUM := 
3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
+CURL_TARBALL := curl-8.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
commit 04eddbaa4530d75c4984125dab7bb3f58113a3ff
Author: Michael Stahl 
AuthorDate: Mon Dec 11 13:07:22 2023 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 31 17:27:20 2024 +0100

curl: upgrade to release 8.5.0

Fixes CVE-2023-46218 (cookies apparently used by libcmis)

Change-Id: I6f903ab63589d3318c0cc7d47f5183f7ae55f52b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160592
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0a2df11fb563177951db1e8890d67cee8d44246a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160577
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 0a5bc2fb6fcf..5ce7604e1f32 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
-CURL_TARBALL := curl-8.4.0.tar.xz
+CURL_SHA256SUM := 
42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
+CURL_TARBALL := curl-8.5.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Changes to 'refs/tags/cp-23.05.8-2'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-2' created by Andras Timar  at 
2024-01-26 09:26 +

cp-23.05.8-2

Changes since cp-23.05.8-1-6:
---
 0 files changed
---

translations.git: Changes to 'refs/tags/cp-23.05.8-2'

[Andras Timar (via logerrit)]

Tag 'cp-23.05.8-2' created by Andras Timar  at 
2024-01-26 09:26 +

cp-23.05.8-2

Changes since cp-23.05.6-4:
Andras Timar (1):
  Update German translation (easy conditional formatting dialog)

---
 source/de/sc/messages.po |  981 +++
 1 file changed, 494 insertions(+), 487 deletions(-)
---