translations.git: Changes to 'refs/tags/cp-23.05.17-1'
Tag 'cp-23.05.17-1' created by Andras Timar at 2024-09-17 11:31 + cp-23.05.17-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.17-1'
Tag 'cp-23.05.17-1' created by Andras Timar at 2024-09-17 11:31 + cp-23.05.17-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(-) ---
core.git: Changes to 'refs/tags/cp-23.05.17-1'
Tag 'cp-23.05.17-1' created by Andras Timar at 2024-09-17 11:31 + cp-23.05.17-1 Changes since cp-23.05.16-1-3: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-23.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7fb6e39eda0b5c5d1c5498c7de9c0a145ed89a39 Author: Andras Timar AuthorDate: Tue Sep 17 13:31:05 2024 +0200 Commit: Andras Timar CommitDate: Tue Sep 17 13:31:05 2024 +0200 Bump version to 23.05.17.1 Change-Id: I8ea726f8415d2a2b200ff335dea0faa1bd980832 diff --git a/configure.ac b/configure.ac index 859a53342de0..99170f09bf66 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.16.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.17.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 'distro/collabora/co-24.04.7'
New branch 'distro/collabora/co-24.04.7' available with the following commits:
core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c4283c5309e92c8b86c58362fcc15327484730cc
Author: Andras Timar
AuthorDate: Wed Sep 11 17:04:44 2024 +0200
Commit: Andras Timar
CommitDate: Thu Sep 12 09:42:35 2024 +0200
tdf#162921 on this error dialog there is 'Abort' button, not 'Cancel'
Change-Id: I28b86fa7fa0175d5b9737854ad0ece4e3a00760e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173217
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index 598cc7c0193e..44029b1105ee 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -230,7 +230,7 @@ en-US = "The file [2][3] is being held in use {by the
following process: Name: [
en-US = "The product [2] is already installed, preventing the installation of
this product. The two products are incompatible."
[OOO_ERROR_72]
-en-US = "Out of disk space -- Volume: [2]; required space: [3] KB; available
space: [4] KB. If rollback is disabled, enough space is available. Click
Cancel to quit, Retry to check available disk space again, or Ignore to
continue without rollback."
+en-US = "Out of disk space -- Volume: [2]; required space: [3] KB; available
space: [4] KB. If rollback is disabled, enough space is available. Click Abort
to quit, Retry to check available disk space again, or Ignore to continue
without rollback."
[OOO_ERROR_73]
en-US = "Could not access network location [2]."
core.git: Changes to 'refs/tags/cp-24.04.7-2'
Tag 'cp-24.04.7-2' created by Andras Timar at 2024-09-11 19:38 + cp-24.04.7-2 Changes since cp-24.04.7-1-42: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04' - 2 commits - configure.ac translations
configure.ac |2 +- translations |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8c74383e6f13cf719fc69da5b94251fd50566e63 Author: Andras Timar AuthorDate: Wed Sep 11 21:38:14 2024 +0200 Commit: Andras Timar CommitDate: Wed Sep 11 21:38:14 2024 +0200 Bump version to 24.04.7.2 Change-Id: I003aa018dffcd30d2f2810cc5556bf9273b064f3 diff --git a/configure.ac b/configure.ac index c10e9629695d..d9a1f2335b40 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.7.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.7.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 commit 44ae09905e8e7f3abee439a9aa8e026603696b35 Author: Christian Lohmaier AuthorDate: Wed Sep 11 21:37:37 2024 +0200 Commit: Gerrit Code Review CommitDate: Wed Sep 11 21:37:37 2024 +0200 Update git submodules * Update translations from branch 'distro/collabora/co-24.04' to 55f9dfe05f68146caecdd3d26391de995f3f6111 - update translations for 24.2.6 rc2 and force-fix errors using pocheck Change-Id: I8ca2526b3066f2b5d79618e9a000d10c6cb7244f - update translations for 24.2.6 rc2 and force-fix errors using pocheck Change-Id: If818c5dc6cdda25cec00043869b2c5368299f209 - update translations for 24.2.6 rc1 and force-fix errors using pocheck Change-Id: I3b4a6e7c90f767baa0faa47b309e5af1be540a80 - update translations for 24.2.5 rc2 and force-fix errors using pocheck Change-Id: I21264c8b8937e5f0f0f1ddad6d5563913a2c2aff diff --git a/translations b/translations index 5fd34a953e68..55f9dfe05f68 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5fd34a953e6861cb8e392363c0a3500059ed6b01 +Subproject commit 55f9dfe05f68146caecdd3d26391de995f3f6111
core.git: Repository.mk
Repository.mk | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 71f2a391237c1c770c6372a8d0e888b53f1d6777 Author: Andras Timar AuthorDate: Wed Aug 28 23:03:43 2024 +0200 Commit: Caolán McNamara CommitDate: Thu Aug 29 11:54:13 2024 +0200 Fix Repository.mk after 'add --with-docrepair-fonts option' (tdf#161941) Change-Id: Ic74620e61db5cb8f0988c9477314544394e80368 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172503 Reviewed-by: Caolán McNamara Tested-by: Jenkins diff --git a/Repository.mk b/Repository.mk index 693a47b09a4e..cdf2f3b06d39 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1084,13 +1084,13 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_noto_serif_lao \ fonts_reem \ fonts_scheherazade \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_agdasima,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_bacasime_antique,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_belanosima,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_caprasimo,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_lugrasimo,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_lumanosimo,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_lunasima,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_agdasima,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_bacasime_antique,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_belanosima,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_caprasimo,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_lugrasimo,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_lumanosimo,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_lunasima,) \ ) \ ))
core.git: Branch 'distro/collabora/co-24.04' - Repository.mk
Repository.mk | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 3f7c2c644de3935afed515530ced49780929f384 Author: Andras Timar AuthorDate: Wed Aug 28 23:03:43 2024 +0200 Commit: Andras Timar CommitDate: Wed Aug 28 23:03:43 2024 +0200 Fix Repository.mk after 'add --with-docrepair-fonts option' (tdf#161941) Change-Id: Ic74620e61db5cb8f0988c9477314544394e80368 diff --git a/Repository.mk b/Repository.mk index 398e343e3d5e..c3c3378ecdea 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1073,13 +1073,13 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_reem \ fonts_sourcesans \ fonts_scheherazade \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_agdasima,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_bacasime_antique,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_belanosima,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_caprasimo,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_lugrasimo,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_lumanosimo,) \ - $(if $(WITH_DOCREPAIR_FONTS),ExternalPackage_lunasima,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_agdasima,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_bacasime_antique,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_belanosima,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_caprasimo,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_lugrasimo,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_lumanosimo,) \ + $(if $(WITH_DOCREPAIR_FONTS),fonts_lunasima,) \ ) \ $(call gb_Helper_optional,NOTO_FONT,\ fonts_notomore \
core.git: Changes to 'refs/tags/cp-24.04.7-1'
Tag 'cp-24.04.7-1' created by Andras Timar at 2024-08-28 21:34 + cp-24.04.7-1 Changes since cp-24.04.6-2-97: --- 0 files changed ---
core.git: Changes to 'refs/tags/cp-24.04.7-1'
Tag 'cp-24.04.7-1' created by Andras Timar at 2024-08-28 14:16 + cp-24.04.7-1 Changes since cp-24.04.6-2-95: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc4f7590e070f0f7e61cc0c0a6cd7cd176c05cf6 Author: Andras Timar AuthorDate: Wed Aug 28 16:12:55 2024 +0200 Commit: Andras Timar CommitDate: Wed Aug 28 16:12:55 2024 +0200 Bump version to 24.04.7.1 Change-Id: I7186fe75c7e83bf2f9777025e4162181fae1b2b4 diff --git a/configure.ac b/configure.ac index 12391204c5a7..c10e9629695d 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.6.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.7.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.6-3'
Tag 'cp-24.04.6-3' created by Andras Timar at 2024-08-27 19:50 + cp-24.04.6-3 Changes since cp-24.04.6-2-8: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04.6' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7dc432db1ebfff42d5280dd4bf60b6d85417e15 Author: Andras Timar AuthorDate: Tue Aug 27 21:49:45 2024 +0200 Commit: Andras Timar CommitDate: Tue Aug 27 21:49:45 2024 +0200 Bump version to 24.04.6.3 Change-Id: I9ff4c1ac6f5f69231c7c987d0ba1fe30b40d0f2d diff --git a/configure.ac b/configure.ac index 11949778d553..23a51f65fee0 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.6.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.6.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: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1d11b27384972a4a5822da44402d998d60c53dc4 Author: Andras Timar AuthorDate: Wed Jul 3 19:25:25 2024 +0200 Commit: Andras Timar CommitDate: Sat Aug 24 08:36:15 2024 +0200 jsdialog: enable new style dialog to test: 1. Open sidebar in Writer 2. In Styles section press the rightmost icon [New] Change-Id: I03230c5ef2921da6b1671a2e67e3ba6d1e088e5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169965 Reviewed-by: Andras Timar Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172334 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 4b8b2f5b420a..89c2654d9445 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -246,6 +246,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"svx/ui/headfootformatpage.ui" || rUIFile == u"sfx/ui/linefragment.ui" || rUIFile == u"sfx/ui/managestylepage.ui" +|| rUIFile == u"sfx/ui/newstyle.ui" || rUIFile == u"sfx/ui/password.ui" // svx || rUIFile == u"svx/ui/acceptrejectchangesdialog.ui"
core.git: 2 commits - sfx2/source vcl/jsdialog
sfx2/source/view/viewsh.cxx |4 ++-- vcl/jsdialog/enabled.cxx|1 + 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 62826a4c54c67d4925aa5a79e5ecaf3b07ffefdd Author: Andras Timar AuthorDate: Wed Jul 3 18:47:35 2024 +0200 Commit: Andras Timar CommitDate: Sat Aug 24 06:56:17 2024 +0200 jsdialog: enable name dialog to test: 1. Help - Accessibility Check 2. If document title is not set, press [Fix] Change-Id: I9694679874c58515856edf8e3d31600258b8319c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169943 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172333 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index cc5eae96e86d..4b8b2f5b420a 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -55,6 +55,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/linestyletabpage.ui" || rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" +|| rUIFile == u"cui/ui/namedialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/numberingoptionspage.ui" || rUIFile == u"cui/ui/numberingpositionpage.ui" commit 3968d46e20dc56c7470436c2332c79ee5aa694dc Author: Andras Timar AuthorDate: Mon Jun 24 01:23:22 2024 +0200 Commit: Andras Timar CommitDate: Sat Aug 24 06:56:03 2024 +0200 LOK: fix UI language fallback, e.g. zh-HK -> zh-TW The original author wanted to handle de-CH as special case, but he wrote a general condition. - comphelper::LibreOfficeKit::isActive() is redundant, because we call SfxViewShell::SetLOKLanguageTag() from LOK. - AFAIK there are no other, similar cases. We know about only de-CH, so let's make it explicit in the condition. - This fixes UI language setting when the integration asks for zh-HK. Previously it falsely fell back to en-US here, instead of zh-TW. Change-Id: Ie42e09b8e202b654b109ab8d777ab36a5ef56dca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169363 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172332 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0bbc5a2926ea..0676ef9e98e0 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3352,8 +3352,8 @@ void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) LanguageTag aFallbackTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback(); // If we want de-CH, and the de localisation is available, we don't want to use de-DE as then -// the magic in Translate::get() won't turn ess-zet into double s. Possibly other similar cases? -if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == aFallbackTag.getLanguage()) +// the magic in Translate::get() won't turn ess-zet into double s. +if (rBcp47LanguageTag == "de-CH") maLOKLanguageTag = std::move(aTag); else maLOKLanguageTag = std::move(aFallbackTag);
core.git: Changes to 'refs/tags/cp-23.05.16-1'
Tag 'cp-23.05.16-1' created by Andras Timar at 2024-08-09 09:45 + cp-23.05.16-1 Changes since cp-23.05.15-1-4: --- 0 files changed ---
translations.git: Changes to 'refs/tags/cp-23.05.16-1'
Tag 'cp-23.05.16-1' created by Andras Timar at 2024-08-09 09:45 + cp-23.05.16-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.16-1'
Tag 'cp-23.05.16-1' created by Andras Timar at 2024-08-09 09:45 + cp-23.05.16-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(-) ---
core.git: Branch 'distro/collabora/co-23.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e25cddcf5906e82b443878c06ad1d34f9244646 Author: Andras Timar AuthorDate: Fri Aug 9 11:45:08 2024 +0200 Commit: Andras Timar CommitDate: Fri Aug 9 11:45:08 2024 +0200 Bump version to 23.05.16.1 Change-Id: I21ca7d0e87799a2840e6d94ea0947fa6190359da diff --git a/configure.ac b/configure.ac index 8625d62efa4b..859a53342de0 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.15.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.16.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' - distro-configs/CPLinux-LOKit.conf
distro-configs/CPLinux-LOKit.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 36d0d5a639452b956f45a801215e71b0de1b136a Author: Andras Timar AuthorDate: Tue Aug 6 14:15:57 2024 +0200 Commit: Miklos Vajna CommitDate: Tue Aug 6 15:43:36 2024 +0200 We need --with-buildconfig-recorded to display build config in admin console Change-Id: I2269a753f73adbf180f3af26726edad397bb5273 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171545 Reviewed-by: Miklos Vajna Tested-by: Jenkins CollaboraOffice diff --git a/distro-configs/CPLinux-LOKit.conf b/distro-configs/CPLinux-LOKit.conf index 1bc39d0c9152..d419b47059ff 100644 --- a/distro-configs/CPLinux-LOKit.conf +++ b/distro-configs/CPLinux-LOKit.conf @@ -68,3 +68,4 @@ --enable-symbols --enable-sal-log --without-templates +--with-buildconfig-recorded
core.git: Changes to 'distro/collabora/co-24.04.5'
New branch 'distro/collabora/co-24.04.5' available with the following commits:
core.git: Branch 'distro/collabora/co-24.04' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Common.xcu |3 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 ++ 2 files changed, 9 insertions(+) New commits: commit 5d8f98709150e1ce8d4b56a14a62c6a0a773f1df Author: Andras Timar AuthorDate: Mon Jul 15 14:40:13 2024 +0200 Commit: Miklos Vajna CommitDate: Tue Jul 16 08:20:21 2024 +0200 [cp] Disable Show Donation button In co-24.04 it's not used, but I made this change, otherwise we may forget. Change-Id: If653462f0d82f536caa96a6664b4e095afeae334 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170500 Reviewed-by: Miklos Vajna Tested-by: Jenkins CollaboraOffice diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 07602ca524db..49c51818d4ef 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -457,6 +457,9 @@ true + + false + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index a392c1af1eaf..a6f613798ff0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5306,6 +5306,12 @@ false + + + Determines whether to show a donation button in the start center or extension. + +false + Determines whether OpenCL can be used, when available, to speed up
core.git: Changes to 'refs/tags/cp-23.05.15-1'
Tag 'cp-23.05.15-1' created by Andras Timar at 2024-07-16 06:08 + cp-23.05.15-1 Changes since cp-23.05.14-1-3: --- 0 files changed ---
translations.git: Changes to 'refs/tags/cp-23.05.15-1'
Tag 'cp-23.05.15-1' created by Andras Timar at 2024-07-16 06:08 + cp-23.05.15-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.15-1'
Tag 'cp-23.05.15-1' created by Andras Timar at 2024-07-16 06:08 + cp-23.05.15-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(-) ---
core.git: Branch 'distro/collabora/co-23.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5bee5f71d6c2fbe9c7124735878d1fbb46ddc13a Author: Andras Timar AuthorDate: Tue Jul 16 08:07:33 2024 +0200 Commit: Andras Timar CommitDate: Tue Jul 16 08:07:33 2024 +0200 Bump version to 23.05.15.1 Change-Id: I6480e21662e732991c26f74b1e44fbab8398b532 diff --git a/configure.ac b/configure.ac index a050bb7d97f8..8625d62efa4b 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.13.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.15.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.5-2'
Tag 'cp-24.04.5-2' created by Andras Timar at 2024-07-16 05:17 + cp-24.04.5-2 Changes since cp-24.04.5-1-23: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09a258fb0136f53b7ab6bc6574683bddb08d8c74 Author: Andras Timar AuthorDate: Tue Jul 16 07:16:33 2024 +0200 Commit: Andras Timar CommitDate: Tue Jul 16 07:16:33 2024 +0200 Bump version to 24.05.5.2 Change-Id: I68a8071741b04e7a7000d40791732a9dd2a99444 diff --git a/configure.ac b/configure.ac index a2c71eaf8509..0d42a8d1364a 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.5.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.5.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: Changes to 'refs/tags/cp-24.04.4-5'
Tag 'cp-24.04.4-5' created by Andras Timar at 2024-07-11 19:57 + cp-24.04.4-5 Changes since cp-24.04.4-4: Andras Timar (1): Bump version to 24.04.4.5 --- configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---
core.git: Branch 'distro/collabora/co-24.04.4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c16803a72a6eee35c4f0adcd55a1ab30f8701a37 Author: Andras Timar AuthorDate: Thu Jul 11 21:57:28 2024 +0200 Commit: Andras Timar CommitDate: Thu Jul 11 21:57:28 2024 +0200 Bump version to 24.04.4.5 Change-Id: I128e5dfd65785a45e2d6696dafdc442a07b553a8 diff --git a/configure.ac b/configure.ac index 82e18f49f496..71461f1e35f5 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.4.4],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.4.5],[],[],[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' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 5c08aa36d30d61d3d0d80a62622dc424a2b19e2e Author: Andras Timar AuthorDate: Wed Jul 3 19:25:25 2024 +0200 Commit: Andras Timar CommitDate: Wed Jul 10 15:28:36 2024 +0200 jsdialog: enable new style dialog to test: 1. Open sidebar in Writer 2. In Styles section press the rightmost icon [New] Change-Id: I03230c5ef2921da6b1671a2e67e3ba6d1e088e5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169965 Reviewed-by: Andras Timar Tested-by: Jenkins CollaboraOffice diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 679eb56f1927..902b73f9ab8b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -244,6 +244,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"svx/ui/headfootformatpage.ui" || rUIFile == u"sfx/ui/linefragment.ui" || rUIFile == u"sfx/ui/managestylepage.ui" +|| rUIFile == u"sfx/ui/newstyle.ui" || rUIFile == u"sfx/ui/password.ui" // svx || rUIFile == u"svx/ui/acceptrejectchangesdialog.ui"
core.git: Branch 'distro/collabora/co-24.04' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e01bbc76573112dbfa3cb9401366d4b070f3f796 Author: Andras Timar AuthorDate: Wed Jul 3 18:47:35 2024 +0200 Commit: Andras Timar CommitDate: Wed Jul 10 15:28:19 2024 +0200 jsdialog: enable name dialog to test: 1. Help - Accessibility Check 2. If document title is not set, press [Fix] Change-Id: I9694679874c58515856edf8e3d31600258b8319c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169943 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 39a06e325d7d..679eb56f1927 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -55,6 +55,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/linestyletabpage.ui" || rUIFile == u"cui/ui/linetabpage.ui" || rUIFile == u"cui/ui/macroselectordialog.ui" +|| rUIFile == u"cui/ui/namedialog.ui" || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/numberingoptionspage.ui" || rUIFile == u"cui/ui/numberingpositionpage.ui"
help.git: Changes to 'distro/mimo/mimo-7-6'
New branch 'distro/mimo/mimo-7-6' available with the following commits: commit 078a22a0d3f9cb6f3d502a41fb79152db4876907 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: Changes to 'refs/tags/cp-24.04.5-1'
Tag 'cp-24.04.5-1' created by Andras Timar at 2024-07-04 11:32 + cp-24.04.5-1 Changes since cp-24.04.4-1-204: --- 0 files changed ---
core.git: Changes to 'refs/tags/cp-24.04.4-3'
Tag 'cp-24.04.4-3' created by Andras Timar at 2024-06-25 21:04 + cp-24.04.4-3 Changes since cp-24.04.4-2-8: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04.4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2657979be50dc60f365f39b5179e40ce9b10e45b Author: Andras Timar AuthorDate: Tue Jun 25 23:04:18 2024 +0200 Commit: Andras Timar CommitDate: Tue Jun 25 23:04:18 2024 +0200 Bump version to 24.04.4.3 Change-Id: I8b8ea96bbaf180f81fe2f070c55291a30c2df7e0 diff --git a/configure.ac b/configure.ac index 774a357ffdbd..d87fb0cf9c52 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.4.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.4.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.14-1'
Tag 'cp-23.05.14-1' created by Andras Timar at 2024-06-25 11:57 + cp-23.05.14-1 Changes since cp-23.05.13-1-11: --- 0 files changed ---
translations.git: Changes to 'refs/tags/cp-23.05.14-1'
Tag 'cp-23.05.14-1' created by Andras Timar at 2024-06-25 11:57 + cp-23.05.14-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.14-1'
Tag 'cp-23.05.14-1' created by Andras Timar at 2024-06-25 11:57 + cp-23.05.14-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(-) ---
translations.git: Changes to 'refs/tags/cp-22.05.23-1'
Tag 'cp-22.05.23-1' created by Andras Timar at 2024-06-25 07:36 + cp-22.05.23-1 Changes since cp-22.05.10-1-1: --- 0 files changed ---
help.git: Changes to 'refs/tags/cp-22.05.23-1'
Tag 'cp-22.05.23-1' created by Andras Timar at 2024-06-25 07:36 + cp-22.05.23-1 Changes since cp-22.05.20-1-3: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-23.05' - sfx2/source
sfx2/source/view/viewsh.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1cb6f498ab74812e8415f40f250b2f32e57ba930 Author: Andras Timar AuthorDate: Mon Jun 24 01:23:22 2024 +0200 Commit: Andras Timar CommitDate: Mon Jun 24 19:20:09 2024 +0200 LOK: fix UI language fallback, e.g. zh-HK -> zh-TW The original author wanted to handle de-CH as special case, but he wrote a general condition. - comphelper::LibreOfficeKit::isActive() is redundant, because we call SfxViewShell::SetLOKLanguageTag() from LOK. - AFAIK there are no other, similar cases. We know about only de-CH, so let's make it explicit in the condition. - This fixes UI language setting when the integration asks for zh-HK. Previously it falsely fell back to en-US here, instead of zh-TW. Change-Id: Ie42e09b8e202b654b109ab8d777ab36a5ef56dca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169363 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 800c3654cc25..39c5065612fc 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3339,8 +3339,8 @@ void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) LanguageTag aFallbackTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback(); // If we want de-CH, and the de localisation is available, we don't want to use de-DE as then -// the magic in Translate::get() won't turn ess-zet into double s. Possibly other similar cases? -if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == aFallbackTag.getLanguage()) +// the magic in Translate::get() won't turn ess-zet into double s. +if (rBcp47LanguageTag == "de-CH") maLOKLanguageTag = aTag; else maLOKLanguageTag = aFallbackTag;
core.git: Branch 'distro/collabora/co-24.04.4' - sfx2/source
sfx2/source/view/viewsh.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bb4a5fa170ee26aea020a822fca88a20d75d48fd Author: Andras Timar AuthorDate: Mon Jun 24 01:23:22 2024 +0200 Commit: Andras Timar CommitDate: Mon Jun 24 01:23:22 2024 +0200 LOK: fix UI language fallback, e.g. zh-HK -> zh-TW The original author wanted to handle de-CH as special case, but he wrote a general condition. - comphelper::LibreOfficeKit::isActive() is redundant, because we call SfxViewShell::SetLOKLanguageTag() from LOK. - AFAIK there are no other, similar cases. We know about only de-CH, so let's make it explicit in the condition. - This fixes UI language setting when the integration asks for zh-HK. Previously it falsely fell back to en-US here, instead of zh-TW. Change-Id: Ie42e09b8e202b654b109ab8d777ab36a5ef56dca diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0b6c07c68d5c..f1a95138db86 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3357,8 +3357,8 @@ void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) LanguageTag aFallbackTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback(); // If we want de-CH, and the de localisation is available, we don't want to use de-DE as then -// the magic in Translate::get() won't turn ess-zet into double s. Possibly other similar cases? -if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == aFallbackTag.getLanguage()) +// the magic in Translate::get() won't turn ess-zet into double s. +if (rBcp47LanguageTag == "de-CH") maLOKLanguageTag = aTag; else maLOKLanguageTag = aFallbackTag;
core.git: Branch 'distro/collabora/co-24.04' - sfx2/source
sfx2/source/view/viewsh.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 48220c56c654079a683a53fada4cf64653b12234 Author: Andras Timar AuthorDate: Mon Jun 24 01:23:22 2024 +0200 Commit: Miklos Vajna CommitDate: Mon Jun 24 09:26:31 2024 +0200 LOK: fix UI language fallback, e.g. zh-HK -> zh-TW The original author wanted to handle de-CH as special case, but he wrote a general condition. - comphelper::LibreOfficeKit::isActive() is redundant, because we call SfxViewShell::SetLOKLanguageTag() from LOK. - AFAIK there are no other, similar cases. We know about only de-CH, so let's make it explicit in the condition. - This fixes UI language setting when the integration asks for zh-HK. Previously it falsely fell back to en-US here, instead of zh-TW. Change-Id: Ie42e09b8e202b654b109ab8d777ab36a5ef56dca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169363 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 0b6c07c68d5c..f1a95138db86 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3357,8 +3357,8 @@ void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) LanguageTag aFallbackTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback(); // If we want de-CH, and the de localisation is available, we don't want to use de-DE as then -// the magic in Translate::get() won't turn ess-zet into double s. Possibly other similar cases? -if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == aFallbackTag.getLanguage()) +// the magic in Translate::get() won't turn ess-zet into double s. +if (rBcp47LanguageTag == "de-CH") maLOKLanguageTag = aTag; else maLOKLanguageTag = aFallbackTag;
core.git: Changes to 'refs/tags/cp-24.04.4-2'
Tag 'cp-24.04.4-2' created by Andras Timar at 2024-06-18 07:59 + cp-24.04.4-2 Changes since cp-24.04.4-1-18: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5d802d7f4e5f125563d4d47dbfcdd1a626e5499e Author: Andras Timar AuthorDate: Tue Jun 18 09:54:21 2024 +0200 Commit: Andras Timar CommitDate: Tue Jun 18 09:56:05 2024 +0200 Bump version to 24.04.4.2 Change-Id: I953ddce457c7f23448128788fa6b68ae84fdd2ce diff --git a/configure.ac b/configure.ac index 40bd3f3fedb1..774a357ffdbd 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.4.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.4.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: Changes to 'distro/collabora/co-24.04.4'
New branch 'distro/collabora/co-24.04.4' available with the following commits: commit 3709158c476d3931713e1be652f02aae1db91dd3 Author: Andras Timar Date: Tue Jun 18 09:54:21 2024 +0200 Bump version to 24.04.4.2 Change-Id: I953ddce457c7f23448128788fa6b68ae84fdd2ce commit 22076f4997bdc0528eaa49213a08055080b60a95 Author: Pranam Lashkari Date: Mon Jun 17 00:34:40 2024 +0300 LOK: fixed incorrect Logic point calculation for Map mode problem: it was very difficult to select line in online, specifically in writer if line is very think and it was almost impossible to select line Change-Id: Ib641cd3d9795b93d47c78bc8f57211f51714844d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168837 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara Tested-by: Jenkins CollaboraOffice commit 30ca6789a6d7562d79d3d86d787a50e2f699c226 Author: Mike Kaganski Date: Sun Jun 16 18:52:47 2024 +0500 LOK: Use frozen map instead of a chain of hundreds string comparisons Besides expected performance improvement, this helped to find several elements that were duplicated in the long list. Frozen map does not allow duplication of the keys, helping avoid these mistakes. Change-Id: I2192d0ed50b6b8611fd08715f713742a993b28dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168961 Reviewed-by: Mike Kaganski Tested-by: Jenkins (cherry picked from commit 58aca139242e6cfbb66c37bf40009d5201ff007f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168937 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna commit 41fee8b9f03166b355b983616a3a9bbd3670b8ee Author: Mike Kaganski Date: Sun Jun 16 16:02:40 2024 +0500 LOK: Send view modes status change notifications Change-Id: If9a36dcd447eef355f137b5afe16f917e9c0cfa3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168960 Reviewed-by: Mike Kaganski Tested-by: Jenkins (cherry picked from commit a14ec822c9c571a32eb0565158f1976b2d0dbf28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168936 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna commit b85eaba0aa3084865cb8046afc7c92f5256660c4 Author: Mike Kaganski Date: Sun Jun 16 12:46:54 2024 +0500 LOK: differentiate page kinds in sd::ViewShellBase::getEditMode E.g., sending a LOK_CALLBACK_GRAPHIC_VIEW_SELECTION payload, the "mode" must be different for notes view and for normal view. Change-Id: I1f328290087f3185b7bef69560b28df6adb82e90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168917 Reviewed-by: Mike Kaganski Tested-by: Jenkins (cherry picked from commit 4ff2e148fa25933e64b7bbecbcd3ed551ad686ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168934 Reviewed-by: Miklos Vajna Tested-by: Jenkins CollaboraOffice commit 1830986b444ad694b95bae2cad45a7504a006da1 Author: Henry Castro Date: Mon Jun 10 14:41:13 2024 -0400 lok: sw: fix PageDown position when cursor is not visible If PageDown key is pressed and the cursor is not visible, in the PageDown increment the new cursor position will not update, cause the Visible area is the full document. Signed-off-by: Henry Castro Change-Id: I57b9ae1e80cb878867ee215d7e80de990aff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168646 Tested-by: Jenkins CollaboraOffice Reviewed-by: Caolán McNamara commit 6cd89fa7a0b5fb570aad42e847863925fb0036b8 Author: Miklos Vajna Date: Tue Jun 11 10:49:29 2024 +0200 tdf#161443 DOCX import, table style: handle para border in table cell paras Open the bugdoc, the in-table paragraphs have some top and bottom paragraph borders in Word, not in Writer -- because the cell and paragraph UNO object both have a property named TopBorder as mentioned in commit 39c54c0ef837e0e23a676a4d1fa5da667e18939c (tdf#161443 DOCX import, table style: fix para border leaking into cell border, 2024-06-07). The previous fix avoided the problem that the unwanted border affects, the cell, but re-routing the property to affect the in-table paragraph were not done. Fix the problem by adding 3 new meta-properties with a "Para" prefix for all 4 border locations (top/left/bottom/right), this way the paragraph borders defined in a table style can affect the in-table paragraphs, but not the table cells. Apart from the border itself, this also affected the border spacing, which means that the position of all text inside and below the table is now also correct. Unfortunately this also means we need to move away from the constexpr frozen container that is only suitable for a limited number of items: sw/source/writerfilter/dmapper/PropertyIds.cxx:394:6: error: ‘constexpr’ evaluation operation count exceeds limit of 33554432 (use ‘-fconstexpr-ops-limit=’ to increase
core.git: Changes to 'refs/tags/cp-24.04.3-6'
Tag 'cp-24.04.3-6' created by Andras Timar at 2024-06-17 15:58 + cp-24.04.3-6 Changes since cp-24.04.3-5-1: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04.3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97e0d45e32abdbc3dae95c535ec3cda78ee515ef Author: Andras Timar AuthorDate: Mon Jun 17 17:24:04 2024 +0200 Commit: Andras Timar CommitDate: Mon Jun 17 17:24:04 2024 +0200 Bump version to 24.04.3.6 Change-Id: I68092ed2cf191dd327cb2e23984d32baeac5dcc3 diff --git a/configure.ac b/configure.ac index 81440a429a9f..5a58b03071b9 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.3.5],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.3.6],[],[],[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.3-5'
Tag 'cp-24.04.3-5' created by Andras Timar at 2024-06-12 10:09 + cp-24.04.3-5 Changes since cp-24.04.3-4-1: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04.3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cc8ab44bab1d35795573ce282808c6ddcca77e07 Author: Andras Timar AuthorDate: Wed Jun 12 12:08:59 2024 +0200 Commit: Andras Timar CommitDate: Wed Jun 12 12:08:59 2024 +0200 Bump version to 24.04.3.5 Change-Id: Ic5a4c17822a6151adb6b143ec1291fc1b5fbfa0e diff --git a/configure.ac b/configure.ac index 48a5b50a9eaa..81440a429a9f 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.3.4],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.3.5],[],[],[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
dictionaries.git: Changes to 'refs/tags/libreoffice-24-8-branch-point'
Tag 'libreoffice-24-8-branch-point' created by Christian Lohmaier at 2024-06-11 10:43 + Tag libreoffice-24-8-branch-point -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZoKkUACgkQ9DSh76/u rqPjWxAAnKK5bQV+NyvFeusVpcBG2vgE1Q3nOjMrCyu9X/76X+PTS7NFeYBX3QLY a8O+Got2aDpq2u+yW6Rs4+Ebe5y1JGNql+2grn6IKV+BSik5X9Y/rCSB68pvai6x xP/MKGluwSJ5dHIRQi+K1WjgzD9Q7mDRuy34RPbONNuB0JZxMqUqyjP/bOyIlnKo OQ8HUVS0JWfNqvX/uK/EVF0DrdVXjqbC71jrlXK+rxTNwQiliKtxluYCjYnyozWT gIFMS1f+dN9OnL6igOoIJ3zJ8muDzPnsvULg4dTa41lQ/FlIvEs+IDT5olJMZVrn stg2B4mO7ZfMu0UOrXb78AdLZoe6mf6FVBKKqS3KWkUzUxxbqA1wI6DntS71ur0i qrYSriiRghlC8Fjh61+578n7Ysl4dPhnAksRLtiChNJmOeOr01FXzRXOGninKGLT jvslwGaZKje/TWiXPK/1ftC7L+IV+hZKOrq5LhMTXHCNF0JnxvWj2yabLZCyc849 CQmXK6YBNBKCPO1yL9vM9ULEnz8WOhmNYJtkRfcGt+LSBYju+NuQOq4SqXDcMbP8 1wwXRWv1lCS2GWcvd8YNaz3Vh6ZenHFsDn+mvQVCy/f/SkIIHxhlrfv81CqqmM+M bK4wgUNac/8vKVUBCLbQzrRmu1kT9EQi5yEJ1ZoSc6hWPj0Cgkc= =r7Xm -END PGP SIGNATURE- Changes since libreoffice-24-2-branch-point-12: --- 0 files changed ---
core.git: desktop/source
desktop/source/lib/init.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 719958306782ef7e79c2f0e07f621ba9a050a623 Author: Andras Timar AuthorDate: Fri Jun 7 10:56:45 2024 +0200 Commit: Andras Timar CommitDate: Tue Jun 11 06:37:01 2024 +0200 LOK: do not use deprecated .uno:BackColor .uno:BackColor was deprecated in be3d34b5d6b97c3eb12ab3f84ce2da2ef965a928 which changed the label to "Character Highlighting Color (deprecated - use CharBackColor)" We do not want this label to appear in LOK based product. The corresponding online patch set: https://github.com/CollaboraOnline/online/pull/9225 Change-Id: Ieb780d278cd45bf82a2b4acee0abd17af2dc71eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168519 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna (cherry picked from commit db27cd2246cfc54abd94885ce5edbdca69688af0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168616 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 464c2498cf9f..c8af7f847ee5 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3635,7 +3635,6 @@ static void doc_iniUnoCommands () u".uno:AlignLeft"_ustr, u".uno:AlignHorizontalCenter"_ustr, u".uno:AlignRight"_ustr, -u".uno:BackColor"_ustr, u".uno:BackgroundColor"_ustr, u".uno:TableCellBackgroundColor"_ustr, u".uno:Bold"_ustr,
core.git: Changes to 'refs/tags/cp-24.04.3-4'
Tag 'cp-24.04.3-4' created by Andras Timar at 2024-06-10 15:03 + cp-24.04.3-4 Changes since cp-24.04.3-3-2: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04.3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60122af87b17d54ad1900c3d373d14f355504f2b Author: Andras Timar AuthorDate: Mon Jun 10 17:02:51 2024 +0200 Commit: Andras Timar CommitDate: Mon Jun 10 17:02:51 2024 +0200 Bump version to 24.04.3.4 Change-Id: Ib3414d9083868ef1426f1782aac74ceb99dc451c diff --git a/configure.ac b/configure.ac index 03a5b68b6d9e..48a5b50a9eaa 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.3.3],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.3.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' - desktop/source
desktop/source/lib/init.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit db27cd2246cfc54abd94885ce5edbdca69688af0 Author: Andras Timar AuthorDate: Fri Jun 7 10:56:45 2024 +0200 Commit: Miklos Vajna CommitDate: Mon Jun 10 09:36:35 2024 +0200 LOK: do not use deprecated .uno:BackColor Change-Id: Ieb780d278cd45bf82a2b4acee0abd17af2dc71eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168519 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index af14bae07df1..eae08a12889e 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3719,7 +3719,6 @@ static void doc_iniUnoCommands () u".uno:AlignLeft"_ustr, u".uno:AlignHorizontalCenter"_ustr, u".uno:AlignRight"_ustr, -u".uno:BackColor"_ustr, u".uno:BackgroundColor"_ustr, u".uno:TableCellBackgroundColor"_ustr, u".uno:Bold"_ustr,
core.git: Changes to 'refs/tags/cp-23.05.13-1'
Tag 'cp-23.05.13-1' created by Andras Timar at 2024-06-06 11:48 + cp-23.05.13-1 Changes since cp-23.05.12-1-5: --- 0 files changed ---
translations.git: Changes to 'refs/tags/cp-23.05.13-1'
Tag 'cp-23.05.13-1' created by Andras Timar at 2024-06-06 11:48 + cp-23.05.13-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.13-1'
Tag 'cp-23.05.13-1' created by Andras Timar at 2024-06-06 11:48 + cp-23.05.13-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(-) ---
core.git: Branch 'distro/collabora/co-23.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 964a4530ffe277dd71d11632561a22cc9679498a Author: Andras Timar AuthorDate: Thu Jun 6 13:48:36 2024 +0200 Commit: Andras Timar CommitDate: Thu Jun 6 13:48:36 2024 +0200 Bump version to 23.05.13.1 Change-Id: Iee9afbe6fb619cd647c9b34a6ffdc5c586edcaaa diff --git a/configure.ac b/configure.ac index 00c3645f0454..a050bb7d97f8 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.12.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.13.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: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e765cc07e5fb95c5cdfd76f672777e665cc6ca34 Author: Andras Timar AuthorDate: Thu Jun 6 10:05:04 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jun 6 11:05:04 2024 +0200 Update git submodules * Update dictionaries from branch 'master' to a2bf59878dd76685803ec260e15d875746ad6e25 - Make Italian dictionary usable e.g. for Italian (Switzerland) Change-Id: I16bd7e8735e96009bf7138519c1db962d11b98d2 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/168489 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/dictionaries b/dictionaries index 7272a82714ca..a2bf59878dd7 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7272a82714ca91947b4573c09bce4938861a9877 +Subproject commit a2bf59878dd76685803ec260e15d875746ad6e25
dictionaries.git: it_IT/dictionaries.xcu
it_IT/dictionaries.xcu |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit a2bf59878dd76685803ec260e15d875746ad6e25 Author: Andras Timar AuthorDate: Wed Jan 31 19:44:42 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Jun 6 11:05:04 2024 +0200 Make Italian dictionary usable e.g. for Italian (Switzerland) Change-Id: I16bd7e8735e96009bf7138519c1db962d11b98d2 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/168489 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos 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
core.git: Branch 'distro/collabora/libreoffice-7-6+backports' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d99c91d28336392348789d5e1873045626f76ea7 Author: Andras Timar AuthorDate: Thu Jun 6 08:55:23 2024 +0100 Commit: Gerrit Code Review CommitDate: Thu Jun 6 09:55:23 2024 +0200 Update git submodules * Update dictionaries from branch 'distro/collabora/libreoffice-7-6+backports' to c061b27506bbde7a6e2e18c6748ccb2fadf4a68c - Make Italian dictionary usable e.g. for Italian (Switzerland) Change-Id: I16bd7e8735e96009bf7138519c1db962d11b98d2 diff --git a/dictionaries b/dictionaries index 893e54514e3e..c061b27506bb 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 893e54514e3e4733124b1592a39ca60809508f41 +Subproject commit c061b27506bbde7a6e2e18c6748ccb2fadf4a68c
dictionaries.git: Changes to 'distro/collabora/libreoffice-7-6+backports'
New branch 'distro/collabora/libreoffice-7-6+backports' available with the following commits: commit c061b27506bbde7a6e2e18c6748ccb2fadf4a68c Author: Andras Timar Date: Wed Jan 31 19:44:42 2024 +0100 Make Italian dictionary usable e.g. for Italian (Switzerland) Change-Id: I16bd7e8735e96009bf7138519c1db962d11b98d2
core.git: Changes to 'refs/tags/cp-24.04.3-3'
Tag 'cp-24.04.3-3' created by Andras Timar at 2024-06-05 14:43 + cp-24.04.3-3 Changes since cp-24.04.3-2-1: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04.3' - 2 commits - configure.ac include/svl svl/source
configure.ac|2 -
include/svl/IndexedStyleSheets.hxx |1
include/svl/style.hxx |1
svl/source/items/IndexedStyleSheets.cxx | 12 --
svl/source/items/style.cxx | 36 +---
5 files changed, 16 insertions(+), 36 deletions(-)
New commits:
commit a2e40875ae6c54397a89e09c5045e792ed7be776
Author: Andras Timar
AuthorDate: Wed Jun 5 16:42:47 2024 +0200
Commit: Andras Timar
CommitDate: Wed Jun 5 16:42:47 2024 +0200
Bump version to 24.04.3.3
Change-Id: If1c8b38fa5fc6412f52dd12b94e9070463d321d0
diff --git a/configure.ac b/configure.ac
index 3bd2b84f34d3..03a5b68b6d9e 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.3.2],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[24.04.3.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 1316a84783f836eec4914b5db919c4d7bd8093d9
Author: Henry Castro
AuthorDate: Wed Jun 5 08:35:25 2024 -0400
Commit: Andras Timar
CommitDate: Wed Jun 5 16:42:09 2024 +0200
Revert "tdf#160706 speed up loading conditional formatting rule in XLS (II)"
This reverts commit 13d39423a8bb70c08052fb02ef41cf3ea6f731d1.
Unfortunately, it breaks copy/pasting slide.
Change-Id: I1831aac9e672cf66dea658979e98855529b94b07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168473
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Caolán McNamara
diff --git a/include/svl/IndexedStyleSheets.hxx
b/include/svl/IndexedStyleSheets.hxx
index c58a4b736703..910acd9e2566 100644
--- a/include/svl/IndexedStyleSheets.hxx
+++ b/include/svl/IndexedStyleSheets.hxx
@@ -144,7 +144,6 @@ public:
void Clear(StyleSheetDisposer& cleanup);
void Reindex();
-void ReindexOnNameChange(const OUString& rOldName, const OUString&
rNewName);
/** Warning: counting for n starts at 0, i.e., the 0th style sheet is the
first that is found. */
SfxStyleSheetBase* GetNthStyleSheetThatMatchesPredicate(sal_Int32 n,
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 87c5563ed547..fc12dc0be74e 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -275,7 +275,6 @@ public:
virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam,
SfxStyleSearchBits n=SfxStyleSearchBits::All );
voidReindex();
-voidReindexOnNameChange(const OUString& rOldName,
const OUString& rNewName);
/** Add a style sheet.
* Not an actual public function. Do not call it from non-subclasses.
*/
diff --git a/svl/source/items/IndexedStyleSheets.cxx
b/svl/source/items/IndexedStyleSheets.cxx
index 3761f0e427ef..57e2dddbf1c1 100644
--- a/svl/source/items/IndexedStyleSheets.cxx
+++ b/svl/source/items/IndexedStyleSheets.cxx
@@ -82,18 +82,6 @@ sal_Int32 IndexedStyleSheets::GetNumberOfStyleSheets() const
return mStyleSheets.size();
}
-void
-IndexedStyleSheets::ReindexOnNameChange(const OUString& rOldName, const
OUString& rNewName)
-{
-auto it = mPositionsByName.find(rOldName);
-if (it != mPositionsByName.end())
-{
-unsigned nPos = it->second;
-mPositionsByName.erase(it);
-mPositionsByName.insert(std::make_pair(rNewName, nPos));
-}
-}
-
void
IndexedStyleSheets::AddStyleSheet(const rtl::Reference< SfxStyleSheetBase >&
style)
{
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index bfdbac6f3f93..41551e506498 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -163,24 +163,24 @@ bool SfxStyleSheetBase::SetName(const OUString& rName,
bool bReIndexNow)
if(rName.isEmpty())
return false;
-if( aName == rName )
-return true;
-
-OUString aOldName = aName;
-SfxStyleSheetBase *pOther = m_pPool->Find( rName, nFamily ) ;
-if ( pOther && pOther != this )
-return false;
+if( aName != rName )
+{
+OUString aOldName = aName;
+SfxStyleSheetBase *pOther = m_pPool->Find( rName, nFamily ) ;
+if ( pOther && pOther != this )
+return false;
-if ( !aName.isEmpty() )
-m_pPool->ChangeParent(aName, rName, nFamily, false);
+if ( !aName.isEmpty() )
+m_pPool->ChangeParent(aName, rName, nFamily, false);
-if ( aFollow == aName )
-aFollow = rName;
-aName = rName;
-if (bReIndexNow)
-m_pPool->ReindexOnNameChange(aOldName, rName);
+if ( aFollow == aName )
+aFollow = rName;
core.git: Changes to 'refs/tags/cp-24.04.4-1'
Tag 'cp-24.04.4-1' created by Andras Timar at 2024-06-05 12:08 + cp-24.04.4-1 Changes since cp-24.04.3-2-53: --- 0 files changed ---
core.git: Branch 'distro/collabora/co-24.04' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fdb5e53af8f539c47cc7ca6d594b05e26d1ff594 Author: Andras Timar AuthorDate: Wed Jun 5 14:05:54 2024 +0200 Commit: Andras Timar CommitDate: Wed Jun 5 14:05:54 2024 +0200 Bump version to 24.04.4.1 Change-Id: I90cd4ee51966e917b7ff00868968ce1065fd5c9f diff --git a/configure.ac b/configure.ac index 3bd2b84f34d3..3bf2b187d67b 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.3.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.4.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-23.05.12-1'
Tag 'cp-23.05.12-1' created by Andras Timar at 2024-05-30 08:39 + cp-23.05.12-1 Changes since cp-23.05.11-1-21: --- 0 files changed ---
translations.git: Changes to 'refs/tags/cp-23.05.12-1'
Tag 'cp-23.05.12-1' created by Andras Timar at 2024-05-30 08:39 + cp-23.05.12-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.12-1'
Tag 'cp-23.05.12-1' created by Andras Timar at 2024-05-30 08:39 + cp-23.05.12-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(-) ---
core.git: Branch 'distro/collabora/co-23.05' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96750fadee6e446d33403d95f430a75bb5963177 Author: Andras Timar AuthorDate: Thu May 30 10:39:00 2024 +0200 Commit: Andras Timar CommitDate: Thu May 30 10:39:00 2024 +0200 Bump version to 23.05.12.1 Change-Id: I772a5e03ca78946ca8221cdcca537315097b12cd diff --git a/configure.ac b/configure.ac index bae560edb635..00c3645f0454 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.11.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[23.05.12.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.3-2'
Tag 'cp-24.04.3-2' created by Andras Timar at 2024-05-30 05:55 + cp-24.04.3-2 Changes since cp-24.04.3-1-18: --- 0 files changed ---
core.git: Changes to 'refs/tags/co-24.04.3-2'
Tag 'co-24.04.3-2' created by Andras Timar at 2024-05-28 11:29 + co-24.04.3-2 Changes since cp-24.04.3-1-18: --- 0 files changed ---
core.git: Changes to 'distro/collabora/co-24.04.3'
New branch 'distro/collabora/co-24.04.3' available with the following commits:
core.git: Branch 'distro/collabora/co-24.04' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5357f69c271ff0c0a7d10dc3371047f5200f0187 Author: Andras Timar AuthorDate: Tue May 28 13:28:27 2024 +0200 Commit: Andras Timar CommitDate: Tue May 28 13:28:27 2024 +0200 Bump version to 24.04.3.2 Change-Id: Ic7eeba9c36ab51ea30855b3cf9e4495bd7356a89 diff --git a/configure.ac b/configure.ac index 3a76d4ad8608..3bd2b84f34d3 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.3.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.3.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/co-24.04' - configure.ac
configure.ac |6 ++ 1 file changed, 6 insertions(+) New commits: commit 338b3ba86c0fe36ad60bea582b5112a83aecbd50 Author: Andras Timar AuthorDate: Mon May 27 23:33:12 2024 +0200 Commit: Andras Timar CommitDate: Mon May 27 23:33:12 2024 +0200 [cp] On Windows only build selected helppacks (en-US, fr, de, it, es) Change-Id: I3fe6b865ca0b01cc60b54771edbf230eee5b2641 diff --git a/configure.ac b/configure.ac index cff068a56799..3a76d4ad8608 100644 --- a/configure.ac +++ b/configure.ac @@ -14439,6 +14439,12 @@ if test -d "$SRC_ROOT/translations/source"; then WITH_POOR_HELP_LOCALIZATIONS="$WITH_POOR_HELP_LOCALIZATIONS $l" fi done +if test "$OS" = WNT; then +# We want to include only English (US), French, German, Italian and Spanish help +# packs in our Windows distribution. Others are probably not needed and digital +# signature of MSI packages is expensive. Some other languages are available online. +WITH_POOR_HELP_LOCALIZATIONS="ab af am an ar as ast az be bg bn bn-IN bo br brx bs ca ca-valencia ckb cs cy da dgo dsb dz el en-GB en-ZA eo et eu fa fi fur fy ga gd gl gu gug he hi hr hsb hu hy id is ja jv ka kab kk kl km kmr-Latn kn ko kok ks ky lb lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc om or pa-IN pl pt pt-BR ro ru rw sa-IN sah sat sd si sid sk sl sq sr sr-Latn ss st sv sw-TZ szl ta te tg th ti tn tr ts tt ug uk ur uz ve vec vi xh zh-CN zh-TW zu" +fi fi AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
core.git: Changes to 'refs/tags/cp-24.04.3-1'
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
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'
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
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
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 SfxItemSe
core.git: Changes to 'refs/tags/cp-24.04.1-2'
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
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'
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'
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'
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
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
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
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'
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'
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'
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
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 ./../lib/intern
core.git: Branch 'distro/collabora/co-23.05' - 3 commits - configure.ac download.lst external/expat
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
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
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'
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 ---
