android/source/res/values-gl/strings.xml | 133 configure.ac | 2 dictionaries | 2 download.lst | 12 external/expat/0001-Fix-compiler-warnings.patch | 47 external/expat/UnpackedTarball_expat.mk | 3 external/nss/README | 26 filter/source/config/cache/filtercache.cxx | 224 - filter/source/config/cache/filtercache.hxx | 41 helpcontent2 | 2 readlicense_oo/license/CREDITS.fodt | 4305 ++++++++++++------------ sc/source/core/data/table4.cxx | 2 solenv/gbuild/platform/com_MSC_class.mk | 8 svgio/qa/cppunit/SvgImportTest.cxx | 21 svgio/qa/cppunit/data/tdf159594.svg | 7 svgio/source/svgreader/svgsymbolnode.cxx | 8 svx/source/svdraw/svdhdl.cxx | 101 sw/inc/IDocumentMarkAccess.hxx | 7 sw/source/core/doc/docbm.cxx | 10 sw/source/core/inc/MarkManager.hxx | 1 sw/source/filter/writer/writer.cxx | 6 translations | 2 22 files changed, 2630 insertions(+), 2340 deletions(-)
New commits: commit f127328b7fc1163c5f0bd34a4a50602fc40db7a9 Merge: f273d7cbabfa 38d5f62f8535 Author: Thorsten Behrens <thorsten.behr...@allotropia.de> AuthorDate: Thu Feb 22 12:35:14 2024 +0100 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Thu Feb 22 12:35:14 2024 +0100 Merge tag 'libreoffice-7.6.5.2-hotfix1' into feature/cib_contract49 Tag libreoffice-7.6.5.2-hotfix1 Change-Id: I2aabb70a2e7dd36e614c63b2d866171d103a8a2e commit 38d5f62f85355c192ef5f1dd47c5c0c0c6d6598b Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Sat Feb 17 14:05:36 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Sat Feb 17 14:05:36 2024 +0100 Version 7.6.5.2, tag libreoffice-7.6.5.2-hotfix1 diff --git a/dictionaries b/dictionaries index 609ce1ef4745..96d4139d0fea 160000 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 609ce1ef4745a2cb42669eff29ba101eec640ffb +Subproject commit 96d4139d0fea2ebefcae2cc459429386620a24b9 diff --git a/helpcontent2 b/helpcontent2 index 32c3f0d181e7..cfa40f1e278a 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 32c3f0d181e7d0a7f4667a198bb68d9f15133bf6 +Subproject commit cfa40f1e278a0403264c5e496f3c0b79b7bf2aa4 diff --git a/translations b/translations index 417fc3fb8ce8..76ae0c32be86 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 417fc3fb8ce8ec72473cb019da43c3350581d8e8 +Subproject commit 76ae0c32be86cf727beeb0f58369fcb41677d97d commit 4ff98b465d4b592ae66cc8bff2b9a6ee8c341685 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Fri Feb 16 13:43:20 2024 +0600 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Sat Feb 17 14:02:37 2024 +0100 OpenSSL: upgrade to 3.0.13 Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163493 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit a268b95d73911f1b92482c4b06d480cfd6eeb0dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163534 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit c1ba4bcef46433fe130ce36639d3cfead1b8b8d1) diff --git a/download.lst b/download.lst index 7392c9efb737..63ad7a6b91d2 100644 --- a/download.lst +++ b/download.lst @@ -423,8 +423,8 @@ OPENLDAP_TARBALL := openldap-2.6.6.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55 -OPENSSL_TARBALL := openssl-3.0.11.tar.gz +OPENSSL_SHA256SUM := 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 +OPENSSL_TARBALL := openssl-3.0.13.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 5dba65c0c70d07310be84b307aa67db7faeb6224 Author: Hossein <hoss...@libreoffice.org> AuthorDate: Thu May 25 15:55:11 2023 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Sat Feb 17 14:02:36 2024 +0100 tdf#155446 Fix problem with ccache on Windows This patch fixes the recent problem with building LibreOffice with ccache on Windows which was caused by the lack of double quotation mark between ccache.exe and path to the MSVC compiler. Change-Id: I1a714513ccb8cd674895d0c887013ea862d3b544 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152277 Tested-by: Jenkins Reviewed-by: Hossein <hoss...@libreoffice.org> (cherry picked from commit 0c9f095a01682d8cb99a596e568bd81ae96906a5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163505 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit aeca67238e26cd148083055e0f223753f7462c14) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163530 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit 755bafba7ea3642df99ca0bd2b77e608ffa3e4d3) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index ba42b0ba48df..d8cab84ff7c7 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -179,7 +179,7 @@ define gb_AsmObject__command $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ - "$(CC)" -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && \ + $(CC) -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && \ "$(ML_EXE)" $(gb_AFLAGS) -g -errorReport:prompt -o $(1) $(subst .o,.asm,$(1)), \ ) && \ echo "$(1) : $(3)" > $(4) @@ -664,8 +664,12 @@ gb_AUTOCONF_WRAPPERS = \ gb_ExternalProject_INCLUDE := \ $(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC))) +# Workaround for openssl build - it puts the CC var into additional pair of quotes. This breaks if +# CC consists of more than a single element such as when using "ccache compiler". In case the +# variables are exported for openssl, it closes and reopens the quotes after each element. gb_NMAKE_VARS = \ - CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ + CC="$(subst $(WHITESPACE),$(if $(filter openssl,$(1)),\" \", ),$(strip \ + $(shell cygpath -ws $(filter-out -%,$(CC))) $(filter -%,$(CC))))" \ INCLUDE="$(gb_ExternalProject_INCLUDE)" \ LIB="$(ILIB)" \ MAKEFLAGS= \ commit d6e685834a6393bc66ca7dfbfd3c89238dc0b85a Author: Michael Stahl <michael.st...@allotropia.de> AuthorDate: Fri Feb 16 10:34:54 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Sat Feb 17 14:02:36 2024 +0100 nss: upgrade to release 3.98 Fixes CVE-2023-5388 Also update README, and remove obsolete documentation of Debian's mangled SONAME; relevant Debian changelog: nss (2:3.13.4-2) unstable; urgency=low * debian/control, debian/libnss3*, debian/rules, mozilla/security/coreconf/*, mozilla/security/nss/lib/*/manifest.mn: Move to unversioned library. ABI compatibility is ensured upstream, and the SO version, if it needed a change at any time, would be a change in the library name. There is no reason to keep making compatibility more difficult with other distros and upstream binary releases. While previous versions were one-way compatible (binaries built against other distros or upstream nspr could work on Debian), this approach works both ways. -- Mike Hommey <gland...@debian.org> Thu, 17 May 2012 09:45:36 +0200 Change-Id: Ifc1eae68827fa88ae001a3903c8555af67b488ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163494 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit a3b49781403102ed8439fad11b1ba0c5457d7606) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163506 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit a5087b37ffcc5f686f1fe9371ab411b81006ad92) diff --git a/download.lst b/download.lst index c034dca3ccd6..7392c9efb737 100644 --- a/download.lst +++ b/download.lst @@ -397,8 +397,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce -NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz +NSS_SHA256SUM := 59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed +NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/nss/README b/external/nss/README index 6997cea6ca06..09931f64ea20 100644 --- a/external/nss/README +++ b/external/nss/README @@ -1,5 +1,16 @@ Contains the Network Security Services (NSS) libraries from Mozilla +== ESR versions == + +Upstream releases both regular and "ESR" versions, the latter go into Firefox +ESR and Thunderbird. + +There is a new ESR version about once a year, and a ESR version gets micro +updates only when there are security issues to fix, and it's not always obvious +from the release notes of a regular release if there are security issues that +are relevant to LibreOffice, hence it's probably best to bundle only the ESR +versions and upgrade for every micro release (as recommended by upstream). + == Fips 140 and signed libraries == Fips 140 mode is not supported. That is, the *.chk files containing the @@ -20,18 +31,3 @@ With all supported macOS SDK we use NSS_USE_SYSTEM_SQLITE=1 to build using the system sqlite. -== system NSS on Linux == - -Note that different Linux distributions use different SONAMEs for the -NSS libraries, so it is not possible to use --with-system-nss and build -a portable generic LO installation set, despite NSS upstream apparently -maintaining ABI compatibility. - -Debian Squeeze: -0x000000000000000e (SONAME) Library soname: [libnss3.so.1d] -Fedora 20: -0x000000000000000e (SONAME) Library soname: [libnss3.so] - -For the record, the LSB specified SONAME is libnss3.so -http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libnss3.html - commit c235c9a526d89ff6c3207d7c98f15c2218837220 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Wed Feb 14 22:18:30 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Sat Feb 17 14:02:36 2024 +0100 nss: upgrade to release 3.97 Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163410 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> (cherry picked from commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163408 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit 85c6a7a4944efa5b91e25a35860997e254d35f4c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163503 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit 19115995ee7dcb760e8ad08457c012f28b86ec78) diff --git a/download.lst b/download.lst index 54c36e4ddbd0..c034dca3ccd6 100644 --- a/download.lst +++ b/download.lst @@ -397,8 +397,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739 -NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz +NSS_SHA256SUM := a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce +NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 3bface63276dddf87526c7cacdc35faf17cde0f2 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Feb 15 21:45:47 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:45:47 2024 +0100 Version 7.6.5.2, tag libreoffice-7.6.5.2 diff --git a/dictionaries b/dictionaries index 7621eb3c293f..609ce1ef4745 160000 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7621eb3c293f76b9b20b4e288ff69542131dd740 +Subproject commit 609ce1ef4745a2cb42669eff29ba101eec640ffb diff --git a/helpcontent2 b/helpcontent2 index a8cf8c7acf32..32c3f0d181e7 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a8cf8c7acf32a0e8cb1cb0299c9f54ccff6ac4f1 +Subproject commit 32c3f0d181e7d0a7f4667a198bb68d9f15133bf6 diff --git a/translations b/translations index 7acada566d34..417fc3fb8ce8 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7acada566d34b6c5e0274de3d0ff8c57bce04277 +Subproject commit 417fc3fb8ce8ec72473cb019da43c3350581d8e8 commit 30f5bb3a50b305eb64965f471e0ccce25f41b24d Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Feb 15 21:45:20 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:45:20 2024 +0100 bump product version to 7.6.5.2 Change-Id: I929a8dc621c76a43b6633289a10505ce6b26023a diff --git a/configure.ac b/configure.ac index fb7a03eee7c5..7ef68fcf2f91 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.5.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.6.5.2],[],[],[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 8e60f14eddf768db6ae0880ea6a8e6c834842582 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Feb 12 12:54:06 2024 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:39:59 2024 +0100 tdf#159666 Crash when table and line object are selected at the same time before commit e3077168072452fb8f1c0a8afb2992877cb96d1c Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Thu Jun 17 09:49:37 2021 +0200 loplugin:finalclasses the cast in const SdrEdgeObj* pEdge = static_cast<SdrEdgeObj*>(m_pObj); would incorrectly cast a SdrTableObj, but it happened to do nothing problematic. After the above commit, the vtable layout changed and it started crashing. Work around it by use dynamic_cast and ignoring objects that are not SdrEdgeObj. Change-Id: Ibe03d4935b8eeb182e037b1648d841e26fa23ed4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163242 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> (cherry picked from commit bac09f76fd903c109b591a7bc15883e5653715ee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163187 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163256 (cherry picked from commit 39efb3e139ae6423ea093eedc449ac8c5b2cebf4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163277 Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 64f29976f5ca..62851f9b6331 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1604,66 +1604,67 @@ ImpEdgeHdl::~ImpEdgeHdl() void ImpEdgeHdl::CreateB2dIAObject() { - if(nObjHdlNum <= 1 && pObj) + if(nObjHdlNum > 1 || !pObj) { - // first throw away old one - GetRidOfIAObject(); + // call parent + SdrHdl::CreateB2dIAObject(); + return; + } - BitmapColorIndex eColIndex = BitmapColorIndex::LightCyan; - BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_7x7; + // first throw away old one + GetRidOfIAObject(); - if(pHdlList) - { - SdrMarkView* pView = pHdlList->GetView(); + BitmapColorIndex eColIndex = BitmapColorIndex::LightCyan; + BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_7x7; - if(pView && !pView->areMarkHandlesHidden()) - { - const SdrEdgeObj* pEdge = static_cast<SdrEdgeObj*>(pObj); + if(!pHdlList) + return; - if(pEdge->GetConnectedNode(nObjHdlNum == 0) != nullptr) - eColIndex = BitmapColorIndex::LightRed; + SdrMarkView* pView = pHdlList->GetView(); - if(nPPntNum < 2) - { - // Handle with plus sign inside - eKindOfMarker = BitmapMarkerKind::Circ_7x7; - } + if(!pView || pView->areMarkHandlesHidden()) + return; - SdrPageView* pPageView = pView->GetSdrPageView(); + // tdf#159666 Crash when table and line object are selected at the same time + auto pEdge = dynamic_cast<SdrEdgeObj*>(pObj); + if (!pEdge) + return; - if(pPageView) - { - for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++) - { - const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b); - - if(rPageWindow.GetPaintWindow().OutputToWindow()) - { - const rtl::Reference< sdr::overlay::OverlayManager >& xManager = rPageWindow.GetOverlayManager(); - if (xManager.is()) - { - basegfx::B2DPoint aPosition(aPos.X(), aPos.Y()); - std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(CreateOverlayObject( - aPosition, - eColIndex, - eKindOfMarker)); - - // OVERLAYMANAGER - insertNewlyCreatedOverlayObjectForSdrHdl( - std::move(pNewOverlayObject), - rPageWindow.GetObjectContact(), - *xManager); - } - } - } - } - } - } + if(pEdge->GetConnectedNode(nObjHdlNum == 0) != nullptr) + eColIndex = BitmapColorIndex::LightRed; + + if(nPPntNum < 2) + { + // Handle with plus sign inside + eKindOfMarker = BitmapMarkerKind::Circ_7x7; } - else + + SdrPageView* pPageView = pView->GetSdrPageView(); + if(!pPageView) + return; + + for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++) { - // call parent - SdrHdl::CreateB2dIAObject(); + const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b); + + if(rPageWindow.GetPaintWindow().OutputToWindow()) + { + const rtl::Reference< sdr::overlay::OverlayManager >& xManager = rPageWindow.GetOverlayManager(); + if (xManager.is()) + { + basegfx::B2DPoint aPosition(aPos.X(), aPos.Y()); + std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(CreateOverlayObject( + aPosition, + eColIndex, + eKindOfMarker)); + + // OVERLAYMANAGER + insertNewlyCreatedOverlayObjectForSdrHdl( + std::move(pNewOverlayObject), + rPageWindow.GetObjectContact(), + *xManager); + } + } } } commit 5976bff00ae8eceedd139fbbb2621240108a2400 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Feb 7 14:52:05 2024 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:37:56 2024 +0100 tdf#158279 TOC links lost when converting .doc to HTML regression from commit 8ce36e943f0e50970925b2dd77729ef6036b4a49 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Sun May 26 15:15:41 2019 +0200 move some searching inside IDocumentMarkAccess where I called the wrong method from inside Writer::FindPos_Bkmk The code was then removed in commit 7bad1516c5f2a85b5bae3f49261ac2494cbb7162 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Wed Jul 17 05:41:08 2019 +0200 loplugin:unusedmethods Change-Id: I3f1e14a1e3ae2dd134738363e6b2679d2a2f418a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163095 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> (cherry picked from commit 0a32def8b519461b35b1e249d71ae9961b04400a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163134 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit d376d2ed714994845bc5cfdb989b3ffa0609ea4b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163189 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index d63b58f606c4..bc8f2e1c03d6 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -279,6 +279,13 @@ class IDocumentMarkAccess */ virtual const_iterator_t findMark(const OUString& rMark) const =0; + /** Find the first Mark that does not start before. + + @returns + an iterator pointing to the mark, or pointing to getAllMarksEnd() if nothing was found. + */ + virtual const_iterator_t findFirstMarkNotStartsBefore(const SwPosition& rPos) const =0; + // interface IBookmarks (BOOKMARK, CROSSREF_NUMITEM_BOOKMARK, CROSSREF_HEADING_BOOKMARK ) /** check if the selection would delete a BOOKMARK */ diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index bb8e75969239..0a88f3b3e44a 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1410,6 +1410,16 @@ namespace sw::mark return IDocumentMarkAccess::iterator(ret); } + // find the first Mark that does not start before + IDocumentMarkAccess::const_iterator_t MarkManager::findFirstMarkNotStartsBefore(const SwPosition& rPos) const + { + return std::lower_bound( + m_vAllMarks.begin(), + m_vAllMarks.end(), + rPos, + CompareIMarkStartsBefore()); + } + IDocumentMarkAccess::const_iterator_t MarkManager::getAllMarksBegin() const { return m_vAllMarks.begin(); } diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index ef0e79d74c11..dd7eb9f6f18b 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -81,6 +81,7 @@ namespace sw::mark { virtual const_iterator_t getAllMarksEnd() const override; virtual sal_Int32 getAllMarksCount() const override; virtual const_iterator_t findMark(const OUString& rName) const override; + virtual const_iterator_t findFirstMarkNotStartsBefore(const SwPosition& rPos) const override; // bookmarks virtual bool isBookmarkDeleted(SwPaM const& rPaM, bool isReplace) const override; diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 6c7565e5dcc4..efc9d875f9c8 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -160,9 +160,9 @@ bool Writer::CopyNextPam( SwPaM ** ppPam ) sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const { const IDocumentMarkAccess* const pMarkAccess = m_pDoc->getIDocumentMarkAccess(); - const IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findFirstBookmarkStartsAfter(rPos); - if(ppBkmk != pMarkAccess->getBookmarksEnd()) - return ppBkmk - pMarkAccess->getBookmarksBegin(); + const IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findFirstMarkNotStartsBefore(rPos); + if(ppBkmk != pMarkAccess->getAllMarksEnd()) + return ppBkmk - pMarkAccess->getAllMarksBegin(); return -1; } commit 4229a5f1996c648cdb038295d2f9b777832c924f Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Fri Feb 9 03:42:30 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:35:50 2024 +0100 Expat: upgrade to release 2.6.0 Fixes CVE-2023-52425 and CVE-2023-52426. Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> (cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit a0090efcb3dd8a55421993f91f4ee5ba769a34ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163396 Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/download.lst b/download.lst index 3a846afd408e..54c36e4ddbd0 100644 --- a/download.lst +++ b/download.lst @@ -106,8 +106,8 @@ ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -EXPAT_SHA256SUM := ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe -EXPAT_TARBALL := expat-2.5.0.tar.xz +EXPAT_SHA256SUM := cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e +EXPAT_TARBALL := expat-2.6.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/expat/0001-Fix-compiler-warnings.patch b/external/expat/0001-Fix-compiler-warnings.patch new file mode 100644 index 000000000000..adec5ed0d9be --- /dev/null +++ b/external/expat/0001-Fix-compiler-warnings.patch @@ -0,0 +1,47 @@ +From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001 +From: Taichi Haradaguchi <20001...@ymail.ne.jp> +Date: Fri, 9 Feb 2024 19:28:35 +0900 +Subject: [PATCH] Fix compiler warnings + +> In file included from ./../lib/internal.h:149, +> from codepage.c:38: +> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 [-Wundef] +> 1045 | #if XML_GE == 1 +> | ^~~~~~ +> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 [-Wundef] +> 158 | #if XML_GE == 1 +> | ^~~~~~ +--- + expat/lib/expat.h | 2 +- + expat/lib/internal.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/expat/lib/expat.h b/expat/lib/expat.h +index 95464b0d..79bbfb61 100644 +--- a/expat/lib/expat.h ++++ b/expat/lib/expat.h +@@ -1042,7 +1042,7 @@ typedef struct { + XMLPARSEAPI(const XML_Feature *) + XML_GetFeatureList(void); + +-#if XML_GE == 1 ++#if defined(XML_GE) && XML_GE == 1 + /* Added in Expat 2.4.0 for XML_DTD defined and + * added in Expat 2.6.0 for XML_GE == 1. */ + XMLPARSEAPI(XML_Bool) +diff --git a/expat/lib/internal.h b/expat/lib/internal.h +index cce71e4c..208c6b67 100644 +--- a/expat/lib/internal.h ++++ b/expat/lib/internal.h +@@ -155,7 +155,7 @@ extern "C" { + void _INTERNAL_trim_to_complete_utf8_characters(const char *from, + const char **fromLimRef); + +-#if XML_GE == 1 ++#if defined(XML_GE) && XML_GE == 1 + unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser); + unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser); + const char *unsignedCharToPrintable(unsigned char c); +-- +2.43.1 + diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 5d4f41f6d147..465105f2ca8c 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -13,7 +13,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools)) +# * external/expat/0001-Fix-compiler-warnings.patch was sent to upstream as +# <https://github.com/libexpat/libexpat/pull/819> "Fix compiler warnings": $(eval $(call gb_UnpackedTarball_add_patches,expat,\ + external/expat/0001-Fix-compiler-warnings.patch \ external/expat/expat-winapi.patch \ )) commit 721c55f84684185fa8e4000f13dd46f12560fd09 Author: Henry Castro <hcas...@collabora.com> AuthorDate: Mon Feb 5 12:29:40 2024 -0400 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:34:43 2024 +0100 tdf#158440: do not extend transparent color Avoid to extend the area of transparent colors. Signed-off-by: Henry Castro <hcas...@collabora.com> Change-Id: Ie492e6fea2c3d8b785cfbb96fe7cfc31d87b9996 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163030 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> (cherry picked from commit c44e12ddb952c78dd08aba1774863554d7ecc7fa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163023 Tested-by: Jenkins (cherry picked from commit 5a609bc2dc1d1b4c1b9215d9ac8f5f1ba0939569) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163028 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/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 3ec8dc5aeab7..a9637584f7df 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -1314,7 +1314,7 @@ void ScTable::GetBackColorArea(SCCOL& rStartCol, SCROW& /*rStartRow*/, const ScPatternAttr* pPattern = ColumnData(nCol).GetPattern(rEndRow + 1); const SvxBrushItem* pBackground = &pPattern->GetItem(ATTR_BACKGROUND); if (!pPattern->GetItem(ATTR_CONDITIONAL).GetCondFormatData().empty() || - pBackground != pDefBackground) + (pBackground->GetColor() != COL_TRANSPARENT && pBackground != pDefBackground)) { bExtend = true; break; commit acbf0d017b774e9779503f1aef943c6d7f88ec39 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Tue Feb 6 12:50:59 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:34:05 2024 +0100 tdf#159601, tdf#159594: reuse target for symbols' children Regression from e7186b49a9a0b24ddc3b1c5384b5d9facb03518c "tdf#158445: support viewBox in symbol elements" Change-Id: Ie2198c47149def17fa3cb612046b61bf32e873bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163046 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> (cherry picked from commit 8b7dbf40a06bc900562887889c17606ae5ef0587) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163015 Tested-by: Xisco Fauli <xiscofa...@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163127 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> (cherry picked from commit 81454c1c3a98860a82fa54fd3a417d3bcb72f8ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163276 Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index b485aa16e38c..661c1520a457 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -1597,9 +1597,24 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf158445) CPPUNIT_ASSERT (pDocument); - assertXPath(pDocument, "/primitive2D/transform/transform/transform/transform/polypolygoncolor", "color", "#000000"); - assertXPath(pDocument, "/primitive2D/transform/transform/transform/transform/polypolygoncolor/polypolygon", "height", "8.052"); - assertXPath(pDocument, "/primitive2D/transform/transform/transform/transform/polypolygoncolor/polypolygon", "width", "5.328"); + assertXPath(pDocument, "/primitive2D/transform/mask/transform/transform/transform/polypolygoncolor", "color", "#000000"); + assertXPath(pDocument, "/primitive2D/transform/mask/transform/transform/transform/polypolygoncolor/polypolygon", "height", "8.052"); + assertXPath(pDocument, "/primitive2D/transform/mask/transform/transform/transform/polypolygoncolor/polypolygon", "width", "5.328"); +} + +CPPUNIT_TEST_FIXTURE(Test, testTdf159594) +{ + Primitive2DSequence aSequence = parseSvg(u"/svgio/qa/cppunit/data/tdf159594.svg"); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength())); + + drawinglayer::Primitive2dXmlDump dumper; + xmlDocUniquePtr pDocument = dumper.dumpAndParse(Primitive2DContainer(aSequence)); + + CPPUNIT_ASSERT (pDocument); + + assertXPath(pDocument, "/primitive2D/transform/transform/polypolygoncolor", "color", "#000000"); + assertXPath(pDocument, "/primitive2D/transform/transform/polypolygoncolor/polypolygon", "height", "11.671875"); + assertXPath(pDocument, "/primitive2D/transform/transform/polypolygoncolor/polypolygon", "width", "7.5"); } CPPUNIT_TEST_FIXTURE(Test, testTdf97663) diff --git a/svgio/qa/cppunit/data/tdf159594.svg b/svgio/qa/cppunit/data/tdf159594.svg new file mode 100644 index 000000000000..c2b470ec0fdc --- /dev/null +++ b/svgio/qa/cppunit/data/tdf159594.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100" version="1.1"> +<symbol overflow="visible" id="glyph"> +<path style="stroke:none;" d="M 1.3125 -11.671875 L 8.8125 -11.671875 L 8.8125 -11 L 4.578125 0 L 2.9375 0 L 6.921875 -10.34375 L 1.3125 -10.34375 Z M 1.3125 -11.671875 "/> +</symbol> +<use xlink:href="#glyph" x="40" y="30"/> +</svg> diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx index b5125357f61c..222880d1cba2 100644 --- a/svgio/source/svgreader/svgsymbolnode.cxx +++ b/svgio/source/svgreader/svgsymbolnode.cxx @@ -126,12 +126,10 @@ namespace svgio::svgreader void SvgSymbolNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool bReferenced) const { - drawinglayer::primitive2d::Primitive2DContainer aNewTarget; - // decompose children - SvgNode::decomposeSvgNode(aNewTarget, bReferenced); + SvgNode::decomposeSvgNode(rTarget, bReferenced); - if(aNewTarget.empty()) + if (rTarget.empty()) return; if(getViewBox()) @@ -157,7 +155,7 @@ namespace svgio::svgreader const drawinglayer::primitive2d::Primitive2DReference xRef( new drawinglayer::primitive2d::TransformPrimitive2D( aEmbeddingTransform, - std::move(aNewTarget))); + drawinglayer::primitive2d::Primitive2DContainer(rTarget))); rTarget.push_back(xRef); } commit 0c77887e3f37dee9aa152d5fab8102fdd6112008 Author: Weblate <nore...@documentfoundation.org> AuthorDate: Thu Feb 15 18:37:11 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:32:07 2024 +0100 android-viewer translated using Weblate Galician currently translated at 100.0% (130 of 130 strings) Change-Id: Icca8eec8410852a90cfd98c08e95cab2edd08dd3 Co-authored-by: Xosé <xoseca...@gmail.com> Translate-URL: https://translations.documentfoundation.org/projects/android-viewer/android-strings-7-6/gl/ Translation: android-viewer/android-strings-7-6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163450 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> (cherry picked from commit 6005b136637e0ce61949d8dc50f64982f93eda63) diff --git a/android/source/res/values-gl/strings.xml b/android/source/res/values-gl/strings.xml index a6b3daec9354..9ab27dff53e7 100644 --- a/android/source/res/values-gl/strings.xml +++ b/android/source/res/values-gl/strings.xml @@ -1,2 +1,133 @@ <?xml version="1.0" encoding="utf-8"?> -<resources></resources> \ No newline at end of file +<resources> + <string name="app_name">Visor do LibreOffice</string> + <string name="app_name_settings">Configuración do visor do LibreOffice</string> + <string name="app_about_name"><b>«Beta» do Visor do LibreOffice</b></string> + <string name="app_version">Versión: %1$s<br>Identificador da construción: <a href=https://hub.libreoffice.org/git-core/%2$s>%2$s</a></string> + <string name="app_description">O Visor do LibreOffice é un visor de documentos baseado no LibreOffice.</string> + <string name="app_credits">https://www.libreoffice.org</string> + <string name="app_vendor">Esta versión foi fornecida por $VENDOR.</string> + <string name="readonly_file">Este ficheiro só permite lectura.</string> + <string name="about_license">Mostrar licenza</string> + <string name="about_notice">Mostrar aviso</string> + <string name="about_moreinfo">Máis información</string> + <string name="new_textdocument">Novo documento de texto</string> + <string name="new_spreadsheet">Nova folla de cálculo</string> + <string name="new_drawing">Novo debuxo</string> + <string name="default_document_name">sen título</string> + <string name="select_file_to_open">Seleccionar ficheiro para abrir</string> + <string name="browser_app_name">Navegador do LibreOffice</string> + <string name="menu_search">Buscar</string> + <string name="search_not_found">Non se atopou a expresión</string> + <string name="menu_preferences">Preferencias</string> + <string name="file_icon_desc">iconadeficheiro</string> + <string name="title_recents">Ficheiros recentes</string> + <string name="title_browser">Todos os ficheiros</string> + <string name="pref_category_general">Xeral</string> + <string name="pref_experimental_editing">Modo experimental</string> + <string name="pref_experimental_editing_summary">Activar o modo de edición experimental. Úseo baixo a súa responsabilidade.</string> + <string name="pref_developer_mode">Modo de desenvolvemento</string> + <string name="action_about">Sobre</string> + <string name="action_parts">Partes</string> + <string name="action_settings">Configuración</string> + <string name="action_bold">Grosa</string> + <string name="action_underline">Subliñado</string> + <string name="action_strikeout">Riscado</string> + <string name="action_keyboard">Mostrar teclado</string> + <string name="action_save">Gardar</string> + <string name="action_save_as">Gardar como...</string> + <string name="action_fromat">Activar formato</string> + <string name="action_search">Buscar</string> + <string name="action_UNO_commands">Enviar orde de UNO</string> + <string name="message_saved">Gardar completo</string> + <string name="message_saving">Gardar o documento…</string> + <string name="message_saving_failed">Fallou o gardado do documento.</string> + <string name="password">Contrasinal</string> + <string name="action_undo">Desfacer</string> + <string name="action_redo">Refacer</string> + <string name="save_document">GARDAR</string> + <string name="action_cancel">Cancelar</string> + <string name="no_save_document">NON</string> + <string name="action_presentation">Presentación de diapositivas</string> + <string name="action_add_slide">Engadir diapositiva</string> + <string name="alert_copy_svg_slide_show_to_clipboard_dismiss">Aceptar</string> + <string name="slideshow_action_back">Atrás</string> + <string name="calc_insert_before">Inserir</string> + <string name="calc_delete">Eliminar</string> + <string name="calc_hide">Agochar</string> + <string name="calc_show">Mostrar</string> + <string name="calc_optimal_length">Lonxitude ideal</string> + <string name="calc_adjust_length">Axustar lonxitude</string> + <string name="calc_adjust_height">Axustar altura</string> + <string name="calc_adjust_width">Axustar largura</string> + <string name="calc_optimal_height">Altura ideal</string> + <string name="calc_optimal_width">Largura ideal</string> + <string name="calc_optimal_length_confirm">Aceptar</string> + <string name="calc_optimal_length_default_text">Introduza lonxitude extra en centésimas de milímetro</string> + <string name="calc_alert_double_click_optimal_length">Suxestión: Tocar dúas veces nunha cabeceira estabelece a largura/altura ideais.</string> + <string name="action_pwd_dialog_OK">Aceptar</string> + <string name="action_pwd_dialog_cancel">Cancelar</string> + <string name="action_pwd_dialog_title">Introduza contrasinal</string> + <string name="select_photo">Seleccionar foto</string> + <string name="select_photo_title">Seleccionar imaxe</string> + <string name="no_camera_found">Non se atopou ningunha cámara</string> + <string name="compress_photo_smallest_size">Tamaño menor</string> + <string name="compress_photo_medium_size">Tamaño mediano</string> + <string name="compress_photo_max_quality">Calidade máxima</string> + <string name="compress_photo_no_compress">Non comprimir</string> + <string name="compress_photo_title">Desexa comprimir a foto?</string> + <string name="action_copy">Copiar</string> + <string name="action_paste">Pegar</string> + <string name="action_cut">Cortar</string> + <string name="action_back">Atrás</string> + <string name="insert_table">Inserir táboa</string> + <string name="select_insert_options">Seleccionar opcións de inserción:</string> + <string name="select_delete_options">Seleccionar opcións de eliminación:</string> + <string name="action_rename_worksheet">Renomear folla de cálculo</string> + <string name="action_delete_slide">Eliminar diapositiva</string> + <string name="name_already_used">O nome dado xa está en uso.</string> + <string name="part_name_changed">O nome da parte cambiou.</string> + <string name="part_deleted">A parte foi eliminada.</string> + <string name="UNO_commands_string_hint">Orde de UNO</string> + <string name="UNO_commands_string_type_hint">Tipo</string> + <string name="UNO_commands_string_value_hint">Valor</string> + <string name="UNO_commands_string_parent_value_hint">Valor superior</string> + <string name="action_exportToPDF">Exportar a PDF</string> + <string name="action_print">Imprimir</string> + <string name="tabhost_character">Carácter</string> + <string name="tabhost_paragraph">Parágrafo</string> + <string name="tabhost_insert">Inserir</string> + <string name="tabhost_style">Estilo</string> + <string name="alert_ok">Aceptar</string> + <string name="alert_cancel">Cancelar</string> + <string name="unable_to_go_further">Non foi posíbel ir máis lonxe.</string> + <string name="current_uno_command">Orde de UNO actual</string> + <string name="display_language">Idioma para mostrar</string> + <string name="display_language_summary">Configurar o idioma predeterminado</string> + <string name="pdf_export_finished">Rematou a exportación a PDF</string> + <string name="unable_to_save">Non foi posíbel gardar o ficheiro</string> + <string name="printing_not_supported">Este dispositivo non admite a impresión.</string> + <string name="error">Erro</string> + <string name="enter_part_name">Introduza un nome da parte</string> + <string name="bmp_null">BMP é nulo!</string> + <string name="directory_not_saved">Directorio non gardado.</string> + <string name="page">Páxina</string> + <string name="sheet">Folla</string> + <string name="slide">Diapositiva</string> + <string name="part">Parte</string> + <string name="highlight_color">Cor de realce</string> + <string name="font_color">Cor do tipo de letra</string> + <string name="action_rename_slide">Renomear diapositiva</string> + <string name="automatic">Automático</string> + <string name="new_presentation">Nova presentación</string> + <string name="pref_developer_mode_summary">Activar modo de desenvolvemento, no que se poden enviar ordes de UNO dentro da app. Úseo baixo a súa responsabilidade.</string> + <string name="action_italic">Cursiva</string> + <string name="message_save_incomplete">Gardado incompleto. Había algún cambio?</string> + <string name="save_alert_dialog_title">Gardar o documento antes de pechar?</string> + <string name="alert_copy_svg_slide_show_to_clipboard">O dispositivo Android non admite presentacións con svg dentro da app. Copiamos a ligazón á presentación no portapapeis. Prema no botón de inicio, abra un navegador web moderno, pegue na barra de enderezos e vaia.</string> + <string name="action_add_worksheet">Engadir folla de cálculo</string> + <string name="take_photo">Tirar foto</string> + <string name="action_text_copied">Texto copiado ao portapapeis</string> + <string name="action_delete_worksheet">Eliminar folla de cálculo</string> + <string name="unable_to_export_pdf">Non foi posíbel exportar a pdf</string> +</resources> \ No newline at end of file commit 369b14eb59cf8627b8db9c2389d5b83ebd990a33 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Feb 15 21:29:00 2024 +0100 Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org> CommitDate: Thu Feb 15 21:29:00 2024 +0100 Update git submodules * Update translations from branch 'libreoffice-7-6-5' to 7acada566d34b6c5e0274de3d0ff8c57bce04277 - update translations for 7.6.5 rc2 and force-fix errors using pocheck Change-Id: Ie92e7273a69b81df9bdcc4f7f08a7443fd2f6144 (cherry picked from commit 36885fbc6d49abbdb55f6ef9728ef5f49f61c8af) diff --git a/translations b/translations index ed27eac63736..7acada566d34 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ed27eac63736da312d904dd15cc4187d8b0bdd71 +Subproject commit 7acada566d34b6c5e0274de3d0ff8c57bce04277 commit 7d00f378c99976ef561015c39af554e06a0cb9ad Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Thu Feb 15 21:13:33 2024 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Thu Feb 15 21:16:29 2024 +0100 update credits Change-Id: I8c189f3708898087560255fbf353ac88e1dad432 (cherry picked from commit a21fb5bd8896ee8b82adf21f3e00cecaa521052f) (cherry picked from commit d726eead5d3b097337c2358c820e96c83ba9f401) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e552e56da725..0f8f80089fda 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/7.6.4.1$Linux_X86_64 LibreOffice_project/e19e193f88cd6c0525a17fb7a176ed8e6a3e2aa1</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="4861" meta:word-count="18149" meta:character-count="131337" meta:non-whitespace-character-count="115194"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta> + <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/24.2.1.1$Linux_X86_64 LibreOffice_project/359ef544e625d2ffbfced462ab37bd593ca85fa7</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="4877" meta:word-count="18215" meta:character-count="131815" meta:non-whitespace-character-count="115613"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta> <office:settings> <config:config-item-set config:name="ooo:view-settings"> - <config:config-item config:name="ViewAreaTop" config:type="long">1169</config:config-item> + <config:config-item config:name="ViewAreaTop" config:type="long">2794</config:config-item> <config:config-item config:name="ViewAreaLeft" config:type="long">501</config:config-item> <config:config-item config:name="ViewAreaWidth" config:type="long">55167</config:config-item> - <config:config-item config:name="ViewAreaHeight" config:type="long">26989</config:config-item> + <config:config-item config:name="ViewAreaHeight" config:type="long">25904</config:config-item> <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item> <config:config-item config:name="InBrowseMode" config:type="boolean">true</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view2</config:config-item> - <config:config-item config:name="ViewLeft" config:type="long">3649</config:config-item> + <config:config-item config:name="ViewLeft" config:type="long">3623</config:config-item> <config:config-item config:name="ViewTop" config:type="long">3434</config:config-item> <config:config-item config:name="VisibleLeft" config:type="long">501</config:config-item> - <config:config-item config:name="VisibleTop" config:type="long">1169</config:config-item> + <config:config-item config:name="VisibleTop" config:type="long">2794</config:config-item> <config:config-item config:name="VisibleRight" config:type="long">55667</config:config-item> - <config:config-item config:name="VisibleBottom" config:type="long">28157</config:config-item> + <config:config-item config:name="VisibleBottom" config:type="long">28697</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item> <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item> @@ -33,46 +33,59 @@ </config:config-item-map-indexed> </config:config-item-set> <config:config-item-set config:name="ooo:configuration-settings"> - <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item> <config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintFaxName" config:type="string"/> + <config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item> + <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item> <config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item> - <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">false</config:config-item> - <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">false</config:config-item> - <config:config-item config:name="ProtectBookmarks" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item> + <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item> + <config:config-item config:name="HyphenateURLs" config:type="boolean">true</config:config-item> + <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item> + <config:config-item config:name="FootnoteInColumnToPageEnd" config:type="boolean">true</config:config-item> + <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item> <config:config-item config:name="ContinuousEndnotes" config:type="boolean">false</config:config-item> - <config:config-item config:name="DisableOffPagePositioning" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item> + <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item> <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">true</config:config-item> - <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintFaxName" config:type="string"/> <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item> <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item> - <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">false</config:config-item> <config:config-item config:name="TabOverSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="AutoFirstLineIndentDisregardLineSpace" config:type="boolean">false</config:config-item> <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item> <config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item> - <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item> - <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item> <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item> - <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item> - <config:config-item config:name="FrameAutowidthWithMorePara" config:type="boolean">false</config:config-item> - <config:config-item config:name="FloattableNomargins" config:type="boolean">false</config:config-item> - <config:config-item config:name="UnbreakableNumberings" config:type="boolean">false</config:config-item> + <config:config-item config:name="DisableOffPagePositioning" config:type="boolean">true</config:config-item> + <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item> + <config:config-item config:name="TabOverflow" config:type="boolean">false</config:config-item> <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item> - <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item> - <config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item> + <config:config-item config:name="ProtectBookmarks" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item> + <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item> + <config:config-item config:name="JustifyLinesWithShrinking" config:type="boolean">false</config:config-item> <config:config-item config:name="RsidRoot" config:type="int">1557161</config:config-item> - <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item> + <config:config-item config:name="CollapseEmptyCellPara" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/> <config:config-item config:name="CurrentDatabaseDataSource" config:type="string">Adressen</config:config-item> - <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item> - <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item> + <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item> + <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> + <config:config-item config:name="UnbreakableNumberings" config:type="boolean">false</config:config-item> + <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> + <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">hu</config:config-item> @@ -82,73 +95,62 @@ <config:config-item config:name="EndLine" config:type="string"/> </config:config-item-map-entry> </config:config-item-map-indexed> - <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item> - <config:config-item config:name="Rsid" config:type="int">13054093</config:config-item> - <config:config-item config:name="FootnoteInColumnToPageEnd" config:type="boolean">true</config:config-item> - <config:config-item config:name="ProtectFields" config:type="boolean">false</config:config-item> - <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item> - <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item> - <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item> - <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item> - <config:config-item config:name="EmbedSystemFonts" config:type="boolean">false</config:config-item> - <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item> - <config:config-item config:name="AddParaLineSpacingToTableCells" config:type="boolean">false</config:config-item> - <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item> - <config:config-item config:name="HyphenateURLs" config:type="boolean">true</config:config-item> - <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> - <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item> + <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> + <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item> + <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item> <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> + <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">false</config:config-item> + <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item> + <config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item> + <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item> + <config:config-item config:name="HeaderSpacingBelowLastPara" config:type="boolean">false</config:config-item> <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item> - <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item> - <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> - <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">true</config:config-item> - <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item> - <config:config-item config:name="DropCapPunctuation" config:type="boolean">false</config:config-item> + <config:config-item config:name="ClippedPictures" config:type="boolean">false</config:config-item> <config:config-item config:name="MathBaselineAlignment" config:type="boolean">false</config:config-item> + <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item> + <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item> <config:config-item config:name="PrinterName" config:type="string"/> - <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> - <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item> - <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddParaLineSpacingToTableCells" config:type="boolean">false</config:config-item> <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item> - <config:config-item config:name="TabOverflow" config:type="boolean">false</config:config-item> - <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item> - <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item> - <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item> + <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item> + <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> + <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> + <config:config-item config:name="UseVariableWidthNBSP" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> - <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item> - <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item> - <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item> - <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/> - <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item> - <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item> - <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item> + <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> + <config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="ProtectFields" config:type="boolean">false</config:config-item> + <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item> + <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item> + <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item> + <config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item> + <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item> <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item> - <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> - <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item> - <config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item> - <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item> + <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item> + <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item> + <config:config-item config:name="NoGapAfterNoteNumber" config:type="boolean">false</config:config-item> <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">false</config:config-item> - <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item> - <config:config-item config:name="NoNumberingShowFollowBy" config:type="boolean">false</config:config-item> - <config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item> + <config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item> <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" config:type="boolean">false</config:config-item> - <config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item> - <config:config-item config:name="GutterAtTop" config:type="boolean">false</config:config-item> - <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item> - <config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item> + <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item> + <config:config-item config:name="DropCapPunctuation" config:type="boolean">false</config:config-item> <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item> - <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item> - <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item> - <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> - <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/> - <config:config-item config:name="CollapseEmptyCellPara" config:type="boolean">true</config:config-item> + <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/> + <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item> + <config:config-item config:name="Rsid" config:type="int">13088230</config:config-item> + <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item> + <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item> + <config:config-item config:name="MsWordCompMinLineHeightByFly" config:type="boolean">false</config:config-item> + <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">true</config:config-item> </config:config-item-set> </office:settings> <office:scripts> @@ -174,7 +176,7 @@ <office:styles> <style:default-style style:family="graphic"> <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb" style:flow-with-text="true"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false"> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> <style:tab-stops/> </style:paragraph-properties> <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Mangal1" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/> @@ -368,37 +370,40 @@ </office:styles> <office:automatic-styles> <style:style style:name="Tabelle1" style:family="table"> - <style:table-properties style:width="26.651cm" table:align="left"/> + <style:table-properties style:width="26.28cm" table:align="left"/> </style:style> <style:style style:name="Tabelle1.A" style:family="table-column"> - <style:table-column-properties style:column-width="6.854cm"/> + <style:table-column-properties style:column-width="6.061cm"/> </style:style> <style:style style:name="Tabelle1.B" style:family="table-column"> - <style:table-column-properties style:column-width="6.749cm"/> + <style:table-column-properties style:column-width="6.802cm"/> + </style:style> + <style:style style:name="Tabelle1.C" style:family="table-column"> + <style:table-column-properties style:column-width="6.643cm"/> </style:style> <style:style style:name="Tabelle1.D" style:family="table-column"> - <style:table-column-properties style:column-width="6.299cm"/> + <style:table-column-properties style:column-width="6.775cm"/> </style:style> <style:style style:name="Tabelle1.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> </style:style> - <style:style style:name="Tabelle1.D449" style:family="table-cell"> + <style:style style:name="Tabelle1.C451" style:family="table-cell"> <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> </style:style> <style:style style:name="Tabelle2" style:family="table"> - <style:table-properties style:width="18.29cm" table:align="left"/> + <style:table-properties style:width="18.078cm" table:align="left"/> </style:style> <style:style style:name="Tabelle2.A" style:family="table-column"> <style:table-column-properties style:column-width="4.235cm"/> </style:style> <style:style style:name="Tabelle2.B" style:family="table-column"> - <style:table-column-properties style:column-width="4.817cm"/> + <style:table-column-properties style:column-width="4.738cm"/> </style:style> <style:style style:name="Tabelle2.C" style:family="table-column"> - <style:table-column-properties style:column-width="3.865cm"/> + <style:table-column-properties style:column-width="3.812cm"/> </style:style> <style:style style:name="Tabelle2.D" style:family="table-column"> - <style:table-column-properties style:column-width="5.373cm"/> + <style:table-column-properties style:column-width="5.293cm"/> </style:style> <style:style style:name="Tabelle2.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> @@ -407,19 +412,19 @@ <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> </style:style> <style:style style:name="Tabelle3" style:family="table"> - <style:table-properties style:width="17.999cm" table:align="left"/> + <style:table-properties style:width="17.708cm" table:align="left"/> </style:style> <style:style style:name="Tabelle3.A" style:family="table-column"> - <style:table-column-properties style:column-width="3.865cm"/> + <style:table-column-properties style:column-width="3.785cm"/> </style:style> <style:style style:name="Tabelle3.B" style:family="table-column"> - <style:table-column-properties style:column-width="3.838cm"/> + <style:table-column-properties style:column-width="3.759cm"/> </style:style> <style:style style:name="Tabelle3.C" style:family="table-column"> - <style:table-column-properties style:column-width="6.193cm"/> + <style:table-column-properties style:column-width="6.14cm"/> </style:style> <style:style style:name="Tabelle3.D" style:family="table-column"> - <style:table-column-properties style:column-width="4.103cm"/> + <style:table-column-properties style:column-width="4.023cm"/> </style:style> <style:style style:name="Tabelle3.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> @@ -428,16 +433,16 @@ <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> </style:style> <style:style style:name="Tabelle4" style:family="table"> - <style:table-properties style:width="17.02cm" table:align="left"/> + <style:table-properties style:width="16.755cm" table:align="left"/> </style:style> <style:style style:name="Tabelle4.A" style:family="table-column"> - <style:table-column-properties style:column-width="3.918cm"/> + <style:table-column-properties style:column-width="3.838cm"/> </style:style> <style:style style:name="Tabelle4.B" style:family="table-column"> - <style:table-column-properties style:column-width="4.897cm"/> + <style:table-column-properties style:column-width="4.844cm"/> </style:style> <style:style style:name="Tabelle4.C" style:family="table-column"> - <style:table-column-properties style:column-width="4.288cm"/> + <style:table-column-properties style:column-width="4.235cm"/> </style:style> <style:style style:name="Tabelle4.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> @@ -446,26 +451,23 @@ <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> </style:style> <style:style style:name="Tabelle5" style:family="table"> - <style:table-properties style:width="33.503cm" table:align="left"/> + <style:table-properties style:width="32.683cm" table:align="left"/> </style:style> <style:style style:name="Tabelle5.A" style:family="table-column"> - <style:table-column-properties style:column-width="8.098cm"/> + <style:table-column-properties style:column-width="6.722cm"/> </style:style> <style:style style:name="Tabelle5.B" style:family="table-column"> - <style:table-column-properties style:column-width="6.669cm"/> + <style:table-column-properties style:column-width="7.966cm"/> </style:style> <style:style style:name="Tabelle5.C" style:family="table-column"> - <style:table-column-properties style:column-width="11.829cm"/> + <style:table-column-properties style:column-width="6.219cm"/> </style:style> <style:style style:name="Tabelle5.D" style:family="table-column"> - <style:table-column-properties style:column-width="6.907cm"/> + <style:table-column-properties style:column-width="11.776cm"/> </style:style> <style:style style:name="Tabelle5.A1" style:family="table-cell"> <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/> </style:style> - <style:style style:name="Tabelle5.D720" style:family="table-cell"> - <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/> - </style:style> <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents"> <style:text-properties fo:font-size="2pt" style:font-size-asian="2pt" style:font-size-complex="2pt"/> </style:style> @@ -582,7 +584,7 @@ </style:style> <style:style style:name="P35" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L1"/> <style:style style:name="P36" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L1"> - <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> + <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:text-indent="0cm" style:auto-text-indent="false"/> </style:style> <style:style style:name="P37" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L2"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> @@ -1161,19 +1163,20 @@ </draw:frame> <text:section text:style-name="Sect1" text:name="BgContainer"> <text:p text:style-name="P32">Credits</text:p> - <text:p text:style-name="Text_20_body">1925 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-01-25 15:39:24.</text:p> + <text:p text:style-name="Text_20_body">1932 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-02-15 16:28:21.</text:p> <text:p text:style-name="Text_20_body"><text:span text:style-name="T1">*</text:span> marks developers whose first contributions happened after 2010-09-28.</text:p> <text:h text:style-name="Heading_20_2" text:outline-level="2">Developers committing code since 2010-09-28</text:h> <table:table table:name="Tabelle1" table:style-name="Tabelle1"> <table:table-column table:style-name="Tabelle1.A"/> - <table:table-column table:style-name="Tabelle1.B" table:number-columns-repeated="2"/> + <table:table-column table:style-name="Tabelle1.B"/> + <table:table-column table:style-name="Tabelle1.C"/> <table:table-column table:style-name="Tabelle1.D"/> <table:table-row> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Ruediger Timm<text:line-break/>Commits: 82464<text:line-break/>Joined: 2000-10-10</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 35094<text:line-break/>Joined: 2000-10-10</text:p> + <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 35170<text:line-break/>Joined: 2000-10-10</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Kurt Zenker<text:line-break/>Commits: 31752<text:line-break/>Joined: 2000-09-25</text:p> @@ -1190,15 +1193,15 @@ <text:p text:style-name="Table_20_Contents">Vladimir Glazunov<text:line-break/>Commits: 25434<text:line-break/>Joined: 2000-12-04</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 20961<text:line-break/>Joined: 2000-10-04</text:p> + <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 21011<text:line-break/>Joined: 2000-10-04</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 18265<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 18332<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p> </table:table-cell> </table:table-row> <table:table-row> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 9826<text:line-break/>Joined: 2010-07-29</text:p> + <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 9854<text:line-break/>Joined: 2010-07-29</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Ivo Hinkelmann<text:line-break/>Commits: 9480<text:line-break/>Joined: 2002-09-09</text:p> @@ -1207,7 +1210,7 @@ <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 9160<text:line-break/>Joined: 2010-03-23</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 8410<text:line-break/>Joined: 2008-06-16</text:p> + <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 8433<text:line-break/>Joined: 2008-06-16</text:p> </table:table-cell> </table:table-row> <table:table-row> @@ -1226,16 +1229,16 @@ </table:table-row> <table:table-row> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 3851<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 3856<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 3816<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-30</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 3837<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-30</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3648<text:line-break/>Joined: 2009-11-12</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 3412<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 3425<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p> </table:table-cell> </table:table-row> <table:table-row> @@ -1243,7 +1246,7 @@ <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 3201<text:line-break/>Joined: 2010-09-21</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 3140<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 3177<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Hans-Joachim Lankenau<text:line-break/>Commits: 3007<text:line-break/>Joined: 2000-09-19</text:p> @@ -1254,7 +1257,7 @@ </table:table-row> <table:table-row> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Xisco Fauli<text:line-break/>Commits: 2730<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Xisco Fauli<text:line-break/>Commits: 2752<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2672<text:line-break/>Joined: 2009-06-23</text:p> @@ -1263,12 +1266,12 @@ <text:p text:style-name="Table_20_Contents">Mathias Bauer<text:line-break/>Commits: 2580<text:line-break/>Joined: 2000-09-20</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Oliver Specht<text:line-break/>Commits: 2563<text:line-break/>Joined: 2000-09-21</text:p> + <text:p text:style-name="Table_20_Contents">Oliver Specht<text:line-break/>Commits: 2571<text:line-break/>Joined: 2000-09-21</text:p> </table:table-cell> </table:table-row> <table:table-row> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2499<text:line-break/>Joined: 2004-08-05</text:p> + <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2501<text:line-break/>Joined: 2004-08-05</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2493<text:line-break/>Joined: 2009-10-14</text:p> @@ -1285,7 +1288,7 @@ <text:p text:style-name="Table_20_Contents">Philipp Lohmann [pl]<text:line-break/>Commits: 2089<text:line-break/>Joined: 2000-09-21</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 2050<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 2053<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 2007<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-02</text:span></text:p> @@ -1299,7 +1302,7 @@ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matúš Kukan<text:line-break/>Commits: 1712<text:line-break/>Joined: <text:span text:style-name="T2">2011-04-06</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Armin Le Grand (allotropia)<text:line-break/>Commits: 1667<text:line-break/>Joined: 2000-09-25</text:p> + <text:p text:style-name="Table_20_Contents">Armin Le Grand (allotropia)<text:line-break/>Commits: 1670<text:line-break/>Joined: 2000-09-25</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1486<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p> @@ -1327,10 +1330,10 @@ <text:p text:style-name="Table_20_Contents">Niklas Nebel<text:line-break/>Commits: 1296<text:line-break/>Joined: 2000-09-19</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 1258<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 1266<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Szymon Kłos<text:line-break/>Commits: 1245<text:line-break/>Joined: <text:span text:style-name="T2">2014-03-22</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Szymon Kłos<text:line-break/>Commits: 1251<text:line-break/>Joined: <text:span text:style-name="T2">2014-03-22</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 1232<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p> @@ -1347,18 +1350,18 @@ <text:p text:style-name="Table_20_Contents">Daniel Rentz [dr]<text:line-break/>Commits: 1206<text:line-break/>Joined: 2000-09-28</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 1185<text:line-break/>Joined: 2008-06-01</text:p> + <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 1189<text:line-break/>Joined: 2008-06-01</text:p> </table:table-cell> </table:table-row> <table:table-row> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Gabor Kelemen<text:line-break/>Commits: 1157<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-18</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Gabor Kelemen<text:line-break/>Commits: 1160<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-18</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Lionel Elie Mamane<text:line-break/>Commits: 1051<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-15</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Michael Weghorn<text:line-break/>Commits: 1071<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-10</text:span></text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Michael Weghorn<text:line-break/>Commits: 1051<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-10</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Lionel Elie Mamane<text:line-break/>Commits: 1051<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-15</text:span></text:p> </table:table-cell> -e ... etc. - the rest is truncated