Rebased ref, commits from common ancestor: commit 8b2f9f5f2daca81dd25334be82e236c44368f09e Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Fri Mar 29 14:57:50 2024 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Fri Mar 29 15:08:54 2024 +0100
Update git submodules * Update translations from branch 'feature/cib_contract49' to 11bb4c5da1e34fa087cad36d40dd964560d8e07b - Update DE translations * remove duplicate entries from presentation dlg * add a few more missing strings * fix two typos Change-Id: Iaf4183a2ec477940d5a4d71c765ac6400d69ae5e - Update DE translations Change-Id: Ibcf9c09d2413c4931697449619e7a8fbe6940016 - Version 7.6.5.2, tag libreoffice-7.6.5.2-hotfix1 Change-Id: I96cd6667819e3ff617ab7c7cb7fdc4a17562ec47 - Version 7.6.5.2, tag libreoffice-7.6.5.2 Change-Id: Iee78b7547cfa59d396438242a20716813ba8814b - Branch libreoffice-7-6-5 This is 'libreoffice-7-6-5' - the stable branch for the 7.6.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I83e01542d7224395619e60cc69d0eb7b248b3303 - Better translation for hidden info warndialog Change-Id: Ia873da1405f9c7f6b72d940585c9f1633498ba10 - Adjust tooltip translations Change-Id: I8c0d78f554ff5ca6bd8441506a2f270c9f9f8e6e - Add missing fr translations Follow-up to 79f9243e81eda3ab113d75538686ab81770c2c5d Change-Id: I83351fe0d0ef6c1c17b48e99d1e80ab2cdb03e05 - Add fr translations for f950036a89c46ce50bd7d62896cb6e4a690d323a Change-Id: I497f6270322380d2d05716e81949434f75df8602 - Backport fr translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d Change-Id: I955422a5fd582c6ff9909d89fda76dbbd956a1c5 - Version 7.6.3.2, tag libreoffice-7.6.3.2 Change-Id: I4772fc0f2abffbb8015ee096bb9a4fc6d257d7cb - Branch libreoffice-7-6-3 This is 'libreoffice-7-6-3' - the stable branch for the 7.6.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I145b9af8d0a5c8319c63b139562c86caa94670e2 - Add translations for f950036a89c46ce50bd7d62896cb6e4a690d323a Change-Id: Ida57eb3b5034ec57266e8b95928c59a1d5efd065 - Backport translations for 76cac369d880a9aeebc86cfc84938dbf64a7435d Change-Id: I597ba186fb8736a50e141da34aea5dbc475f8652 - Version 7.6.6.3, tag libreoffice-7.6.6.3 Change-Id: I69b619c678c7db929901daa3e1cf3fbc20affde3 - update translations for 7.6.6 rc3 and force-fix errors using pocheck Change-Id: I27666de13601bf7a1fa144f13385426b3d16dbf8 (cherry picked from commit ee46af8eb1eeef8147c439b7b89b1779be2d1bbe) - update translations for 7.6.6 rc2 and force-fix errors using pocheck Change-Id: If460e6afafc42b7f06e2e2a32b1f0da45ee9d7ab (cherry picked from commit 2c72d6fd1b7800164baf7a3d5afbeb53b7734e49) - bump copyright year for sl translation Change-Id: I9049de5b88eb4d152dc780c08cba7098ec7ae77f (cherry picked from commit 3ba99bccf07e93a335cdbc2f7e3cc75ed7069e99) - update translations for 7-6 and force-fix errors using pocheck Change-Id: Iad1f83ec403dfc7a9b3ca30a4b50530d8d38b6f6 (cherry picked from commit e81a0a24256108bc0ecd90d33615362ba958cf43) - Branch libreoffice-7-6-6 This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ia6d20cf71faf3f3dd7307620beca25c1e29a8b7c - update translations for 7.6.6 rc1 and force-fix errors using pocheck Change-Id: Ic01ba3a9ba7c2d63ab2db1892779305cc8942098 - update translations for 7.6.5 rc2 and force-fix errors using pocheck Change-Id: Ie92e7273a69b81df9bdcc4f7f08a7443fd2f6144 - update translations for 7.6.5 rc1 and force-fix errors using pocheck Change-Id: Ie40ba4e69f02dec41db1c7690375460110ae25d0 - update translations for 7.6.5 rc1 and force-fix errors using pocheck Change-Id: I0c8b07d91bc81c5bd47d6f6a1c2c78162a3e304e - update translations for 7.6.4 rc1 and force-fix errors using pocheck Change-Id: I8d7e3350c35b5da2513f8a32da3ab1595bd99cd6 - update translations for 7-6 and force-fix errors using pocheck Change-Id: Ib2ddeb17ecd788d3852eadfd649a1139d9d8b2d9 - update translations for 7-6 and force-fix errors using pocheck Change-Id: I7e98541ae70d37e70a1d33a755907044e945a1c3 - update translations for 7.6.3 rc2 and force-fix errors using pocheck Change-Id: If5b89e12a3fdc3f94dd4159a89fe0a9c3a1bcf1c Change-Id: I4cc2564909e6efbbe75904c1eeeadc0c4120d7cb commit 9f0595df6cd3f5cb46f9a434ecbb8df60ac63aeb Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Fri Mar 29 14:44:40 2024 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Fri Mar 29 15:08:34 2024 +0100 Update git submodules * Update helpcontent2 from branch 'feature/cib_contract49' to 65a33b1caa2bd9b6a2ed5f95a1ddc6d2a49256a2 - Merge tag 'libreoffice-7.6.6.3' into HEAD Tag libreoffice-7.6.6.3 Change-Id: I14323f906d0a1af6b349c6e489699bde74a3c58f - Version 7.6.6.3, tag libreoffice-7.6.6.3 Change-Id: Icb8a0d1d5599e492f50d3253b6ed49b0bcc51ade - Branch libreoffice-7-6-6 This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I192d0b205e01ef02bd253118f8fb3276634b8b19 Change-Id: I40295a9c639e3e90a73190383f652f961936632b commit 95e4e4d37bbb418009c0db6c6de5420a4114f434 Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Fri Mar 29 14:40:53 2024 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Fri Mar 29 15:08:07 2024 +0100 Update git submodules * Update dictionaries from branch 'feature/cib_contract49' to a5bb9a84cdad6443993b83a16da3926be228af5e - Merge tag 'libreoffice-7.6.6.3' into HEAD Tag libreoffice-7.6.6.3 Change-Id: I451a114ed45b11d24e0ac952f5ee55e80337c95b - Version 7.6.6.3, tag libreoffice-7.6.6.3 Change-Id: I97d861e9f65029f0331324b79eafeec0e698f852 - Branch libreoffice-7-6-6 This is 'libreoffice-7-6-6' - the stable branch for the 7.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.6.x release, please use the 'libreoffice-7-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I62319de3cbb911d57724951c66af7673356ce01b Change-Id: I39a0f47e2c7b2fade1ae9ad0ad25c4c38fbd70d9 commit 30380400fa25f51b7c91eae832a166aae8964ac7 Merge: faea4bf55e41 d97b2716a9a4 Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Fri Mar 29 14:58:53 2024 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Fri Mar 29 14:58:53 2024 +0100 Merge tag 'libreoffice-7.6.6.3' into feature/cib_contract49 Tag libreoffice-7.6.6.3 Conflicts: .gitreview configure.ac dictionaries helpcontent2 readlicense_oo/license/CREDITS.fodt sw/qa/core/layout/tabfrm.cxx sw/qa/extras/ooxmlexport/ooxmlexport21.cxx sw/qa/extras/rtfexport/rtfexport8.cxx translations writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Icef0cd3f9854f4c1c50599bf45b8c23742c25752 diff --cc dictionaries index 96d4139d0fea,9f5af7262cc6..a5bb9a84cdad --- a/dictionaries +++ b/dictionaries @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 96d4139d0fea2ebefcae2cc459429386620a24b9 -Subproject commit 9f5af7262cc641f4388c7beb7c09529551179b5e ++Subproject commit a5bb9a84cdad6443993b83a16da3926be228af5e diff --cc helpcontent2 index cfa40f1e278a,39b9f1ce4da8..65a33b1caa2b --- a/helpcontent2 +++ b/helpcontent2 @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit cfa40f1e278a0403264c5e496f3c0b79b7bf2aa4 -Subproject commit 39b9f1ce4da85e97402720d5687d9a267fefd564 ++Subproject commit 65a33b1caa2bd9b6a2ed5f95a1ddc6d2a49256a2 diff --cc sw/qa/core/layout/tabfrm.cxx index b6219bc2966b,84f7ba48c572..4a767dc3f91b --- a/sw/qa/core/layout/tabfrm.cxx +++ b/sw/qa/core/layout/tabfrm.cxx @@@ -13,8 -13,10 +13,12 @@@ #include <rootfrm.hxx> #include <pagefrm.hxx> #include <tabfrm.hxx> +#include <docsh.hxx> +#include <wrtsh.hxx> + #include <sortedobjs.hxx> + #include <anchoredobject.hxx> + #include <flyfrm.hxx> + #include <flyfrms.hxx> namespace { @@@ -112,24 -114,61 +116,80 @@@ CPPUNIT_TEST_FIXTURE(Test, testSplitFly CPPUNIT_ASSERT_EQUAL(6, getPages()); } +CPPUNIT_TEST_FIXTURE(Test, testSplitFlyHeader) +{ + // Given a document with 8 pages: a first page ending in a manual page break, then a multi-page + // floating table on pages 2..8: + createSwDoc("floattable-header.docx"); + CPPUNIT_ASSERT_EQUAL(8, getPages()); + + // When creating a new paragraph at doc start: + SwDocShell* pDocShell = getSwDocShell(); + SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); + pWrtShell->SttEndDoc(/*bStt=*/true); + pWrtShell->SplitNode(); + // Without the accompanying fix in place, this test would have crashed here. + pWrtShell->CalcLayout(); + + // Then make sure we get one more page, since the first page is now 2 pages: + CPPUNIT_ASSERT_EQUAL(9, getPages()); +} ++ + CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTableJoin) + { + // Given a document with a multi-page floating table: + // When loading this document: + createSwDoc("floattable-table-join.docx"); + + // Then make sure this document doesn't crash the layout and has a floating table split on 4 + // pages: + SwDoc* pDoc = getSwDoc(); + SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); + auto pPage1 = pLayout->Lower()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage1); + CPPUNIT_ASSERT(pPage1->GetSortedObjs()); + { + SwSortedObjs& rPageObjs = *pPage1->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + // Start of the chain. + CPPUNIT_ASSERT(!pFly->GetPrecede()); + CPPUNIT_ASSERT(pFly->HasFollow()); + } + auto pPage2 = pPage1->GetNext()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage2); + CPPUNIT_ASSERT(pPage2->GetSortedObjs()); + { + SwSortedObjs& rPageObjs = *pPage2->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + CPPUNIT_ASSERT(pFly->GetPrecede()); + CPPUNIT_ASSERT(pFly->HasFollow()); + } + auto pPage3 = pPage2->GetNext()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage3); + CPPUNIT_ASSERT(pPage3->GetSortedObjs()); + { + SwSortedObjs& rPageObjs = *pPage3->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + CPPUNIT_ASSERT(pFly->GetPrecede()); + CPPUNIT_ASSERT(pFly->HasFollow()); + } + auto pPage4 = pPage3->GetNext()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage4); + CPPUNIT_ASSERT(pPage4->GetSortedObjs()); + SwSortedObjs& rPageObjs = *pPage4->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + // End of the chain. + CPPUNIT_ASSERT(pFly->GetPrecede()); + CPPUNIT_ASSERT(!pFly->HasFollow()); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --cc sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index e1bec934b504,1a13b17cd649..77357bc7c840 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@@ -15,8 -16,7 +16,9 @@@ #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> +#include <comphelper/configuration.hxx> + #include <comphelper/sequenceashashmap.hxx> +#include <officecfg/Office/Common.hxx> #include <pam.hxx> #include <unotxdoc.hxx> diff --cc translations index 3fe1d5736477,9f3b6b1abf7c..11bb4c5da1e3 --- a/translations +++ b/translations @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 3fe1d5736477aad568a7ce7d5a40b67aa27a0739 -Subproject commit 9f3b6b1abf7cb2dd81631df09a5bd530d6d8d62e ++Subproject commit 11bb4c5da1e34fa087cad36d40dd964560d8e07b diff --cc writerfilter/source/dmapper/DomainMapper_Impl.hxx index 1971523cfe3a,ee17ac183a2a..848f7506ad8e --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@@ -910,7 -879,10 +910,10 @@@ public /// Get the first pending shape, if there are any. css::uno::Reference<css::drawing::XShape> PopPendingShape(); + void PopPageHeaderFooter(PagePartType ePagePartType, PageType eType); + void PushPageHeader(SectionPropertyMap::PageType eType); + void PushPageFooter(SectionPropertyMap::PageType eType); + - void PopPageHeaderFooter(); bool IsInHeaderFooter() const { auto const type(m_StreamStateStack.top().eSubstreamType); return type == SubstreamType::Header || type == SubstreamType::Footer; } void ConvertHeaderFooterToTextFrame(bool, bool); static void fillEmptyFrameProperties(std::vector<css::beans::PropertyValue>& rFrameProperties, bool bSetAnchorToChar); commit d97b2716a9a4a2ce1391dee1765565ea469b0ae7 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Mar 21 18:20:33 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Mar 21 18:20:33 2024 +0100 Version 7.6.6.3, tag libreoffice-7.6.6.3 diff --git a/dictionaries b/dictionaries index 5736d6d655ef..9f5af7262cc6 160000 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 5736d6d655ef99f1c8d16d6cfda8f500e905ef73 +Subproject commit 9f5af7262cc641f4388c7beb7c09529551179b5e diff --git a/helpcontent2 b/helpcontent2 index 3affb7e7199b..39b9f1ce4da8 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3affb7e7199bb13613cc4ef47cb64e2ad1d8cdde +Subproject commit 39b9f1ce4da85e97402720d5687d9a267fefd564 diff --git a/translations b/translations index 1bfa04948ba5..9f3b6b1abf7c 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 1bfa04948ba57c372badcb8880cd2f12533d2db0 +Subproject commit 9f3b6b1abf7cb2dd81631df09a5bd530d6d8d62e commit f209e7529759e6db5de455f92f1f63e03385dc15 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Mar 21 18:20:23 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Mar 21 18:20:23 2024 +0100 bump product version to 7.6.6.3 Change-Id: I573f2c66114fab00b4703458bafa29ae90e0631c diff --git a/configure.ac b/configure.ac index 8801f9cb0850..b2abf4c4b6c8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.6.6.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.6.6.3],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit 3f4604deb964892cd68c89de6cbaedb7bfb668ee Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Mar 21 18:16:01 2024 +0100 Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org> CommitDate: Thu Mar 21 18:16:01 2024 +0100 Update git submodules * Update translations from branch 'libreoffice-7-6-6' to 1bfa04948ba57c372badcb8880cd2f12533d2db0 - update translations for 7.6.6 rc3 and force-fix errors using pocheck Change-Id: I27666de13601bf7a1fa144f13385426b3d16dbf8 (cherry picked from commit ee46af8eb1eeef8147c439b7b89b1779be2d1bbe) diff --git a/translations b/translations index 971622e0f2da..1bfa04948ba5 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 971622e0f2da9d21bc0e2944776a0abe2fd260c8 +Subproject commit 1bfa04948ba57c372badcb8880cd2f12533d2db0 commit c3f1a904180abed14779bc165382406e1d20b4bd Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Wed Mar 20 10:52:09 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Mar 21 18:13:57 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 <michael.st...@allotropia.de> (cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165009 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit a65cb686e8e9bf842c354b77945a0dad252c4188) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165115 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/configure.ac b/configure.ac index 29f6ba8bfd2f..8801f9cb0850 100644 --- a/configure.ac +++ b/configure.ac @@ -9955,7 +9955,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 5743c6c951a3..21c6aa046ffb 100644 --- a/download.lst +++ b/download.lst @@ -470,8 +470,8 @@ POSTGRESQL_TARBALL := postgresql-13.11.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 b4c354aa8ba941071ef5fe848eb8eb7ccacd8380 Author: Oliver Specht <oliver.spe...@cib.de> AuthorDate: Wed Mar 20 16:25:17 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Mar 21 18:13:34 2024 +0100 Revert "tdf#159730 add compatibility option in RTF import" This reverts commit 3b04e74503ec6d07dc4befdb756e6abdc3de4e58. Reason for revert: The compatibility option is the wrong approach. This results in wrong line calculation as seen in tdf#159730#c6. The problem that really needs to be fixed is the 9pt attribute of the hidden line breaks in the first paragraph that are used to calculate the height of the first paragraph. Only the 1pt font attribute of the remaining visible space should define the line height. Change-Id: I6e0a1a499adaf2df9f68afbcfd6afcd6677e8f76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165006 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@allotropia.de> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165120 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index ecd6ad6b242a..c4001cf0fe61 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -129,9 +129,6 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon m_pImpl->SetDocumentSettingsProperty( getPropertyName(PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING), uno::Any(true)); - m_pImpl->SetDocumentSettingsProperty( - getPropertyName(PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION), - uno::Any(true)); // Don't load the default style definitions to avoid weird mix m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::Any(true)); diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index 4069a9ac7fe5..11ef07230fad 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -378,7 +378,6 @@ namespace { PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF, u"CursorNotIgnoreTables"}, { PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"}, { PROP_DECORATIVE, u"Decorative"}, - { PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION, u"IgnoreTabsAndBlanksForLineCalculation"}, }); } // end anonymous ns diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx index 25099a684dcd..6708c6dfbf35 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -377,7 +377,6 @@ enum PropertyIds ,PROP_RTL_GUTTER ,PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF ,PROP_PARA_CONNECT_BORDERS - ,PROP_TABS_AND_BLANKS_FOR_LINE_CALCULATION }; //Returns the UNO string equivalent to eId. commit aff0266900f0f11a430e124ea9843427e0a58c54 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Tue Mar 19 18:08:51 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Tue Mar 19 18:08:51 2024 +0100 bump product version to 7.6.6.2.0+ Change-Id: Iab3134336d3da8600d3a5adcb0711d964bbfcfc1 diff --git a/configure.ac b/configure.ac index 09f5b4f6bab6..29f6ba8bfd2f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.6.6.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.6.6.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit 660b60281d0626a73a4bc1b626a813a2ab1b9ee0 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Wed Nov 22 08:31:17 2023 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Tue Mar 19 18:04:28 2024 +0100 tdf#158344: sw floattable: fix crash by trying harder to split tables Regression from commit 60e2fdf1d7e8346e5a3835369c47e582c737ce20 (sw floattable: maintain the invariant that fly height is at least MINFLY, 2023-09-28), the bugdoc crashed on load in SwTabFrame::MakeAll(), because the tab frame's HasFollowFlowLine() was true, but GetFollow()->GetFirstNonHeadlineRow() was nullptr and the invarint is that these are always in sync. Digging deeper, what happens is that the master table has a split row at the end, so the follow table has a "follow flow line". We remove that when we try to split the master table (split either moves rows to the follow or creates a new follow), so the follow table only has a "headline row" remaining. Then Split() is called with bTryToSplit set to true, this fails (because only a single line would fit the master, but orphan/widow control rejects that) and then we join the follow table (because it only has headline rows), so a split with bTryToSplit set to false (don't split the row itself) never happens. This at the end leads to a strange table frame with only headline rows and gets deleted, which is odd to happen during the initial layout. Fix the problem by remembering if we just removed the follow flow line, and in case we tried to split the rows itself and table split failed, then don't join the follow table, so a next split can be invoked with bTryToSplit set to false, which leads to the correct layout. This means not only the crash is fixed, but also no layout loop happens and result matches Word. Limit this to tables in split flys, at least for this bugdoc the inline table case would not have this problem as widow/orphan control is disabled inside inline tables. Change-Id: I172e38be11baf6f73df722a4c6c035a6a283d727 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159802 Reviewed-by: Miklos Vajna <vmik...@collabora.com> Tested-by: Jenkins (cherry picked from commit 223d2fac61e061478721a7a4a89b1362f5037d8f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164689 Tested-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit 34fceee624ae1e478af145af37b76444780f8457) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164737 Reviewed-by: Michael Stahl <michael.st...@allotropia.de> Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/sw/qa/core/layout/data/floattable-table-join.docx b/sw/qa/core/layout/data/floattable-table-join.docx new file mode 100644 index 000000000000..807b4cfa8c11 Binary files /dev/null and b/sw/qa/core/layout/data/floattable-table-join.docx differ diff --git a/sw/qa/core/layout/tabfrm.cxx b/sw/qa/core/layout/tabfrm.cxx index 1659cf0df6fd..84f7ba48c572 100644 --- a/sw/qa/core/layout/tabfrm.cxx +++ b/sw/qa/core/layout/tabfrm.cxx @@ -13,6 +13,10 @@ #include <rootfrm.hxx> #include <pagefrm.hxx> #include <tabfrm.hxx> +#include <sortedobjs.hxx> +#include <anchoredobject.hxx> +#include <flyfrm.hxx> +#include <flyfrms.hxx> namespace { @@ -109,6 +113,62 @@ CPPUNIT_TEST_FIXTURE(Test, testSplitFlyNestedRowSpan) // Then make sure the resulting page count matches Word: CPPUNIT_ASSERT_EQUAL(6, getPages()); } + +CPPUNIT_TEST_FIXTURE(Test, testSplitFlyTableJoin) +{ + // Given a document with a multi-page floating table: + // When loading this document: + createSwDoc("floattable-table-join.docx"); + + // Then make sure this document doesn't crash the layout and has a floating table split on 4 + // pages: + SwDoc* pDoc = getSwDoc(); + SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); + auto pPage1 = pLayout->Lower()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage1); + CPPUNIT_ASSERT(pPage1->GetSortedObjs()); + { + SwSortedObjs& rPageObjs = *pPage1->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + // Start of the chain. + CPPUNIT_ASSERT(!pFly->GetPrecede()); + CPPUNIT_ASSERT(pFly->HasFollow()); + } + auto pPage2 = pPage1->GetNext()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage2); + CPPUNIT_ASSERT(pPage2->GetSortedObjs()); + { + SwSortedObjs& rPageObjs = *pPage2->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + CPPUNIT_ASSERT(pFly->GetPrecede()); + CPPUNIT_ASSERT(pFly->HasFollow()); + } + auto pPage3 = pPage2->GetNext()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage3); + CPPUNIT_ASSERT(pPage3->GetSortedObjs()); + { + SwSortedObjs& rPageObjs = *pPage3->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + CPPUNIT_ASSERT(pFly->GetPrecede()); + CPPUNIT_ASSERT(pFly->HasFollow()); + } + auto pPage4 = pPage3->GetNext()->DynCastPageFrame(); + CPPUNIT_ASSERT(pPage4); + CPPUNIT_ASSERT(pPage4->GetSortedObjs()); + SwSortedObjs& rPageObjs = *pPage4->GetSortedObjs(); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), rPageObjs.size()); + auto pFly = rPageObjs[0]->DynCastFlyFrame()->DynCastFlyAtContentFrame(); + CPPUNIT_ASSERT(pFly); + // End of the chain. + CPPUNIT_ASSERT(pFly->GetPrecede()); + CPPUNIT_ASSERT(!pFly->HasFollow()); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index f730d85f7db5..c85f86672013 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2739,6 +2739,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) aRectFnSet.GetTopMargin(*this) + lcl_GetHeightOfRows( GetLower(), nMinNumOfLines ) ); + bool bHadFollowFlowLineBeforeSplit = false; // Some more checks if we want to call the split algorithm or not: // The repeating lines / keeping lines still fit into the upper or // if we do not have an (in)direct Prev, we split anyway. @@ -2754,6 +2755,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) if (!nThrowAwayValidLayoutLimit) continue; const bool bInitialLoopEndCondition(isFrameAreaDefinitionValid()); + bHadFollowFlowLineBeforeSplit = true; RemoveFollowFlowLine(); const bool bFinalLoopEndCondition(isFrameAreaDefinitionValid()); @@ -2790,7 +2792,15 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) // If splitting the table was successful or not, // we do not want to have 'empty' follow tables. if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() ) - Join(); + { + // For split flys, if we just removed the follow flow line before split, + // then avoid the join in the error + rowsplit case, so split can be called + // again, this time without a rowsplit. + if (!bFlySplit || !bHadFollowFlowLineBeforeSplit || !bSplitError || !bTryToSplit) + { + Join(); + } + } // We want to restore the situation before the failed // split operation as good as possible. Therefore we @@ -2808,6 +2818,8 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext) continue; } + // If split failed, then next time try without + // allowing to split the table rows. bTryToSplit = !bSplitError; //To avoid oscillations the Follow must become valid now commit a20c366364bdfea41bd9063bd8801d5bb59c0092 Author: Sarper Akdemir <sarper.akdemir.ext...@allotropia.de> AuthorDate: Wed Mar 6 13:48:14 2024 +0300 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Tue Mar 19 18:03:07 2024 +0100 tdf#159931: pptx export: export each used slide layout for a master attempts to fix the slideLayout reference related regression from Idb6b88ebe87a83818d8eb27a1fa087652a002c0c. To correctly export the all used slideLayout instances for a given master, iterate through sdr::PageUsers of that master and figure out all used layouts. Change-Id: I0f58befac1ba4d5ec01aeedbb5f611c83683dcf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164468 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de> Reviewed-by: Sarper Akdemir <sarper.akdemir.ext...@allotropia.de> (cherry picked from commit a35831becee3781daf8628c48944660d31d84d8b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164542 (cherry picked from commit a8f058e8ab02643ac2c8d6b6d8fcb3ab45fcf79f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164670 Reviewed-by: Michael Stahl <michael.st...@allotropia.de> Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index d7eac22a1b5c..9be1e663bcff 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -22,6 +22,7 @@ #include <svx/sdrpageuser.hxx> #include <svx/svdsob.hxx> +#include <svx/svxdllapi.h> #include <memory> class SdrPageProperties; @@ -30,7 +31,7 @@ namespace sdr::contact { class ViewContact; } namespace sdr { - class MasterPageDescriptor final : public sdr::PageUser + class SVXCORE_DLLPUBLIC MasterPageDescriptor final : public sdr::PageUser { private: SdrPage& maOwnerPage; diff --git a/include/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx index 8c31a2936c7e..5557b2729777 100644 --- a/include/svx/sdrpageuser.hxx +++ b/include/svx/sdrpageuser.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVX_SDRPAGEUSER_HXX #include <vector> +#include <svx/svxdllapi.h> class SdrPage; @@ -30,7 +31,7 @@ class SdrPage; namespace sdr { - class PageUser + class SVXCORE_DLLPUBLIC PageUser { public: // this method is called from the destructor of the referenced page. diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 6a65712719f1..76ab049055ca 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -398,6 +398,7 @@ private: public: void AddPageUser(sdr::PageUser& rNewUser); void RemovePageUser(sdr::PageUser& rOldUser); + const sdr::PageUserVector& GetPageUsers() const { return maPageUsers; }; // SdrModel access on SdrPage level SdrModel& getSdrModelFromSdrPage() const { return mrSdrModelFromSdrPage; } diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 6a66e59af884..a0f36fe0688a 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -2011,6 +2011,53 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest3, testTableCellVerticalPropertyRoundtrip) assertXPath(pXml, "(//a:tcPr)[3]", "vert", "wordArtVert"); } +CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest3, testTdf159931_slideLayouts) +{ + createSdImpressDoc("odp/repeatBitmapMode.odp"); + save("Impress Office Open XML"); + + xmlDocUniquePtr pXmlDocRels1 = parseExport("ppt/slides/_rels/slide1.xml.rels"); + xmlDocUniquePtr pXmlDocRels2 = parseExport("ppt/slides/_rels/slide2.xml.rels"); + + assertXPath(pXmlDocRels1, "(/rels:Relationships/rels:Relationship[@Type='http://" + "schemas.openxmlformats.org/officeDocument/2006/relationships/" + "slideLayout'])"); + + // the relative target e.g. "../slideLayouts/slideLayout2.xml" + OUString sRelativeLayoutPath1 + = getXPathContent(pXmlDocRels1, "(/rels:Relationships/rels:Relationship[@Type='http://" + "schemas.openxmlformats.org/officeDocument/2006/" + "relationships/slideLayout'])/@Target"); + + assertXPath(pXmlDocRels2, "(/rels:Relationships/rels:Relationship[@Type='http://" + "schemas.openxmlformats.org/officeDocument/2006/relationships/" + "slideLayout'])"); + + // the relative target e.g. "../slideLayouts/slideLayout1.xml" + OUString sRelativeLayoutPath2 + = getXPathContent(pXmlDocRels2, "(/rels:Relationships/rels:Relationship[@Type='http://" + "schemas.openxmlformats.org/officeDocument/2006/" + "relationships/slideLayout'])/@Target"); + + uno::Reference<packages::zip::XZipFileAccess2> xNameAccess + = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), + maTempFile.GetURL()); + + // Check that the referenced slideLayout files exist + // Without the accompanying fix in place, this test would have failed with: + // equality assertion failed + // - Expected: 1 + // - Actual : 0 + // i.e. the referenced slideLayout file was missing on export. + OUString sSlideLayoutName1 = sRelativeLayoutPath1.getToken(2, '/'); + OUString sSlideLayoutName2 = sRelativeLayoutPath2.getToken(2, '/'); + + CPPUNIT_ASSERT_EQUAL(true, + bool(xNameAccess->hasByName("ppt/slideLayouts/" + sSlideLayoutName1))); + CPPUNIT_ASSERT_EQUAL(true, + bool(xNameAccess->hasByName("ppt/slideLayouts/" + sSlideLayoutName2))); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 0967b6a3b34e..2bf374c3d216 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -63,6 +63,7 @@ #include "../ppt/pptanimations.hxx" #include <i18nlangtag/languagetag.hxx> +#include <svx/sdrmasterpagedescriptor.hxx> #include <svx/svdpage.hxx> #include <svx/unoapi.hxx> #include <svx/svdogrp.hxx> @@ -1515,23 +1516,48 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32 nPageNum, Reference< XPro // use master's id type as they have same range, mso does that as well pFS->startElementNS(XML_p, XML_sldLayoutIdLst); - sal_Int32 nLayout = 0; - OUString aSlideName; - css::uno::Reference< css::beans::XPropertySet >xPagePropSet; + auto getLayoutsUsedForMaster = [](SdrPage* pMaster) -> std::unordered_set<sal_Int32> + { + if (!pMaster) + return {}; + + std::unordered_set<sal_Int32> aUsedLayouts{}; + for (const auto* pPageUser : pMaster->GetPageUsers()) + { + const auto* pMasterPageDescriptor + = dynamic_cast<const sdr::MasterPageDescriptor*>(pPageUser); + + if (!pMasterPageDescriptor) + continue; + + AutoLayout eLayout + = static_cast<SdPage&>(pMasterPageDescriptor->GetOwnerPage()).GetAutoLayout(); + aUsedLayouts.insert(eLayout); + } + return aUsedLayouts; + }; + + std::unordered_set<sal_Int32> aLayouts = getLayoutsUsedForMaster(pMasterPage); + + css::uno::Reference< css::beans::XPropertySet > xPagePropSet; xPagePropSet.set(mXDrawPage, UNO_QUERY); if (xPagePropSet.is()) { uno::Any aAny; if (GetPropertyValue(aAny, xPagePropSet, "SlideLayout")) - aAny >>= nLayout; + aLayouts.insert(aAny.get<sal_Int32>()); } + OUString aSlideName; Reference< XNamed > xNamed(mXDrawPage, UNO_QUERY); if (xNamed.is()) aSlideName = xNamed->getName(); - ImplWritePPTXLayout(nLayout, nPageNum, aSlideName); - AddLayoutIdAndRelation(pFS, GetLayoutFileId(nLayout, nPageNum)); + for (auto nLayout : aLayouts) + { + ImplWritePPTXLayout(nLayout, nPageNum, aSlideName); + AddLayoutIdAndRelation(pFS, GetLayoutFileId(nLayout, nPageNum)); + } pFS->endElementNS(XML_p, XML_sldLayoutIdLst); commit b2f5db9d7c590a0dbbb6062008520a84854d582c Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Mon Mar 4 13:21:06 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Tue Mar 19 17:59:57 2024 +0100 tdf#159373: band-aid for crash in: ScTable::HasAttrib band-aid because as Eike indicated in https://bugs.documentfoundation.org/show_bug.cgi?id=159373#c8 "Question remains why this PostPaint() is called at all for an invalid range.." Change-Id: Ie44378119202addd8ddb46f0be4b0124be9fd48b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164354 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164623 (cherry picked from commit 4d2338ef6ac34ce248c868b05f6fcbf45e6428c2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164628 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 789737e5f824..c60bd2964492 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -116,6 +116,9 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, PaintPartFlags nPart, sa SCROW nRow1 = rRange.aStart.Row(), nRow2 = rRange.aEnd.Row(); SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab(); + if (nTab1 < 0 || nTab2 < 0) + continue; + if (!m_pDocument->ValidCol(nCol1)) nCol1 = m_pDocument->MaxCol(); if (!m_pDocument->ValidRow(nRow1)) nRow1 = m_pDocument->MaxRow(); if (!m_pDocument->ValidCol(nCol2)) nCol2 = m_pDocument->MaxCol(); commit eaf9c8ccb68dfdfb1f509c43ed922f18fa6f5e74 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Mar 13 12:27:12 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Tue Mar 19 17:59:35 2024 +0100 tdf#159915 qt: Force Qt::HighDpiScaleFactorRoundingPolicy::Round For now, force `Qt::HighDpiScaleFactorRoundingPolicy::Round` for the HighDPI-scale factor rounding policy [1], which is the default for Qt 5, while Qt 6 defaults to `Qt::HighDpiScaleFactorRoundingPolicy::PassThrough` (see [2]), which resulted in broken rendering (e.g. "Help" -> "About" dialog not showing the whole content) when fractional display scaling like 150 % is configured in the KDE Plasma display settings (in contrast to manually setting the `QT_SCALE_FACTOR=1.5` env variable to apply scaling, which was working fine). Quoting from [3]: > The two principal options are whether fractional scale factors should be > rounded to an integer or not. Keeping the scale factor as-is will make > the user interface size match the OS setting exactly, but may cause > painting errors, for example with the Windows style. Manually setting the env variable `QT_SCALE_FACTOR_ROUNDING_POLICY="Round"` has the same effect (and can be used with LO versions not yet containing this fix). (There might be a way to adjust the way that scaling happens to make other policies work, but for now, just hard-code to the policy that is known to work.) [1] https://doc.qt.io/qt-6/qt.html#HighDpiScaleFactorRoundingPolicy-enum [2] https://doc.qt.io/qt-6/highdpi.html#environment-variable-reference [3] https://doc.qt.io/qt-6/qguiapplication.html#setHighDpiScaleFactorRoundingPolicy [Note: The libreoffice-7-6 backport needs an extra Qt version check as Qt::HighDpiScaleFactorRoundingPolicy requires Qt 5.14 while the 7-6 baseline is lower. The master/libreoffice-24-2 baseline already ensures Qt 5.15, see also commit afb4c96d271958ced3175dfc2cf8bb9e8b0a9d3b, "qt: Drop code for Qt < 5.15".] Change-Id: I8eb6911d4dd5faf00912b8f15a58e0bdace1995a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164768 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> (cherry picked from commit 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164745 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> (cherry picked from commit a64d0da7d09cd27a332060f61a25980131e48a56) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164815 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx index df3df5d17a74..2675445702de 100644 --- a/vcl/qt5/QtInstance.cxx +++ b/vcl/qt5/QtInstance.cxx @@ -708,6 +708,13 @@ std::unique_ptr<QApplication> QtInstance::CreateQApplication(int& nArgc, char** // for scaled icons in the native menus QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + // force Qt::HighDpiScaleFactorRoundingPolicy::Round, which is the Qt 5 default + // policy and prevents incorrect rendering with the Qt 6 default policy + // Qt::HighDpiScaleFactorRoundingPolicy::PassThrough (tdf#159915) + QGuiApplication::setHighDpiScaleFactorRoundingPolicy( + Qt::HighDpiScaleFactorRoundingPolicy::Round); +#endif FreeableCStr session_manager; if (getenv("SESSION_MANAGER") != nullptr) commit 9f84b32a06deb1e0d3a717ac67a173b84611eefc Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Tue Mar 19 12:14:50 2024 +0100 Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org> CommitDate: Tue Mar 19 12:14:50 2024 +0100 Update git submodules * Update translations from branch 'libreoffice-7-6-6' to 971622e0f2da9d21bc0e2944776a0abe2fd260c8 - update translations for 7.6.6 rc2 and force-fix errors using pocheck Change-Id: If460e6afafc42b7f06e2e2a32b1f0da45ee9d7ab (cherry picked from commit 2c72d6fd1b7800164baf7a3d5afbeb53b7734e49) diff --git a/translations b/translations index ed69f53932c1..971622e0f2da 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ed69f53932c14aa8acda4083fba005ef08fcc9a7 +Subproject commit 971622e0f2da9d21bc0e2944776a0abe2fd260c8 commit 3d9c55e7a45fdd06bb4e00c62a9f3bbc81197e94 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Wed Mar 13 21:50:45 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Mon Mar 18 16:53:25 2024 +0100 tdf#160180: bump copyright year to 2024 Change-Id: I466b8f86e8a53a238ed2ce2d2b053dc519ff8eed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164794 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> Tested-by: Julien Nabet <serval2...@yahoo.fr> (cherry picked from commit 94da114cd86e3bcd8b6235566ca5f926f09d4b18) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164884 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit 5889cecd2e7b805f5d268820e7c2817725990a34) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164885 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT index 1e8587c1cce9..860092aee87e 100644 --- a/compilerplugins/LICENSE.TXT +++ b/compilerplugins/LICENSE.TXT @@ -1,7 +1,7 @@ University of Illinois/NCSA Open Source License -Copyright (c) 2012-2023 The Document Foundation +Copyright (c) 2012-2024 The Document Foundation All rights reserved. Developed by: diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index 84a2c9f859a1..143435c4f1ce 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -368,7 +368,7 @@ #define RID_CUISTR_CANNOTCONVERTURL_ERR NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a filesystem path.") -#define RID_CUISTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2023 LibreOffice contributors.") +#define RID_CUISTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2024 LibreOffice contributors.") #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", "This release was supplied by %OOOVENDOR.") #define RID_CUISTR_ABOUT_BASED_ON NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.") #define RID_CUISTR_ABOUT_DERIVED NC_("aboutdialog|derived", "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org") diff --git a/odk/docs/install.html b/odk/docs/install.html index aaafae6ce9c3..3bf36d8a2563 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -534,7 +534,7 @@ </div> <div id="Footer"> <div id="FooterText"> - <p>Copyright © 2000–2023 LibreOffice contributors. All rights + <p>Copyright © 2000–2024 LibreOffice contributors. All rights reserved.<br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org.<br/> The Document Foundation acknowledges all community members, please diff --git a/odk/docs/tools.html b/odk/docs/tools.html index d71d36f2401d..d639a5f393d8 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -881,7 +881,7 @@ types the specified types depend on.</p> <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on Apache OpenOffice, which is Copyright 2011, diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index df5a83fdd1d9..cbcdc8736e64 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -2856,7 +2856,7 @@ for the Office application.</td> <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org. diff --git a/odk/examples/examples.html b/odk/examples/examples.html index f50dffbc79e8..9c3c34eff00a 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -932,7 +932,7 @@ <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org. diff --git a/odk/index.html b/odk/index.html index 6cc5beaae2c9..3a8c91da7874 100644 --- a/odk/index.html +++ b/odk/index.html @@ -188,7 +188,7 @@ <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br/> LibreOffice was created by The Document Foundation, based on OpenOffice.org. diff --git a/odk/index_online.html b/odk/index_online.html index 80c1c44c1b04..4edb8bf2a344 100644 --- a/odk/index_online.html +++ b/odk/index_online.html @@ -234,7 +234,7 @@ <div id="Footer"> <div id="FooterText"> <p> - Copyright © 2000–2023 LibreOffice contributors. All rights reserved. + Copyright © 2000–2024 LibreOffice contributors. All rights reserved. <br> LibreOffice was created by The Document Foundation, based on OpenOffice.org. <br> diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 637f85d7239c..4536d3e0db17 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -13,7 +13,7 @@ <p>Third Party Code Additional copyright notices and license terms applicable to portions of the Software can be found <a href="#thirdparty">below</a> in this document.</p> <p>All trademarks and registered trademarks mentioned herein are the property of their respective owners.</p> - <p>Copyright © 2000–2023 LibreOffice contributors. All rights reserved.</p> + <p>Copyright © 2000–2024 LibreOffice contributors. All rights reserved.</p> <p>This product is based on OpenOffice.org. Portions of this software are copyright © 2000-2011, Oracle and/or its affiliates.</p> <p>This product has been created by The Document Foundation, incorporating many modifications from different diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index f8e4de457c66..29fa59661061 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -22,7 +22,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-images %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -36,7 +36,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -50,7 +50,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -64,7 +64,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -78,7 +78,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-draw" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -92,7 +92,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-math" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -106,7 +106,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-base" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -120,7 +120,7 @@ solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGEST packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Brand language module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt index 173563db537f..4f156fd84347 100644 --- a/setup_native/source/packinfo/packinfo_extensions.txt +++ b/setup_native/source/packinfo/packinfo_extensions.txt @@ -41,7 +41,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mediawiki-publisher" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "MediaWiki publisher extension for %PRODUCTNAME %PRODUCTVERSION" @@ -71,7 +71,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-nlpsolver" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "NLPSolver extension for %PRODUCTNAME %PRODUCTVERSION" @@ -86,7 +86,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-beanshell-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Script provider for BeanShell extension for %PRODUCTNAME %PRODUCTVERSION" @@ -101,7 +101,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-javascript-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Script provider for JavaScript extension for %PRODUCTNAME %PRODUCTVERSION" diff --git a/setup_native/source/packinfo/packinfo_librelogo_disabled.txt b/setup_native/source/packinfo/packinfo_librelogo_disabled.txt index 262212ecdef9..e675efbec8f0 100644 --- a/setup_native/source/packinfo/packinfo_librelogo_disabled.txt +++ b/setup_native/source/packinfo/packinfo_librelogo_disabled.txt @@ -27,7 +27,7 @@ linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index c31c3e295ae8..76e0bda5a359 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -47,7 +47,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-gnome-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" findrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "GNOME integration module for %PRODUCTNAME %PRODUCTVERSION" @@ -62,7 +62,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-tde-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "TDE integration module for %PRODUCTNAME %PRODUCTVERSION" @@ -77,7 +77,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-kde-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION" @@ -95,7 +95,7 @@ solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-ooofonts" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts" findrequires = "find-requires-x11.sh" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" @@ -110,7 +110,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Writer module for %PRODUCTNAME %PRODUCTVERSION" @@ -125,7 +125,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-calc" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Calc module for %PRODUCTNAME %PRODUCTVERSION" @@ -140,7 +140,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-draw" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Draw module for %PRODUCTNAME %PRODUCTVERSION" @@ -155,7 +155,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Impress module for %PRODUCTNAME %PRODUCTVERSION" @@ -170,7 +170,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Base module for %PRODUCTNAME %PRODUCTVERSION" @@ -185,7 +185,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-math" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Math module for %PRODUCTNAME %PRODUCTVERSION" @@ -200,7 +200,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-firebird" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Firebird module for %PRODUCTNAME %PRODUCTVERSION" @@ -215,7 +215,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-graphicfilter" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION" @@ -230,7 +230,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-xsltfilter" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION" @@ -245,7 +245,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-activex" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION" @@ -259,7 +259,7 @@ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-onlineupdate" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC, SUNWgzip" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-onlineupdate" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Online update module for %PRODUCTNAME %PRODUCTVERSION" @@ -274,7 +274,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWPython packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION" @@ -289,7 +289,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno,%BASISPACK packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "LibreLogo toolbar for %PRODUCTNAME %PRODUCTVERSION Writer" @@ -304,7 +304,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Cor packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-python-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Script provider for Python for %PRODUCTNAME %PRODUCTVERSION" @@ -319,7 +319,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-images" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Images module for %PRODUCTNAME %PRODUCTVERSION" @@ -334,7 +334,7 @@ solarisrequires = "" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts" freebsdrequires = "" requires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "3rd party free fonts for %PRODUCTNAME %PRODUCTVERSION" @@ -349,7 +349,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooolinguistic" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Linguistic module for %PRODUCTNAME %PRODUCTVERSION" @@ -364,7 +364,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Af dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -499,7 +499,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ca dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -514,7 +514,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ckb" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ckb dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -529,7 +529,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Cs dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -544,7 +544,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Da dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -559,7 +559,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "De dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -574,7 +574,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "En dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -604,7 +604,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-eo" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Eo dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -619,7 +619,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Es dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -634,7 +634,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Et dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -664,7 +664,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Fr dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -694,7 +694,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-gl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Gl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -724,7 +724,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "He dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -754,7 +754,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Hu dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -784,7 +784,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-id" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Indonesian dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -799,7 +799,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-is" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The hunspell-is project" description = "Is dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -814,7 +814,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "It dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -829,7 +829,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-kmr-Latn" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Kmr-Latn dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -844,7 +844,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ko" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "ko-KR dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -874,7 +874,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Lt dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -904,7 +904,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ne dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -919,7 +919,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Nl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -934,7 +934,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-mn" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Mn dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -949,7 +949,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "No dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -979,7 +979,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -994,7 +994,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-BR" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pt-BR dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1009,7 +1009,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-PT" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pt-PT dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1024,7 +1024,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ro dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1039,7 +1039,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ru dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1069,7 +1069,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sk dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1084,7 +1084,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2023 The Document Foundation" +copyright = "2024 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1114,7 +1114,7 @@ solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEP packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -e ... etc. - the rest is truncated