chart2/qa/extras/chart2import.cxx | 22 chart2/qa/extras/data/docx/tdf139658.docx |binary chart2/source/tools/InternalDataProvider.cxx | 12 config_host/config_firebird.h.in | 2 configure.ac | 6 dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk | 70 dbaccess/CppunitTest_dbaccess_firebird_test.mk | 18 dbaccess/Module_dbaccess.mk | 6 dbaccess/qa/unit/firebird-regression.cxx | 106 dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml | 2 dev/null |binary emfio/source/reader/emfreader.cxx | 33 filter/source/graphicfilter/ipsd/ipsd.cxx | 9 framework/dtd/accelerator.dtd | 1 framework/dtd/event.dtd | 1 framework/dtd/groupuinames.dtd | 1 framework/dtd/image.dtd | 1 framework/dtd/menubar.dtd | 1 framework/dtd/statusbar.dtd | 1 framework/dtd/toolbar.dtd | 1 i18npool/source/localedata/data/locale.dtd | 1 include/vcl/RawBitmap.hxx | 6 officecfg/registry/component-schema.dtd | 1 officecfg/registry/component-update.dtd | 1 oox/source/drawingml/chart/axisconverter.cxx | 10 package/dtd/Manifest.dtd | 1 readlicense_oo/license/CREDITS.fodt | 3876 +++++++------- sc/source/ui/Accessibility/AccessibleEditObject.cxx | 9 sc/source/ui/app/inputwin.cxx | 2 sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 45 sc/source/ui/inc/AccessibleEditObject.hxx | 8 sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 sd/source/ui/view/Outliner.cxx | 12 sw/qa/extras/layout/data/tdf122225.docx |binary sw/qa/extras/layout/layout2.cxx | 16 sw/source/uibase/shells/tabsh.cxx | 16 xmerge/source/xmerge/converter.dtd | 1 xmloff/dtd/office.dtd | 1 xmlscript/dtd/dialog.dtd | 1 xmlscript/dtd/libraries.dtd | 2 xmlscript/dtd/library.dtd | 2 xmlscript/dtd/module.dtd | 2 42 files changed, 2129 insertions(+), 2179 deletions(-)
New commits: commit d862d1f246a8ba7cfb6705103f3b493bdd3e9a24 Author: Tünde Tóth <[email protected]> AuthorDate: Wed Jun 2 11:51:13 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:32 2021 +0200 tdf#140623 Chart OOXML import: set text overlap to false of category axis label unless the rotation is 0 in xml. Regression from commit: 21620f9d2f50e66dffc45a5afb539edb8d54434c (tdf#138194 Chart OOXML import: set text break to true) Change-Id: I18db7483f49c84a83760200037f8858a3b471994 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116575 Tested-by: László Németh <[email protected]> Reviewed-by: László Németh <[email protected]> (cherry picked from commit 6185d1ff0130b3d178d5e50eeb6944ab70db41f9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116905 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 1a8e23024612..7aa141c0f798 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -271,10 +271,12 @@ void AxisConverter::convertFromModel(const Reference<XCoordinateSystem>& rxCoord } else { - // do not overlap text when the rotation is undefined in xml - bool bTextOverlap - = mrModel.mxTextProp.is() - && mrModel.mxTextProp->getTextProperties().moRotation.has(); + // do not overlap text unless the rotation is 0 in xml + bool bTextOverlap = false; + if (mrModel.mxTextProp.is() + && mrModel.mxTextProp->getTextProperties().moRotation.has()) + bTextOverlap + = mrModel.mxTextProp->getTextProperties().moRotation.get() == 0; aAxisProp.setProperty(PROP_TextOverlap, bTextOverlap); /* do not break text into several lines unless the rotation is 0 degree, or the rotation is 90 degree and the inner size of the chart is not fixed, diff --git a/sw/qa/extras/layout/data/tdf122225.docx b/sw/qa/extras/layout/data/tdf122225.docx index 2b2b24a5548d..e4f0cc35f0e8 100644 Binary files a/sw/qa/extras/layout/data/tdf122225.docx and b/sw/qa/extras/layout/data/tdf122225.docx differ diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx index 9894ceac418c..4202e7db087b 100644 --- a/sw/qa/extras/layout/layout2.cxx +++ b/sw/qa/extras/layout/layout2.cxx @@ -380,7 +380,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf131707) assertXPath(pXmlDoc, "//body/tab/row[3]/cell[2]/txt/anchored/fly/infos/bounds", "top", "2185"); } -#if HAVE_MORE_FONTS CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122225) { SwDoc* pDoc = createDoc("tdf122225.docx"); @@ -392,12 +391,19 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf122225) xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile); CPPUNIT_ASSERT(pXmlDoc); - assertXPathContent(pXmlDoc, - "/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[8]/text", - "Advanced Diploma"); + // Bug 122225 - FILEOPEN DOCX Textbox of Column chart legend reduces and text of legend disappears + const sal_Int32 nLegendLabelLines + = getXPathContent(pXmlDoc, "count(//text[contains(text(),\"Advanced Diploma\")])") + .toInt32(); // This failed, if the legend label is not "Advanced Diploma". + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nLegendLabelLines); + + // Bug 140623 - Fileopen DOCX: Text Orientation of X-Axis 0 instead of 45 degrees + const sal_Int32 nThirdLabelLines + = getXPathContent(pXmlDoc, "count(//text[contains(text(),\"Hispanic\")])").toInt32(); + // This failed, if the third X axis label broke to multiple lines. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nThirdLabelLines); } -#endif CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf125335) { commit 304aecc99f8d2400eb956116832c3598f9ef7fa6 Author: Bartosz Kosiorek <[email protected]> AuthorDate: Thu Jun 10 15:54:38 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:32 2021 +0200 EMF tdf#142745 Improve performance of FILLRGN, PAINTRGN, EXTSELECTCLIPRGN With previous implementation, during reading of rectangles the optimizations were made after reading every single rectangle. This was causing performance issues, with many rectangles (eg. 2500 rectangles). With this commit, the optimization is made after reading all rectangles. It is improving performance of FILLRGN, PAINTRGN and EXTSELECTCLIPRGN records. Change-Id: I1b8b844efddd08e9bf6f6726c3fdf213a629883f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116996 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117022 diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 2ef29fd98dcc..144cab9f0021 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -16,7 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include <basegfx/polygon/b2dpolygontools.hxx> +#include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <emfreader.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> @@ -327,7 +328,7 @@ SvStream& operator>>(SvStream& rInStream, BLENDFUNCTION& rBlendFun) return rInStream; } -bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) +bool ImplReadRegion( basegfx::B2DPolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) { if (nLen < 32) // 32 bytes - Size of RegionDataHeader return false; @@ -348,7 +349,7 @@ bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt3 if (!rStream.good() || nCountRects == 0 || nType != RDH_RECTANGLES) return false; - SAL_INFO("emfio", "\t\tLeft: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom); + SAL_INFO("emfio", "\t\tBounds Left: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom); nLen -= 32; @@ -364,11 +365,12 @@ bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt3 rStream.ReadInt32(nTop); rStream.ReadInt32(nRight); rStream.ReadInt32(nBottom); - - SAL_INFO("emfio", "\t\tLeft: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom); - tools::PolyPolygon aPolyPolyOr1(tools::Polygon(tools::Rectangle(nLeft, nTop, nRight, nBottom))); - rPolyPoly.GetUnion(aPolyPolyOr1, rPolyPoly); + rPolyPoly.append( basegfx::utils::createPolygonFromRect( ::basegfx::B2DRectangle( nLeft, nTop, nRight, nBottom ) ) ); + SAL_INFO("emfio", "\t\t" << i << " Left: " << nLeft << ", top: " << nTop << ", right: " << nRight << ", bottom: " << nBottom); } + rPolyPoly = basegfx::utils::solveCrossovers(rPolyPoly); + rPolyPoly = basegfx::utils::stripNeutralPolygons(rPolyPoly); + rPolyPoly = basegfx::utils::stripDispensablePolygons(rPolyPoly); return true; } @@ -1453,10 +1455,11 @@ namespace emfio } else { - tools::PolyPolygon aPolyPoly; + basegfx::B2DPolyPolygon aPolyPoly; if (cbRgnData) ImplReadRegion(aPolyPoly, *mpInputStream, nRemainingRecSize); - SetClipPath(aPolyPoly, nClippingMode, false); + const tools::PolyPolygon aPolyPolygon(aPolyPoly); + SetClipPath(aPolyPolygon, nClippingMode, false); } } } @@ -1934,7 +1937,7 @@ namespace emfio else { sal_uInt32 nRgnDataSize; - tools::PolyPolygon aPolyPoly; + basegfx::B2DPolyPolygon aPolyPoly; mpInputStream->SeekRel(16); // RectL bounds mpInputStream->ReadUInt32( nRgnDataSize ).ReadUInt32( nIndex ); nRemainingRecSize -= 24; @@ -1943,7 +1946,8 @@ namespace emfio { Push(); SelectObject( nIndex ); - DrawPolyPolygon( aPolyPoly ); + tools::PolyPolygon aPolyPolygon(aPolyPoly); + DrawPolyPolygon( aPolyPolygon ); Pop(); } } @@ -1958,13 +1962,16 @@ namespace emfio else { sal_uInt32 nRgnDataSize; - tools::PolyPolygon aPolyPoly; + basegfx::B2DPolyPolygon aPolyPoly; mpInputStream->SeekRel(16); // Skipping RectL bounds mpInputStream->ReadUInt32( nRgnDataSize ); nRemainingRecSize -= 20; if (ImplReadRegion(aPolyPoly, *mpInputStream, nRemainingRecSize)) - DrawPolyPolygon( aPolyPoly ); + { + tools::PolyPolygon aPolyPolygon(aPolyPoly); + DrawPolyPolygon( aPolyPolygon ); + } } } break; commit 539e6cdbcdea84c9dfd5f213d6765dc855aa52e4 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jun 9 16:55:14 2021 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:31 2021 +0200 tdf#142721 restore SwShellTableCursor if the orig selection was a single cell where the previous attempt of commit 4d52d2bc81f9d27472fe368785912a530489d046 tdf#142165 restore a SwShellTableCursor if the orig selection described that so that we are operating on the same selection that existed when the dialog was originally launched wasn't sufficient to restore a single cell selection. we continue to need to avoid the assert of commit 6db71f70a3b200d4074f6cda8ce445e9861d3296 tdf#140977 drop possible table-cursor before setting the new one and support the multi-selection of commit e08b446e46f56e15af58fdd4396afba1a316f9e5 tdf#140257 duplicate entire PaM ring when making copy and support not scrolling to a different location on changing a table page break style of commit 9c61732677d038e32b73fc9fb883aced14c0febf tdf#135916 just set the target table as selection and keep making it possible to remove a page break on a table of commit 81f91196b98af38e29af451b86c26a893a109abc tdf#135636 the selection at dialog-launch time is lost by dialog-apply time all of which is necessitated by commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98 lokdialog: Convert the Table -> Properties... to async exec. Though; since 4d52d2bc81f9d27472fe368785912a530489d046 where we started using rSh.GetTableCrs if IsTableMode() then in practice 6db71f70a3b200d4074f6cda8ce445e9861d3296 probably cannot arise. The scenario of rSh.IsTableMode() changing between launch of the dialog and applying the result of the dialog is presumably maybe theoretically possible in e.g. an online scenario, but not in the normal user case, but handled here anyway. Change-Id: I12f0b6bc7e0e2f5bad45a88007bf6fe2cd3d3b0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116896 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 549e4e14327c..82c382b6fe36 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -596,18 +596,22 @@ void SwTableShell::Execute(SfxRequest &rReq) auto pRequest = std::make_shared<SfxRequest>(rReq); rReq.Ignore(); // the 'old' request is not relevant any more - SwPaM* pCursor = rSh.IsTableMode() ? rSh.GetTableCrs() : rSh.GetCursor(); // tdf#142165 use table cursor if in table mode + const bool bTableMode = rSh.IsTableMode(); + SwPaM* pCursor = bTableMode ? rSh.GetTableCrs() : rSh.GetCursor(); // tdf#142165 use table cursor if in table mode auto vCursors = CopyPaMRing(*pCursor); // tdf#135636 make a copy to use at later apply - pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, &rBindings, &rSh, vCursors](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, &rBindings, &rSh, vCursors, bTableMode](sal_Int32 nResult){ if (RET_OK == nResult) { - if (rSh.IsTableMode()) // tdf#140977 drop possible table-cursor before setting the new one - rSh.TableCursorToCursor(); + if (!bTableMode && rSh.IsTableMode()) // tdf#140977 drop current table-cursor if setting a replacement + rSh.TableCursorToCursor(); // non-table one - // tdf#135636 set the table selected at dialog launch as current selection + // tdf#135636 set the selection at dialog launch as current selection rSh.SetSelection(*vCursors->front()); // UpdateCursor() will be called which in the case // of a table selection should recreate a - // SwShellTableCursor + // SwShellTableCursor if the selection is more than a single cell + + if (bTableMode && !rSh.IsTableMode()) // tdf#142721 ensure the new selection is a SwShellTableCursor in + rSh.SelTableBox(); // the case of of a single cell const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); commit 3cd5c94d82410481ce31b65a439c67d1c37497df Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jun 9 13:41:30 2021 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:31 2021 +0200 allow system firebird 4 drop odb load tests of experimental era odbs that only contain fdb and not fbk, that ends up only proving that was a bad idea which we know so that's why we stopped doing it this squashed commit contains... HAVE_FIREBIRD_30 is not used anymore Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116977 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> and... drop firebird test of initial experimental period fdb-only format Initially when the firebird embedded database support was first experimental we saved the fdb firebird file format. A test was added by 3f114eb4a2f3994b980aa607f2d4afc58e5aaa1d around then (2013) to test loading firebird odbs Then with commit de899f0b350e51b1932fa4674f7ce2ae386cd1ce Date: Thu Jun 2 11:56:10 2016 +0200 connectivity: firebird: use ODS12 test database for Firebird 3 if building with firebird 3 a replacement odb was created in firebird 3.X ODS12 format to use instead of the 2.X ODS11 file. Those fdb file formats were endian specific and database version specific. Which was a well known problem documented in tdf#72987 and a blocker for leaving 'experimental' at that point in time. So finally with commit 0cc1ddf2d8d6bc7df74fdd8f8f97381df681177d Date: Thu Aug 11 12:02:56 2016 +0200 tdf#72987 GSoC Use Firebird backup format the save was changed to save the backup fbk file format and load restores the database from that fbk file format (2016) when available. later in commit 860ecb9e583627ab43097784ad98b41afd983ff6 Date: Thu Jan 5 12:58:26 2017 +0100 require firebird 3.0 for build (don't allow 2.5) the firebird 2.X (ODS11) test of loading the fdb format was dropped leaving just the firebird 3.X (ODS12) fdb case because firebird 3.X cannot directly load the ODS11 format Now with the appearance of firebird 4 the same problem arises that firebird doesn't load older binary formats directly. In the end all we established here is that an odb containing only a fdb is endian and version specific and a bad idea wrt compatibility so we shouldn't do that. But we knew that, so embedded firebird databases were an experiemental curosity until 0cc1ddf2d8d6bc7df74fdd8f8f97381df681177d enabled use of the fbk format. We're not gaining anything with the test of loading the binary only case because we know that's an unsustainable route we abandoned. Change-Id: I330065f61d2d0fdfeeaeba4ee2e739e222d1c665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116895 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/config_host/config_firebird.h.in b/config_host/config_firebird.h.in index b56056cf6ae9..edfbb2df62b4 100644 --- a/config_host/config_firebird.h.in +++ b/config_host/config_firebird.h.in @@ -7,6 +7,4 @@ Settings for Firebird #define ENABLE_FIREBIRD_SDBC 0 -#define HAVE_FIREBIRD_30 0 - #endif diff --git a/configure.ac b/configure.ac index 4ad5a31d76ef..cef4e660221c 100644 --- a/configure.ac +++ b/configure.ac @@ -9923,11 +9923,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then AC_MSG_CHECKING([Firebird version]) if test -n "${FIREBIRD_VERSION}"; then FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` - FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` - if test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then + if test "$FIREBIRD_MAJOR" -ge "3"; then AC_MSG_RESULT([OK]) else - AC_MSG_ERROR([Ensure firebird 3.0.x is installed]) + AC_MSG_ERROR([Ensure firebird >= 3 is installed]) fi else save_CFLAGS="${CFLAGS}" @@ -9948,7 +9947,6 @@ int fb_api_is_30(void) { return 0; } AC_MSG_RESULT([none]) else dnl Embedded Firebird has version 3.0 - AC_DEFINE(HAVE_FIREBIRD_30, 1) dnl We need libatomic_ops for any non X86/X64 system if test "${CPUNAME}" != INTEL -a "${CPUNAME}" != X86_64; then dnl =================================================================== diff --git a/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk deleted file mode 100644 index 654d2f6168cc..000000000000 --- a/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk +++ /dev/null @@ -1,70 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_regression)) - -$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_regression,boost_headers)) - -$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_regression, \ - dbaccess/qa/unit/firebird-regression \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_regression, \ - comphelper \ - cppu \ - dbaxml \ - firebird_sdbc \ - sal \ - subsequenttest \ - svt \ - test \ - unotest \ - utl \ - xo \ -)) - -$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_regression,\ - offapi \ - oovbaapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_regression)) -$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_regression)) - -$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_regression,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/manager/sdbc2 \ - dbaccess/util/dba \ - dbaccess/source/filter/xml/dbaxml \ - dbaccess/util/dbu \ - filter/source/config/cache/filterconfig1 \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sfx2/util/sfx \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - uui/util/uui \ - xmloff/util/xo \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_regression)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index 88592d922cbd..5065520993e2 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -7,15 +7,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird)) +$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_test)) -$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird,boost_headers)) +$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_test,boost_headers)) -$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird, \ +$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_test, \ dbaccess/qa/unit/firebird \ )) -$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird, \ +$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_test, \ comphelper \ cppu \ dbaxml \ @@ -29,16 +29,16 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird, \ xo \ )) -$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird,\ +$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\ offapi \ oovbaapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird)) -$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird)) +$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_test)) +$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_test)) -$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird,\ +$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ @@ -65,6 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird,\ xmloff/util/xo \ )) -$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird)) +$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_test)) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 49bd9d202c7f..2d2c9ae31c1b 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -42,12 +42,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf126268) \ )) -# remove if we have a be file for this -ifeq ($(ENDIANNESS),little) -$(eval $(call gb_Module_add_check_targets,dbaccess,\ - CppunitTest_dbaccess_firebird_regression_test \ -)) -endif $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_firebird_test \ )) diff --git a/dbaccess/qa/unit/data/firebird_empty_le.odb b/dbaccess/qa/unit/data/firebird_empty_le.odb deleted file mode 100644 index 766c17db2ec9..000000000000 Binary files a/dbaccess/qa/unit/data/firebird_empty_le.odb and /dev/null differ diff --git a/dbaccess/qa/unit/data/firebird_integer_le.odb b/dbaccess/qa/unit/data/firebird_integer_le.odb deleted file mode 100644 index da2ec1499198..000000000000 Binary files a/dbaccess/qa/unit/data/firebird_integer_le.odb and /dev/null differ diff --git a/dbaccess/qa/unit/data/firebird_integer_le_ods12.odb b/dbaccess/qa/unit/data/firebird_integer_le_ods12.odb deleted file mode 100644 index 95691ed20585..000000000000 Binary files a/dbaccess/qa/unit/data/firebird_integer_le_ods12.odb and /dev/null differ diff --git a/dbaccess/qa/unit/firebird-regression.cxx b/dbaccess/qa/unit/firebird-regression.cxx deleted file mode 100644 index faf0a834b9c4..000000000000 --- a/dbaccess/qa/unit/firebird-regression.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "dbtest_base.cxx" - -#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> -#include <com/sun/star/sdbc/XColumnLocate.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdbc/XStatement.hpp> - -using namespace ::com::sun::star; -using namespace ::com::sun::star::sdb; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::uno; - -class FirebirdTest - : public DBTestBase -{ -public: - void testEmptyDBConnection(); - void testIntegerDatabase(); - - CPPUNIT_TEST_SUITE(FirebirdTest); - CPPUNIT_TEST(testEmptyDBConnection); - CPPUNIT_TEST(testIntegerDatabase); - CPPUNIT_TEST_SUITE_END(); -}; - -/** - * Test the loading of an "empty" file, i.e. the embedded database has not yet - * been initialised (as occurs when a new .odb is created and opened by base). - */ -void FirebirdTest::testEmptyDBConnection() -{ -#ifdef OSL_BIGENDIAN - auto const tmp = createTempCopy("firebird_empty_be.odb"); -#else - auto const tmp = createTempCopy("firebird_empty_le.odb"); -#endif - uno::Reference< XOfficeDatabaseDocument > xDocument = - getDocumentForUrl(tmp.GetURL()); - - getConnectionForDocument(xDocument); - - closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY)); -} - -/** - * Test reading of integers from a known .odb to verify that the data - * can still be read on all systems. - */ -void FirebirdTest::testIntegerDatabase() -{ -#ifdef OSL_BIGENDIAN - uno::Reference< XOfficeDatabaseDocument > xDocument = - getDocumentForFileName("firebird_integer_be_ods12.odb"); -#else - uno::Reference< XOfficeDatabaseDocument > xDocument = - getDocumentForFileName("firebird_integer_le_ods12.odb"); -#endif - - uno::Reference< XConnection > xConnection = - getConnectionForDocument(xDocument); - - uno::Reference< XStatement > xStatement = xConnection->createStatement(); - CPPUNIT_ASSERT(xStatement.is()); - - uno::Reference< XResultSet > xResultSet = xStatement->executeQuery( - "SELECT * FROM TESTTABLE"); - CPPUNIT_ASSERT(xResultSet.is()); - CPPUNIT_ASSERT(xResultSet->next()); - - uno::Reference< XRow > xRow(xResultSet, UNO_QUERY); - CPPUNIT_ASSERT(xRow.is()); - uno::Reference< XColumnLocate > xColumnLocate(xRow, UNO_QUERY); - CPPUNIT_ASSERT(xColumnLocate.is()); - - CPPUNIT_ASSERT_EQUAL(sal_Int16(-30000), - xRow->getShort(xColumnLocate->findColumn("_SMALLINT"))); - CPPUNIT_ASSERT_EQUAL(sal_Int32(-2100000000), - xRow->getInt(xColumnLocate->findColumn("_INT"))); - CPPUNIT_ASSERT_EQUAL(SAL_CONST_INT64(-9000000000000000000), - xRow->getLong(xColumnLocate->findColumn("_BIGINT"))); - CPPUNIT_ASSERT_EQUAL(OUString("5"), - xRow->getString(xColumnLocate->findColumn("_CHAR"))); - CPPUNIT_ASSERT_EQUAL(OUString("5"), - xRow->getString(xColumnLocate->findColumn("_VARCHAR"))); - - CPPUNIT_ASSERT(!xResultSet->next()); // Should only be one row - - closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY)); -} - -CPPUNIT_TEST_SUITE_REGISTRATION(FirebirdTest); - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit de92ce01922ec3df1d8ab83530856d53453cb7e2 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jun 10 14:04:17 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:31 2021 +0200 tdf#136766 Zoom slider in calc print preview has white background I cannot figure out any way to make transparent stuff on the toolbar behave under all rendering backends, so just revert this this reverts commit 00cffc20e40b2412c7e9867eed24c9834504e24f Date: Mon Sep 7 13:28:33 2020 +0200 tdf#135181 Calc print preview zoom slider print preview not transparent (gen) commit 444c7c736be7545344298a9cbb3a69886edc5ecb Date: Mon May 18 18:23:13 2020 +0200 tdf#125538 fix background of zoom control Change-Id: I7c351796b2c0778c1520fc8177d05567b2ae8a48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116982 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit d693223b84b518701d308678801ccc50877490dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116904 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 12d12c19beda..b7a6781dcd07 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -97,9 +97,8 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl Image maIncreaseButton; Image maDecreaseButton; bool mbOmitPaint; - VclPtr<vcl::Window> mxParentWindow; - explicit ScZoomSliderWnd_Impl( sal_uInt16 nCurrentZoom, vcl::Window* parentWindow ) : + explicit ScZoomSliderWnd_Impl( sal_uInt16 nCurrentZoom ) : mnCurrentZoom( nCurrentZoom ), mnMinZoom( 10 ), mnMaxZoom( 400 ), @@ -108,8 +107,7 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl maSliderButton(), maIncreaseButton(), maDecreaseButton(), - mbOmitPaint( false ), - mxParentWindow(parentWindow) + mbOmitPaint( false ) { } }; @@ -209,7 +207,7 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nCurrentZoom ): InterimItemWindow(pParent, "modules/scalc/ui/zoombox.ui", "ZoomBox"), - mxWidget(new ScZoomSlider(rDispatchProvider, nCurrentZoom, pParent)), + mxWidget(new ScZoomSlider(rDispatchProvider, nCurrentZoom)), mxWeld(new weld::CustomWeld(*m_xBuilder, "zoom", *mxWidget)) { Size aLogicalSize( 115, 40 ); @@ -233,8 +231,8 @@ void ScZoomSliderWnd::dispose() } ScZoomSlider::ScZoomSlider(const css::uno::Reference< css::frame::XDispatchProvider>& rDispatchProvider, - sal_uInt16 nCurrentZoom, vcl::Window* parentWindow) - : mpImpl(new ScZoomSliderWnd_Impl(nCurrentZoom, parentWindow)) + sal_uInt16 nCurrentZoom) + : mpImpl(new ScZoomSliderWnd_Impl(nCurrentZoom)) , m_xDispatchProvider(rDispatchProvider) { mpImpl->maSliderButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERBUTTON); @@ -277,8 +275,9 @@ bool ScZoomSlider::MouseButtonDown( const MouseEvent& rMEvt ) if( nOldZoom == mpImpl->mnCurrentZoom ) return true; - // need to invalidate parent since we rely on the toolbox drawing it's fancy gradient background - mpImpl->mxParentWindow->Invalidate(); + tools::Rectangle aRect( Point( 0, 0 ), aSliderWindowSize ); + + Invalidate(aRect); mpImpl->mbOmitPaint = true; SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom ); @@ -312,8 +311,8 @@ bool ScZoomSlider::MouseMove( const MouseEvent& rMEvt ) { mpImpl->mnCurrentZoom = Offset2Zoom( aPoint.X() ); - // need to invalidate parent since we rely on the toolbox drawing it's fancy gradient background - mpImpl->mxParentWindow->Invalidate(); + tools::Rectangle aRect(Point(0, 0), aSliderWindowSize); + Invalidate(aRect); mpImpl->mbOmitPaint = true; // optimization: paint before executing command, @@ -379,9 +378,11 @@ void ScZoomSlider::UpdateFromItem(const SvxZoomSliderItem* pZoomSliderItem) } } + Size aSliderWindowSize = GetOutputSizePixel(); + tools::Rectangle aRect(Point(0, 0), aSliderWindowSize); + if ( !mpImpl->mbOmitPaint ) - // need to invalidate parent since we rely on the toolbox drawing it's fancy gradient background - mpImpl->mxParentWindow->Invalidate(); + Invalidate(aRect); } void ScZoomSlider::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) @@ -399,9 +400,6 @@ void ScZoomSlider::DoPaint(vcl::RenderContext& rRenderContext) ScopedVclPtrInstance< VirtualDevice > pVDev(rRenderContext, DeviceFormat::DEFAULT, DeviceFormat::BITMASK); pVDev->SetOutputSizePixel(aSliderWindowSize); - pVDev->SetFillColor( COL_TRANSPARENT ); - pVDev->SetLineColor( COL_TRANSPARENT ); - pVDev->DrawRect( aRect ); tools::Rectangle aSlider = aRect; @@ -422,6 +420,21 @@ void ScZoomSlider::DoPaint(vcl::RenderContext& rRenderContext) tools::Rectangle aRight(aSlider); aRight.SetLeft( aRight.Right() ); + // draw VirtualDevice's background color + Color aStartColor = rRenderContext.GetSettings().GetStyleSettings().GetFaceColor(); + Color aEndColor = rRenderContext.GetSettings().GetStyleSettings().GetFaceColor(); + + if (aEndColor.IsDark()) + aStartColor = aEndColor; + + Gradient aGradient; + aGradient.SetAngle( Degree10(0) ); + aGradient.SetStyle(GradientStyle::Linear); + + aGradient.SetStartColor(aStartColor); + aGradient.SetEndColor(aEndColor); + pVDev->DrawGradient(aRect, aGradient); + // draw slider pVDev->SetLineColor(COL_WHITE); pVDev->DrawRect(aSecondLine); diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 944f9c86335e..5f193314bb2b 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -53,7 +53,7 @@ private: void DoPaint(vcl::RenderContext& rRenderContext); public: ScZoomSlider(const css::uno::Reference<css::frame::XDispatchProvider>& rDispatchProvider, - sal_uInt16 nCurrentZoom, vcl::Window*); + sal_uInt16 nCurrentZoom); void UpdateFromItem(const SvxZoomSliderItem* pZoomSliderItem); commit c780bfeb662fee6bf46457ba19524d9c0f75b971 Author: Tünde Tóth <[email protected]> AuthorDate: Fri Jun 4 13:10:51 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:30 2021 +0200 tdf#139658 OOXML: fix broken chart import at labels with quotes During the import of the internal data table, incomplete parsing of category labels with escaped quotation marks resulted broken category labels and charts. Change-Id: If5af3d527b80d1e055562f589bdaf17096ad49f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116714 Tested-by: László Németh <[email protected]> Reviewed-by: László Németh <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116998 Tested-by: Jenkins diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index fe9ebb5bc502..b3b5a3921d3a 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -174,6 +174,7 @@ public: void testTdf137734(); void testTdf137874(); void testTdfCustomShapePos(); + void testTdf139658(); CPPUNIT_TEST_SUITE(Chart2ImportTest); CPPUNIT_TEST(Fdo60083); @@ -295,6 +296,7 @@ public: CPPUNIT_TEST(testTdf137734); CPPUNIT_TEST(testTdf137874); CPPUNIT_TEST(testTdfCustomShapePos); + CPPUNIT_TEST(testTdf139658); CPPUNIT_TEST_SUITE_END(); @@ -2845,6 +2847,26 @@ void Chart2ImportTest::testTdfCustomShapePos() } } +void Chart2ImportTest::testTdf139658() +{ + load(u"/chart2/qa/extras/data/docx/", "tdf139658.docx"); + uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference<chart2::XInternalDataProvider> xInternalProvider(xChartDoc->getDataProvider(), + uno::UNO_QUERY); + CPPUNIT_ASSERT(xInternalProvider.is()); + + Reference<chart::XComplexDescriptionAccess> xDescAccess(xInternalProvider, uno::UNO_QUERY); + CPPUNIT_ASSERT(xDescAccess.is()); + + // Get the category labels. + Sequence<OUString> aCategories = xDescAccess->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aCategories.getLength()); + CPPUNIT_ASSERT_EQUAL(OUString("category1"), aCategories[0]); + CPPUNIT_ASSERT_EQUAL(OUString("\"category2\""), aCategories[1]); + CPPUNIT_ASSERT_EQUAL(OUString("category\"3"), aCategories[2]); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/data/docx/tdf139658.docx b/chart2/qa/extras/data/docx/tdf139658.docx new file mode 100644 index 000000000000..59deda9f83f9 Binary files /dev/null and b/chart2/qa/extras/data/docx/tdf139658.docx differ diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index c1d0008098ab..415f08ac3ea9 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -518,7 +518,14 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co bool bInQuote = false; for (; p != pEnd; ++p) { - if (*p == '"') + // Skip next "" within the title text: it's an escaped double quotation mark. + if (bInQuote && *p == '"' && *(p + 1) == '"') + { + if (!pElem) + pElem = p; + ++p; + } + else if (*p == '"') { bInQuote = !bInQuote; if (bInQuote) @@ -534,7 +541,8 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co // Non empty string if (!aElem.isEmpty()) bAllNumeric = false; - aRawElems.push_back(aElem); + // Restore also escaped double quotation marks + aRawElems.push_back(aElem.replaceAll("\"\"", "\"")); pElem = nullptr; aElem.clear(); commit 5b3455612266388cc269ed189a720c79ca35c02f Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jun 9 14:31:05 2021 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:30 2021 +0200 tdf#141769 ScTextWnd has to be available before the editview is created Change-Id: Iec3b4180c4dc83723224b7122a1513cb8fe3ea0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116921 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index d0afd2c8196c..ea6787478abd 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -27,6 +27,7 @@ #include <editsrc.hxx> #include <scmod.hxx> #include <inputhdl.hxx> +#include <inputwin.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -595,4 +596,12 @@ OutputDevice* ScAccessibleEditControlObject::GetOutputDeviceForView() return &m_pController->GetDrawingArea()->get_ref_device(); } +ScAccessibleEditLineObject::ScAccessibleEditLineObject(ScTextWnd* pTextWnd) + : ScAccessibleEditControlObject(pTextWnd, ScAccessibleEditObject::EditLine) +{ + // tdf#141769 set this early so its always available, even before the on-demand + // editview is created + mpTextWnd = pTextWnd; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index e19842e9b00e..1df98a6d1cd8 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2139,7 +2139,7 @@ void ScTextWnd::SetDrawingArea(weld::DrawingArea* pDrawingArea) css::uno::Reference< css::accessibility::XAccessible > ScTextWnd::CreateAccessible() { - pAcc = new ScAccessibleEditControlObject(this, ScAccessibleEditObject::EditLine); + pAcc = new ScAccessibleEditLineObject(this); return pAcc; } diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 83dedda9b387..9244964cfae3 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -175,7 +175,9 @@ private: std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper; EditView* mpEditView; VclPtr<vcl::Window> mpWindow; +protected: ScTextWnd* mpTextWnd; +private: EditObjectType meObjectType; bool mbHasFocus; @@ -222,6 +224,12 @@ public: virtual void SAL_CALL disposing() override; }; +class ScAccessibleEditLineObject : public ScAccessibleEditControlObject +{ +public: + ScAccessibleEditLineObject(ScTextWnd* pTextWnd); +}; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 93caec9bbffcf49ac8338b3a8e24cc2af6f6839d Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jun 9 10:20:57 2021 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:29 2021 +0200 dtd files are not xml files and shouldn't have xml headers so rpminspect is correct in complaining that they are not valid xml on inspecting files claiming to be xml Change-Id: I70379989326c2ea63e6a54b3658ebea4684fa5df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116892 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd index f4dcac65242d..912b652d3cf5 100644 --- a/framework/dtd/accelerator.dtd +++ b/framework/dtd/accelerator.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/framework/dtd/event.dtd b/framework/dtd/event.dtd index 7a66d15e571b..5af4a3dd267f 100644 --- a/framework/dtd/event.dtd +++ b/framework/dtd/event.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/framework/dtd/groupuinames.dtd b/framework/dtd/groupuinames.dtd index a29b77a4f13e..218939cf9bae 100644 --- a/framework/dtd/groupuinames.dtd +++ b/framework/dtd/groupuinames.dtd @@ -24,4 +24,3 @@ groupuinames:name CDATA #REQUIRED groupuinames:default-ui-name CDATA #REQUIRED > - diff --git a/framework/dtd/image.dtd b/framework/dtd/image.dtd index 59b0f3f92f08..fb69a5e5f4c8 100644 --- a/framework/dtd/image.dtd +++ b/framework/dtd/image.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/framework/dtd/menubar.dtd b/framework/dtd/menubar.dtd index b41431f6d0ef..b3469f7324a6 100644 --- a/framework/dtd/menubar.dtd +++ b/framework/dtd/menubar.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd index 9f4e9e2a35c3..40a5609b7cf6 100644 --- a/framework/dtd/statusbar.dtd +++ b/framework/dtd/statusbar.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd index 6f2c38260524..7f8ee24e8ab9 100644 --- a/framework/dtd/toolbar.dtd +++ b/framework/dtd/toolbar.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd index 103ab1721c4e..60006d87f439 100644 --- a/i18npool/source/localedata/data/locale.dtd +++ b/i18npool/source/localedata/data/locale.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/officecfg/registry/component-schema.dtd b/officecfg/registry/component-schema.dtd index 242b9c6ea513..70bd51bf7d13 100644 --- a/officecfg/registry/component-schema.dtd +++ b/officecfg/registry/component-schema.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/officecfg/registry/component-update.dtd b/officecfg/registry/component-update.dtd index d99ee499249e..0659e412305b 100644 --- a/officecfg/registry/component-update.dtd +++ b/officecfg/registry/component-update.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/package/dtd/Manifest.dtd b/package/dtd/Manifest.dtd index 2dbdbf00c81d..9e16a007a799 100644 --- a/package/dtd/Manifest.dtd +++ b/package/dtd/Manifest.dtd @@ -46,4 +46,3 @@ manifest:key-derivation-name CDATA #REQUIRED manifest:salt CDATA #REQUIRED manifest:iteration-count CDATA #REQUIRED> - diff --git a/xmerge/source/xmerge/converter.dtd b/xmerge/source/xmerge/converter.dtd index f7c09f5c2c58..81ecbe69d80e 100644 --- a/xmerge/source/xmerge/converter.dtd +++ b/xmerge/source/xmerge/converter.dtd @@ -82,4 +82,3 @@ <!ELEMENT converter-target EMPTY> <!ATTLIST converter-target type CDATA #REQUIRED> - diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd index e056d57e5525..5da82955640b 100644 --- a/xmloff/dtd/office.dtd +++ b/xmloff/dtd/office.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd index 1b7e6355631f..7290b8d22257 100644 --- a/xmlscript/dtd/dialog.dtd +++ b/xmlscript/dtd/dialog.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * diff --git a/xmlscript/dtd/libraries.dtd b/xmlscript/dtd/libraries.dtd index 270d89209bba..3b3b82e535b8 100644 --- a/xmlscript/dtd/libraries.dtd +++ b/xmlscript/dtd/libraries.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * @@ -33,4 +32,3 @@ library:link %boolean; #REQUIRED library:readonly %boolean; #IMPLIED > - diff --git a/xmlscript/dtd/library.dtd b/xmlscript/dtd/library.dtd index 4f1512692ad6..c0341ed545b5 100644 --- a/xmlscript/dtd/library.dtd +++ b/xmlscript/dtd/library.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * @@ -32,4 +31,3 @@ <!ATTLIST library:element library:name CDATA #REQUIRED > - diff --git a/xmlscript/dtd/module.dtd b/xmlscript/dtd/module.dtd index 5b36ac033d89..b77d62f46498 100644 --- a/xmlscript/dtd/module.dtd +++ b/xmlscript/dtd/module.dtd @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- * This file is part of the LibreOffice project. * @@ -23,4 +22,3 @@ script:name CDATA #REQUIRED script:language CDATA #REQUIRED > - commit 7d88ba424dfd96376b2b86d97a139c02baa0b441 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jun 9 09:35:28 2021 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:29 2021 +0200 xmllint: Namespace prefix menu on menuseparator is not defined xmllint --noout dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml:24: namespace error : Namespace prefix menu on menuseparator is not defined <menu:menuseparator/> should be a toolbarseparator here a problem since... commit 4f810905fa74128871f2fe924a3d28a79f4e4261 Date: Tue Mar 5 15:42:19 2019 +0100 sync dbaccess ui files with swriter ui file structure Change-Id: I000efac56a0af10bca7c22fba6f88f469ae9b272 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116711 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml index b3c2c9c37eef..78e698df3883 100644 --- a/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml +++ b/dbaccess/uiconfig/dbapp/toolbar/formobjectbar.xml @@ -21,7 +21,7 @@ <toolbar:toolbaritem xlink:href=".uno:DBNewForm"/> <toolbar:toolbaritem xlink:href=".uno:DBFormOpen"/> <toolbar:toolbaritem xlink:href=".uno:DBFormEdit"/> - <menu:menuseparator/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:DBFormDelete"/> <toolbar:toolbaritem xlink:href=".uno:DBFormRename"/> <toolbar:toolbarseparator/> commit 52962085f2466ad0024c416f34c5d8bd61bcc844 Author: Noel Grandin <[email protected]> AuthorDate: Wed Jun 9 15:24:19 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:29 2021 +0200 tdf#142629 import psd image with transparent background regression from commit 2168d709805a847ac012ff87b06e081ca139d064 Date: Mon Feb 12 15:29:10 2018 +0200 use RawBitmap in PSDReader Change-Id: I8d547d3cca7fb8fc90a8d9382e054b4d4b2f3519 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116916 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116941 diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 3c219870f1d2..90b7746029b8 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -119,7 +119,7 @@ bool PSDReader::ReadPSD(Graphic & rGraphic ) } Size aBitmapSize( mpFileHeader->nColumns, mpFileHeader->nRows ); - mpBitmap.reset( new vcl::bitmap::RawBitmap( aBitmapSize, 24 ) ); + mpBitmap.reset( new vcl::bitmap::RawBitmap( aBitmapSize, mbTransparent ? 32 : 24 ) ); if ( mpPalette && mbStatus ) { mvPalette.resize( 256 ); @@ -129,8 +129,9 @@ bool PSDReader::ReadPSD(Graphic & rGraphic ) } } - if ((mnDestBitDepth == 1 || mnDestBitDepth == 8 || mbTransparent) && mvPalette.empty()) + if ((mnDestBitDepth == 1 || mnDestBitDepth == 8) && mvPalette.empty()) { + SAL_WARN("vcl", "no palette, but bit depth is " << mnDestBitDepth); mbStatus = false; return mbStatus; } @@ -721,7 +722,7 @@ bool PSDReader::ImplReadBody() m_rPSD.ReadUChar( nDummy ); for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ ) { - mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat)); + mpBitmap->SetAlpha(nY, nX, nDat ? 0 : 255); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; @@ -742,7 +743,7 @@ bool PSDReader::ImplReadBody() nDat = 1; if ( mpFileHeader->nDepth == 16 ) // 16 bit depth is to be skipped m_rPSD.ReadUChar( nDummy ); - mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat)); + mpBitmap->SetAlpha(nY, nX, nDat ? 0 : 255); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx index 7fac44a166af..710559d11d48 100644 --- a/include/vcl/RawBitmap.hxx +++ b/include/vcl/RawBitmap.hxx @@ -49,6 +49,12 @@ public: if (mnBitCount == 32) mpData[p] = nColor.GetTransparency(); } + void SetAlpha(tools::Long nY, tools::Long nX, sal_uInt8 nAlpha) + { + assert(mnBitCount == 32); + tools::Long p = (nY * maSize.getWidth() + nX) * (mnBitCount / 8) + 3; + mpData[p] = nAlpha; + } Color GetPixel(tools::Long nY, tools::Long nX) const { tools::Long p = (nY * maSize.getWidth() + nX) * mnBitCount / 8; commit 6b6197c6bec49fb0a4518ed7a0ed6b7e3f27fdea Author: Tomaž Vajngerl <[email protected]> AuthorDate: Sun Jun 6 20:55:28 2021 +0900 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:28 2021 +0200 tdf#142478 fix crash when searching and a viewshell change occurs When searching a impress document for a word, and the word is in notes as welll as in the document, a crash happens (only when searching with "find all"). The regressing commit changed that the search is now bound to a view (and to a viewshell). When searching for words in notes and document, at the transition from "standard" to "notes" page kind mode, the view and viewshells are destroyed and the new one created again. The problem lies here as when we destroy the viewshell, we also destroy the search context and FuSearch objects, but we are still executing the search -> crash. The solution for this is that when we change the page kind, we take the FuSearch object from the old viewshell and put it into the newly created viewshell, so that we keep the FuSearch object alive and don't throw away the search context too. Change-Id: I50931cca2a20c5704f7450e3cc8b3466af4c5a3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116758 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> (cherry picked from commit 3b75f9add7ed80e803b0771d86892d6ca0f47e71) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116703 Reviewed-by: Michael Stahl <[email protected]> diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 59e740b4bda1..70df0bd17bfe 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -61,6 +61,7 @@ #include <comphelper/lok.hxx> #include <comphelper/scopeguard.hxx> #include <VectorGraphicSearchContext.hxx> +#include <fusearch.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1550,6 +1551,11 @@ void SdOutliner::SetViewMode (PageKind ePageKind) bool bMatchMayExist = mbMatchMayExist; sd::ViewShellBase& rBase = pViewShell->GetViewShellBase(); + + rtl::Reference<sd::FuSearch> xFuSearch; + if (pViewShell->GetView()) + xFuSearch = pViewShell->GetView()->getSearchContext().getFunctionSearch(); + SetViewShell(std::shared_ptr<sd::ViewShell>()); sd::framework::FrameworkHelper::Instance(rBase)->RequestView( sViewURL, @@ -1560,7 +1566,11 @@ void SdOutliner::SetViewMode (PageKind ePageKind) // instead. But that would involve major restructuring of the // Outliner code. sd::framework::FrameworkHelper::Instance(rBase)->RequestSynchronousUpdate(); - SetViewShell(rBase.GetMainViewShell()); + + auto pNewViewShell = rBase.GetMainViewShell(); + SetViewShell(pNewViewShell); + if (xFuSearch.is() && pNewViewShell->GetView()) + pNewViewShell->GetView()->getSearchContext().setSearchFunction(xFuSearch); // Switching to another view shell has intermediatly called // EndSpelling(). A PrepareSpelling() is pending, so call that now. commit 502b0f78e50a5973e92bc7d3eb7d994d70bd8789 Author: Christian Lohmaier <[email protected]> AuthorDate: Fri Jun 4 16:23:19 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Jun 14 08:08:28 2021 +0200 update credits Change-Id: I46f39d507cc96cbcd0d59b4edfcbb109efefdb69 (cherry picked from commit 0d42ca4f39160bdc28a5855261c227c63161dd8a) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 5521ec93d3a0..6e2a8af88e68 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:officeooo="http://openoffice.org/2009/office"; 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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; 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.1.2.2$Linux_X86_64 LibreOffice_project/8a45595d069ef5570103caea1b71cc9d82b2aae4</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="4379" meta:word-count="16183" meta:character-count="116643" meta:non-whitespace-character-count="102203"/><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/7.1.3.2$Linux_X86_64 LibreOffice_project/47f78053abe362b9384784d31a6e56f8511eb1c1</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="4393" meta:word-count="16242" meta:character-count="117100" meta:non-whitespace-character-count="102609"/><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">2494</config:config-item> + <config:config-item config:name="ViewAreaTop" config:type="long">674</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">48588</config:config-item> <config:config-item config:name="ViewAreaHeight" config:type="long">28268</config:config-item> @@ -16,9 +16,9 @@ <config:config-item config:name="ViewLeft" config:type="long">3577</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">2494</config:config-item> + <config:config-item config:name="VisibleTop" config:type="long">674</config:config-item> <config:config-item config:name="VisibleRight" config:type="long">49087</config:config-item> - <config:config-item config:name="VisibleBottom" config:type="long">30760</config:config-item> + <config:config-item config:name="VisibleBottom" config:type="long">28940</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> @@ -95,7 +95,7 @@ </config:config-item-map-indexed> <config:config-item config:name="PrinterSetup" config:type="base64Binary"/> <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item> - <config:config-item config:name="Rsid" config:type="int">10062857</config:config-item> + <config:config-item config:name="Rsid" config:type="int">10103663</config:config-item> <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/> <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item> <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item> @@ -162,7 +162,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:flow-with-text="true"/> - <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false"> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" 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="Mangal" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/> @@ -340,24 +340,24 @@ </office:styles> <office:automatic-styles> <style:style style:name="Tabelle1" style:family="table"> - <style:table-properties style:width="26.49cm" table:align="left"/> + <style:table-properties style:width="25.977cm" table:align="left"/> </style:style> <style:style style:name="Tabelle1.A" style:family="table-column"> <style:table-column-properties style:column-width="6.703cm"/> </style:style> <style:style style:name="Tabelle1.B" style:family="table-column"> - <style:table-column-properties style:column-width="6.682cm"/> + <style:table-column-properties style:column-width="6.823cm"/> </style:style> <style:style style:name="Tabelle1.C" style:family="table-column"> - <style:table-column-properties style:column-width="6.214cm"/> + <style:table-column-properties style:column-width="5.701cm"/> </style:style> <style:style style:name="Tabelle1.D" style:family="table-column"> - <style:table-column-properties style:column-width="6.892cm"/> + <style:table-column-properties style:column-width="6.75cm"/> </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.C385" style:family="table-cell"> + <style:style style:name="Tabelle1.C387" 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"> @@ -421,7 +421,7 @@ <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="31.514cm" table:align="left"/> + <style:table-properties style:width="32.958cm" table:align="left"/> </style:style> <style:style style:name="Tabelle5.A" style:family="table-column"> <style:table-column-properties style:column-width="6.772cm"/> @@ -430,14 +430,17 @@ <style:table-column-properties style:column-width="11.756cm"/> </style:style> <style:style style:name="Tabelle5.C" style:family="table-column"> - <style:table-column-properties style:column-width="6.285cm"/> + <style:table-column-properties style:column-width="7.938cm"/> </style:style> <style:style style:name="Tabelle5.D" style:family="table-column"> - <style:table-column-properties style:column-width="6.701cm"/> + <style:table-column-properties style:column-width="6.493cm"/> </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.C667" 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> @@ -490,13 +493,13 @@ <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:text-properties officeooo:paragraph-rsid="00586a23"/> </style:style> - <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Paragraph_20_style" style:list-style-name="L1"/> - <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="HTML"> + <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="HTML"> <style:paragraph-properties style:page-number="auto"/> </style:style> - <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:style style:name="P17" 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> + <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L1"/> <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L3"/> <style:style style:name="P20" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L4"/> <style:style style:name="P21" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L5"/> @@ -505,22 +508,25 @@ <style:style style:name="P24" style:family="paragraph" style:parent-style-name="Text_20_body"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> </style:style> - <style:style style:name="P25" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L2"> + <style:style style:name="P25" 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:style> + <style:style style:name="P26" 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"/> </style:style> - <style:style style:name="P26" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L3"> + <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L3"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> </style:style> - <style:style style:name="P27" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L4"> + <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L4"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> </style:style> - <style:style style:name="P28" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L5"> + <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L5"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> </style:style> - <style:style style:name="P29" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L6"> + <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L6"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> </style:style> - <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L7"> + <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L7"> <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> </style:style> <style:style style:name="T1" style:family="text"> @@ -1070,8 +1076,8 @@ </draw:image> </draw:frame> <text:section text:style-name="Sect1" text:name="BgContainer"> - <text:p text:style-name="P17">Credits</text:p> - <text:p text:style-name="Text_20_body">1668 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2021-05-05 18:01:10.</text:p> + <text:p text:style-name="P16">Credits</text:p> + <text:p text:style-name="Text_20_body">1676 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2021-06-04 12:02:31.</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"> @@ -1079,7 +1085,7 @@ <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:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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> @@ -1090,10 +1096,10 @@ <text:p text:style-name="Table_20_Contents">Oliver Bolte<text:line-break/>Commits: 31008<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">Caolán McNamara<text:line-break/>Commits: 30484<text:line-break/>Joined: 2000-10-10</text:p> + <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 30854<text:line-break/>Joined: 2000-10-10</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Jens-Heiner Rechtien [hr]<text:line-break/>Commits: 28805<text:line-break/>Joined: 2000-09-18</text:p> </table:table-cell> @@ -1101,27 +1107,27 @@ <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: 19009<text:line-break/>Joined: 2000-10-04</text:p> + <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 19056<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: 14010<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: 14223<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:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8978<text:line-break/>Joined: 2010-03-23</text:p> + <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8980<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">Miklos Vajna<text:line-break/>Commits: 8436<text:line-break/>Joined: 2010-07-29</text:p> + <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 8482<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">Michael Stahl<text:line-break/>Commits: 7689<text:line-break/>Joined: 2008-06-16</text:p> + <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 7695<text:line-break/>Joined: 2008-06-16</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Kohei Yoshida<text:line-break/>Commits: 5571<text:line-break/>Joined: 2009-06-19</text:p> </table:table-cell> @@ -1132,15 +1138,15 @@ <text:p text:style-name="Table_20_Contents">Frank Schoenheit [fs]<text:line-break/>Commits: 5008<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">Eike Rathke<text:line-break/>Commits: 4883<text:line-break/>Joined: 2000-10-11</text:p> + <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 4900<text:line-break/>Joined: 2000-10-11</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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: 3644<text:line-break/>Joined: 2009-11-12</text:p> + <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3646<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>Julien Nabet<text:line-break/>Commits: 3063<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: 3089<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">Hans-Joachim Lankenau<text:line-break/>Commits: 3007<text:line-break/>Joined: 2000-09-19</text:p> @@ -1149,12 +1155,12 @@ <text:p text:style-name="Table_20_Contents">Ocke Janssen [oj]<text:line-break/>Commits: 2850<text:line-break/>Joined: 2000-09-20</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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: 2806<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: 2818<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"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 2801<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: 2815<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</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: 2665<text:line-break/>Joined: 2009-06-23</text:p> @@ -1163,21 +1169,21 @@ <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-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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: 2549<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">Luboš Luňák<text:line-break/>Commits: 2480<text:line-break/>Joined: 2010-09-21</text:p> + <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 2487<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">Michael Meeks<text:line-break/>Commits: 2457<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: 2441<text:line-break/>Joined: 2009-10-14</text:p> + <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2442<text:line-break/>Joined: 2009-10-14</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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>Norbert Thiebaud<text:line-break/>Commits: 2176<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p> </table:table-cell> @@ -1191,7 +1197,7 @@ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 1952<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-02</text:span></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Christian Lippka<text:line-break/>Commits: 1805<text:line-break/>Joined: 2000-09-25</text:p> </table:table-cell> @@ -1199,13 +1205,13 @@ <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"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 1645<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: 1670<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">Armin Le Grand (Allotropia)<text:line-break/>Commits: 1487<text:line-break/>Joined: 2000-09-25</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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> </table:table-cell> @@ -1216,26 +1222,26 @@ <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1440<text:line-break/>Joined: 2001-04-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>Xisco Fauli<text:line-break/>Commits: 1357<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: 1411<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Fridrich Štrba<text:line-break/>Commits: 1338<text:line-break/>Joined: 2007-02-22</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: 1311<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: 1319<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">Thomas Lange [tl]<text:line-break/>Commits: 1310<text:line-break/>Joined: 2000-09-22</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">Niklas Nebel<text:line-break/>Commits: 1296<text:line-break/>Joined: 2000-09-19</text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 1299<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</text:span></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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>Chris Sherlock<text:line-break/>Commits: 1296<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</text:span></text:p> + <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>andreas kainz<text:line-break/>Commits: 1224<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-18</text:span></text:p> @@ -1247,40 +1253,40 @@ <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-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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> </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>Gabor Kelemen<text:line-break/>Commits: 1014<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: 1019<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>Samuel Mehrbrodt<text:line-break/>Commits: 984<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">Petr Mladek<text:line-break/>Commits: 958<text:line-break/>Joined: 2006-10-03</text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 971<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</text:p> + <text:p text:style-name="Table_20_Contents">Petr Mladek<text:line-break/>Commits: 958<text:line-break/>Joined: 2006-10-03</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: 940<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p> + <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</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">Kai Ahrens<text:line-break/>Commits: 909<text:line-break/>Joined: 2000-09-21</text:p> + <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 915<text:line-break/>Joined: 2008-06-01</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: 900<text:line-break/>Joined: 2008-06-01</text:p> + <text:p text:style-name="Table_20_Contents">Kai Ahrens<text:line-break/>Commits: 909<text:line-break/>Joined: 2000-09-21</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Henning Brinkmann<text:line-break/>Commits: 899<text:line-break/>Joined: 2002-08-14</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: 888<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: 890<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">Cédric Bosdonnat<text:line-break/>Commits: 882<text:line-break/>Joined: 2009-11-16</text:p> @@ -1289,7 +1295,7 @@ <text:p text:style-name="Table_20_Contents">Malte Timmermann [mt]<text:line-break/>Commits: 864<text:line-break/>Joined: 2000-10-10</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Sven Jacobi<text:line-break/>Commits: 850<text:line-break/>Joined: 2000-09-21</text:p> </table:table-cell> @@ -1303,9 +1309,9 @@ <text:p text:style-name="Table_20_Contents">Mikhail Voytenko<text:line-break/>Commits: 793<text:line-break/>Joined: 2001-01-16</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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>Maxim Monastirsky<text:line-break/>Commits: 778<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</text:span></text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Maxim Monastirsky<text:line-break/>Commits: 779<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</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">Carsten Driesner<text:line-break/>Commits: 748<text:line-break/>Joined: 2000-10-06</text:p> @@ -1317,7 +1323,7 @@ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 739<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <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>Andrzej Hunt<text:line-break/>Commits: 734<text:line-break/>Joined: <text:span text:style-name="T2">2012-03-27</text:span></text:p> </table:table-cell> @@ -1331,7 +1337,7 @@ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Zdeněk Crhonek<text:line-break/>Commits: 714<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-19</text:span></text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> <text:p text:style-name="Table_20_Contents">Joerg Skottke [jsk]<text:line-break/>Commits: 678<text:line-break/>Joined: 2008-06-17</text:p> </table:table-cell> @@ -1345,23 +1351,23 @@ <text:p text:style-name="Table_20_Contents">Kai Sommerfeld<text:line-break/>Commits: 651<text:line-break/>Joined: 2000-10-10</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="TableLine243423904"> + <table:table-row table:style-name="TableLine130350592"> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> - <text:p text:style-name="Table_20_Contents">Ingrid Halama<text:line-break/>Commits: 639<text:line-break/>Joined: 2001-01-19</text:p> + <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>László Németh<text:line-break/>Commits: 640<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</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>László Németh<text:line-break/>Commits: 631<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p> + <text:p text:style-name="Table_20_Contents">Ingrid Halama<text:line-break/>Commits: 639<text:line-break/>Joined: 2001-01-19</text:p> </table:table-cell> <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string"> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
