summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-12-06tdf#125957: FIREBIRD Datatype Binary(fix)[CHAR] couldn't be filled with contentfeature/cib_contract57eJulien Nabet1-1/+1
Really use sCharsetName which is xRow->getString(13) trimmed See commit bf662904c4b60e93c6b86e06288d41996eed12a2 Author: Tamas Bunth <tamas.bunth@collabora.co.uk> Date: Sat Dec 16 12:57:43 2017 +0100 tdf#104734 Firebird: Add Binary (fix) type There is no explicit binary type in Firebird. It can be accomplished using the CHAR type with a special character set, which tells the database that it is binary data and there is no collation. (called OCTETS). Because of that, we also need the character set to decide the exact column type. And also refactor some parts of the driver: - Create class to determine internal type from firebird type, subtype, scale and character set. - Use internal type (DataType::XXX) in XDatabaseMetaData::getTypeInfo() indirectly. (We want to return a Firebird type for each internal type, not in the opposite direction. Change-Id: I3c9c764d353eeead5e8c00f1142846725eecce15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107295 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins
2020-12-05tdf#138481: Trust the built-in break iterator character data in ICUTor Lillqvist2-120/+0
Don't use our own char.txt. Quite possibly we wouldn't need to use the other data in the i18npool/source/breakiterator/data folder either. See the README file there for the sad details. Change-Id: I82923ae76407fdd3fa3642d818d43427fe4f5591 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106632 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 8578a1c9d167c19f1d8038fac5946b4b3cae305e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106688 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107250 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-12-05Drop Python modules we don't want on macOS, too, like on other platformsTor Lillqvist1-1/+19
On macOS, for various reasons, we use a different approach than on other platforms to construct the bundled Python. Instead of explicitly listing what to include (out of what Python contains and builds) (in ExternalPackage_python3.mk), after Python is built, we remove stuff we don't want (in ExternalProject_python3.mk) and then include everything left in the LibreOfficePython.framework (in GeneratedPackage_python3.mk). This fixes a problem in App Store review: For some reason the review said that the setcchar() function from the ncurses library, used by Python's curses module, is non-public. No idea why the (automated) review picked on that function. As far as I see from the ncurses header in the SDK, that function is no less public than the other ncurses functions that the Python module uses. But oh well, we don't actually ship the curses module anyway on other platforms, so just drop it on macOS, too. And while at it, drop the other unwanted ones, too. And any binary shared libraries for them. Change-Id: Idecaf10a6fb1c59e8711095927f5699b8d2ec98e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107055 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107141 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107234 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-12-05Update git submodulesBalaharipreetha Muthu1-0/+0
* Update helpcontent2 from branch 'libreoffice-7-0' to 105093891218c1ca1ee08f732cb940831c0369ce - tdf#138627 - Repeated data in Tables of File Conversion Filter Names Delete repeated rows in table Change-Id: I83fc15c1063644d086cbc5fef4ec6f9764dbb4c5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107197 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107211 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-12-04EMF: tdf#138467 Fix MapMode translationBartosz Kosiorek4-14/+80
Add proper translation for map mapping modes: MM_LOMETRIC = 0x02, MM_HIMETRIC = 0x03, MM_LOENGLISH = 0x04, MM_HIENGLISH = 0x05, MM_TWIPS = 0x06 according to MS-EMF documentation. Change-Id: If4c71b52e5236441837e62590797ced8acd6c80f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106251 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit e179e53e3c703153bb0bb3155c1c6e2d25577fe0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107105 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-04include cstddef for gcc11Jeff Law1-0/+1
Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107204 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-04related: tdf#127086: PPT: export custom shapes as BitmapXisco Fauli1-1/+1
this way the cropping is kept after roundtrip found while working on fix for tdf#128501 Change-Id: I5cf023b469407d5a70d83cbb5b499b2a1d6310e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107051 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins (cherry picked from commit 0956226ca535a62ab22d8d2502b159037c327f7d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107095 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-12-04Colibre:Update Merge & Split Cells and Select TableRizal Muttaqin24-20/+12
Change-Id: Ibeab169f4430ae269e96e099c113a93279af9a59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107155 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit 9e190373f3ea999d15b8d6f84a7d35481e6dc971) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107198 (cherry picked from commit a95f5e24e64948f66d49652e967c55e938800599) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107199 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-12-02mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem pluginsMichael Stahl2-1/+9
They were already compiled in some way. Change-Id: Ic1b8563a53bad5be03bce2c0d3d2cf841e303f02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107007 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107028 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-02tdf#135202 mariadb-connector-c: enable native_password pluginMichael Stahl2-1/+2
... and remove dialog authentication plugin; it quite uselessly defaults to asking for a password on stdin, unless a function symbol is defined by the library that links the connector static library. There are more authentication plugins but no idea if those are needed. Change-Id: I88ee9629e4763fb548c3f294b552cff3d739e6cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107006 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b746633b2b251695134e7f8c268a75e45cf97c82) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107022 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-02tdf#138471 wrong adjustment used for spinbuttonCaolán McNamara1-1/+1
resulting in one adjustment used by two spinbuttons Change-Id: I939b00301699288fd8516cb7d6b8cd11c53c9573 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106949 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-12-02tdf#138427 focus set to wrong input boxCaolán McNamara2-4/+9
Change-Id: I4c1d3aa720f280f0ec1a3764d55f1d95ebd3180d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106951 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-12-01tdf#135479: Seems we need the more broad entitlement for Java's sakeTor Lillqvist1-1/+1
Sad, but OK. This reverts part of 2c366aae9263dc4115b054fe74b90cabea61fa0b. Change-Id: I6b74c871e3ec2408f833a5e2b652fd19cb7a2c0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103230 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106994 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
2020-12-01sw_fieldmarkhide: fix getFieldMarkFor() to return innermost fieldMichael Stahl1-3/+4
... like it's supposed to; if it finds the outer field and then the next field is inside but ends *before* the rPos then the loop is erroneously terminated. Change-Id: Ic5e469d1c05cecd7feca275dc1689af2c40567f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106710 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 6a11f94ab366e1d736e97e31e908e86aa5d8b533) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106689 (cherry picked from commit fd596591b385a8b03459a7dd3f79e65a59f530f4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106939 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-01tdf#134626 assertion in ~SwTextNodeCaolán McNamara1-7/+4
taking the simplest example of... http://bugs.documentfoundation.org/attachment.cgi?id=167361 a) on ctrl+v paste into the new document: DocumentContentOperationsManager::CopyImplImpl is called and that (at "Also copy all format templates") causes SwTextNode::ChgTextCollUpdateNum to call rDoc.GetNodes().UpdateOutlineNode(*this) so the new paragraph is now set as an outline node of the document DocNodes that seems perfectly reasonable b) ctrl+v again no new paragraph, text appended to node of a) c) ctrl+z SwUndoSaveContent::MoveToUndoNds is called and rNodes.MakeTextNode is called to make a new TextNode to move the content into. The SwNodes the TextNode is created in are rNds = rDoc.GetUndoManager().GetUndoNodes(), i.e. the undo nodes. MakeTextNode calls... SwTextNode *pNode = new SwTextNode( rWhere, pColl, nullptr ) and the SwTextNode ctor unconditionally does... GetNodes().UpdateOutlineNode(*this); so its set as an outline node in those undo SwNodes In SwNodes::MakeTextNode right after the SwTextNode *pNode = new SwTextNode( rWhere, pColl, nullptr ) call we have... // call method <UpdateOutlineNode(..)> only for the document nodes array if ( IsDocNodes() ) UpdateOutlineNode(*pNode); That seems odd, because we have *already* unconditionally called UpdateOutlineNode in the SwTextNode ctor. d) ctrl+z The SwTextFormatColl is destroyed and SwTextNode::TriggerNodeUpdate is called for the TextNode of a) and is updated. It is also called for the TextNode of c) but due to... // #125329# - assure that text node is in document nodes array if ( !rDoc.IsInDtor() && &rDoc.GetNodes() == &GetNodes() ) c is *not* updated, so on eventual dtor of c the assert fires. Change-Id: I56f9b00dd4665fd44359a01baef66c82937c2781 --- If the conditional UpdateOutlineNode call in SwNodes::MakeTextNode is the right thing to do where only TextNodes in the DocNodes should be updated, then presumably the equivalent call in the SwTextNode ctor should be also conditional, making that MakeTextNode call redundant in any case. ChgTextCollUpdateNum always calls rDoc.GetNodes().UpdateOutlineNode(*this); which suggests that the SwTextNode::ChgFormatColl function should rely on that to call UpdateOutlineNode and not call it directly to also avoid a UpdateOutlineNode in the undo nodes Change-Id: Iedc3fb4d41c24dbbe41fbac259abe41d3757be09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106011 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 138cf950dcdc8a1240452cad6867e197279f42b0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106937 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-12-01Resolves: tdf#138549 use GetSpecialTextBoxShadow to identify ScPostItCaolán McNamara2-15/+7
instead of a 'special' name which causes undo-related causes side effects Change-Id: Id36b0b5360ddde3469721a7c837fe3942af08209 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106925 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-28tdf#138466 Crash when creating different scenariosNoel Grandin1-2/+3
apparently this is a regression from commit 4176beb7ef831152ce92ac3fa31314438635ec2c Author: Noel Grandin <noelgrandin@gmail.com> Date: Sat Sep 12 18:21:44 2020 +0200 tdf#133327 fix calc loading background color with many cols but I have no idea how or why, so just fix the crash. Change-Id: Ia2f056fc53527338c431d3b34bb64e6eedc8e955 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106799 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 52aebe6986bcec07071adb3f94d6c09fea147044) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106748 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-28tdf#137745: crash, when deleting tables and changed relationship isn't changedJulien Nabet1-0/+5
bt here: https://bugs.documentfoundation.org/attachment.cgi?id=166782 some explanations here: https://bugs.documentfoundation.org/show_bug.cgi?id=137745#c8 Change-Id: I1d9dc8d2e3ad7e3e36c4687cb9b2c5990f2d2c8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106715 (cherry picked from commit 4335810b00abb9b00a9d81caa5ffe09a3ea927fd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106743 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins
2020-11-27Adapt solenv/flatpak-manifest.in to312a33b7636334f6ce3b6d1702bc5d3e45215601Stephan Bergmann1-3/+3
..."Update language-subtag-registry to 2020-09-29" Change-Id: Idea4df8f6a920cbceb37d5156417f6979d7a4fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106718 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 25bb4c31a68acd4526176580be72a9d4d626d013) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106731 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-26Related: tdf#136272 accept 1.79769313486232e+308 as DBL_MAXEike Rathke1-1/+20
This does not solve writing the badly rounded value, which still has to be fixed, but at least be able to read/convert it back as double max value. This is not even used in the bug scenario because the "fake" condition in that number format is discarded anyway because it was only written to satisfy ODF, but it helps in case a 1.7976931348623157e+308 value was entered/used on purpose. Change-Id: I413dd93d5a3c4df609fd42a3133d6d82c34afff0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106586 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit ee2cc952eeb5385ee37485c822d7ad7abd8fb989) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106527 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-26tdf#138130: sw_uiwriter: Add unittestXisco Fauli2-0/+30
Change-Id: If7eca097e83003d657cc39ae617eaccabcf62a5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106610 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106633
2020-11-25tdf#138130, tdf#123621 sw: fix textbox position according to DOCXTibor Nagy4-3/+22
i.e. when spAutoFit is present in DOCX, and size of the textbox is relative. See also commit cab956c480eb4f619580285c7b9a15b9e6d9b780 (tdf#112312 DOCX legacy shape export: keep fixed size). Co-authored-by: Attila Szűcs (NISZ) Change-Id: I29af97001954ad353a386164b68cd22f6230e3e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98401 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> This commit also includes: Clean-up of commit I29af97001954ad353a386164b68cd22f6230e3e5 Change-Id: I1963a5d899da2d122e60c4d87ca32aba4fb1f32a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102449 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106589
2020-11-25bump product version to 7.0.5.0.0+Christian Lohmaier1-1/+1
Change-Id: I3b57ab8271e712227fec602abc8a670608e55f62
2020-11-25crashtesting: make tdf129410-1.ods not crash on loadCaolán McNamara1-1/+2
Give its multiple anonymous ChartListeners unique names Maybe ScMyOLEFixer::FixupOLEs should instead skip calling CreateChartListener if getPropertyValue(sPersistName) >>= sName succeeded but has an empty sName result. Change-Id: I0741694ee692aaa22e0441a5e09748eb67e8dbf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106066 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106363 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-11-25tdf#138430 toolbar bullet dropdown should have a scrolledwindowCaolán McNamara4-12/+18
as should the matching dialog pages Change-Id: Ib327d3c02d1bc5ae11a6a76d52c9e17803f05534 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106436 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-11-25Better handling of Java filesStephan Bergmann2-1/+6
Change-Id: Ifa662be39ac7d35241ee31956e2556b7ba3b5a02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106558 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 696739056f37430154d6333b8f7228d1c44d09b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106520 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-25tdf#137662 set focus in combo/list box on clickCaolán McNamara1-0/+14
backport the part of commit d2f1cd004310b9ea6654d17fddc11cb08e884c90 Date: Fri Jun 26 20:57:29 2020 +0100 that sets the correct focus on click Change-Id: Ia053925f5e541642720892dfe2edc27995e84a61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106414 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-11-25Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-7-0' to 60c5bafea5acf84c0147812a50516136a4225d88 - update translations for 7.0.4 rc1 and force-fix errors using pocheck Change-Id: I14fb846e0ef6fbb92b944a25f9470530c172910f
2020-11-25tdf#138253 sw textbox: fix content of draw format on undoMiklos Vajna3-0/+41
Regression from commit da4f9b77a6cd39b1ae5babdd476d1575c8b9371c (tdf#135149 sw: fix deleting textbox of as-char shapes, 2020-09-07), the crash was caused by a user-after-free triggered from the X11 clipboard code. This could happen beause the clipboard document had a draw frame format, which has an SwNode pointer, but the SwNode instance was outside that clipboard document, and the owning document is already gone. So by the time the clipboard document would be deleted, the SwNodeIndex can't de-register itself. The root cause was that the doc model was corrupted after a cut of a textbox + undo: the textbox pointers of the fly/draw formats were OK, but not the SwFormatContent of the draw format. (cherry picked from commit 42e8e16cf93dcf944e5c1106f76aaa32057c0397) Conflicts: sw/source/core/layout/atrfrm.cxx Change-Id: I5761b72948caca397320aed801559e8493c33e1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106539 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-25tdf#131970 enable tab-cycling between VerticalTabControl membersCaolán McNamara1-0/+2
Related: tdf#131970 icon-switcher should be in single-selection mode Change-Id: I7d009c2345cc7b3a3c692bb8734d9939ce465db2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105764 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-11-24fix unit-test with non-pdfium buildNoel Grandin1-1/+4
otherwise testSwappingPageNumber will crash accessing out of bounds element in vector. Change-Id: I07499e79d523931e1f3cc02a5150f033e1ea9578 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101094 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 17798a503bc67f2a38f4b558e37447d1ea8f4623) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106511 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara2-0/+34
due to an out of bounds array access in raptor_xml_writer_start_element_common use a better fix than the initial suggestion See: https: //bugs.mageia.org/show_bug.cgi?id=27605 https: //www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: Ida4783a61412ffce868eacf81310da338d3e2df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106249 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-11-24tdf#137662 ignore focus in dropdown if dropdown is hiddenCaolán McNamara1-3/+11
Change-Id: I0263fb832f31c6926ac63cab79ce8fd0b9548581 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106245 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-11-24Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macroCaolán McNamara1-3/+8
Change-Id: I05064f7e9216c9c43b49950b309afe72466857a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106242 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-11-24Make python3 build on macOS 11, including for arm64Tor Lillqvist2-0/+60
A combination of what is two separate commits in master. Change-Id: I92ac0c500388730eca0be4766f07b1af2d2808e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106471 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Make bridgetest exercise parameter passing in the C++/UNO bridge harderTor Lillqvist5-13/+126
The C++/UNO bridge for macOS on arm64 currently uses the Linux code. Apple's ABI uses slightly different parameter passing on the stack, though. See https://developer.apple.com/documentation/xcode/writing_arm64_code_for_apple_platforms?language=objc That has not been taken into account yet in the bridge code. The bridgetest, when run on macOS on arm64, didn't notice, sadly, but succeeded. With this change it crashes, as one would expect it to do. Add one more byte and short parameter to the setValues(), setValues2() and getValues() calls in the XBridgeTestBase interface. The stack allocation for those [in] parameters to setValues() differ between the Linux and Apple ABIs. Add corresponding attributes to the interface, and members to the SimpleTest struct. The changes to the source files in the cli subdirectory (C++/CLI, VB.NET, and C#) are done blindly as they aren't compiled even on Windows currently. Most likely the changes to them are incomplete and erroneous. Change-Id: I6f689a130d89b23cad9918829107d7da49a79c55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105770 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105888 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106470 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Cosmetic change to make it easier to see which parameter is the nthTor Lillqvist4-108/+277
Consequently put each parameter/argument on a separate line for the get/setValues methods. Will make it easier to add more parameters of such types and at such positions that they catch errors in the C++/UNO bridge on more platforms (specifically, the one for macOS on Apple Silicon). Change-Id: I68578d0401358317f3baf913ef4d53009c8f5f2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105633 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105887 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106469 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Make --without-webdav work even with --enable-mpl-subsetTor Lillqvist1-1/+3
Change-Id: I319e0b3aefa721f2503494783af6d73470f592a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105271 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106468 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Fix nss build for x86_64 on an Apple Silicon MacTor Lillqvist1-0/+3
Change-Id: I337f2a8e777394e586f659fadd819cf7dfc0a332 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104546 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106467 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24The config.{guess,sub} in $SRCDIR is good for external projects, tooTor Lillqvist3-3313/+1
No need for the older second copies in solenv/gbuild. Change-Id: I088f7d06b0727d1b336e3ba314b5c874d8ce3776 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103027 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106466 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Make the C++/UNO bridge work on macOS on arm64Tor Lillqvist9-13/+370
Use the same code as for Linux on aarch64, with minor additional hacks. (There are slight differences in the ABI. See https://developer.apple.com/library/archive/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html The run-time code generation requires use of a new API on macOS to work: See the use of pthread_jit_write_protect_np() in bridges/source/cpp_uno/shared/vtablefactory.cxx. Unlike the arm64 ABI used on Linux, on macOS (and iOS, but we don't really use the C++/UNO bridge for iOS) we need to pack parameters smaller than eight bytes according to their natural alignment. Bytes take one byte, shorts two bytes aligned at a two-byte boundary, etc. For some reason, when compiling for arm64-apple-macos, the symbols for the type_infos for the UNO exception types (_ZTIN3com3sun4star3uno16RuntimeExceptionE etc) end up as "weak private external" in the object file, as displayed by "nm -f darwin". We try to look them up with dlsym(), but that then fails. So use a gross hack: Introduce separate real variables that point to these typeinfos, and look up and dereference them instead. If this hack ends up needing to be permanent, instead of having a manually edited set of such pointer variables, we should teach codemaker to generate corresponding functions, and look up and invoke them to get the std::type_info pointer. When compiling for x86_64-apple-macos, the type_info symbols end up as "weak external" which is fine. (This is a combination of what was two patches in master.) Change-Id: I05f46a122a51ade1ac7dccd57cb90e594547740e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106465 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Use <alloca.h> for macOS and iOS, tooTor Lillqvist1-15/+1
Change-Id: I20f349cc03fe28536470c19f2559cc5414b823fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100284 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106464 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Update config.{guess,sub} with latest versions and handle fallout of thatTor Lillqvist7-334/+432
From http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD . This time, do not apply the add-on change from 25a09c8776cc6088a5b2bf13dc84eb386c26bb7e to config.sub, but keep it pristine. Instead, let's start using the name "aarch64" instead of "arm64" for macOS and iOS in the autofoo context, as that is what those tools call it. Clang and Apple call it arm64, though. Change-Id: I1e05866c5fb08e0800cdfeaf7f6a71bfb43d1777 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100272 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106463 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Replace brittle gcc3_linux_aarch64 vtableSlotCall with pure assembler codeStephan Bergmann3-65/+75
* For one, as discussed in the comment at <https://gerrit.libreoffice.org/c/ core/+/91978/2#message-97da6c6ece7ae7bd49e9eb4843be333192fcc057> "Port to FreeBSD aarch64": "So it looks like Clang does not treat those register asm as we expect it would, at least on aarch64. "Witness a local Linux recent master --with-distro=LibreOfficeAndroidAarch64 [i.e., using Clang] build's > $ llvm-objdump --disassemble instdir/program/libgcc3_uno.a [...] > 0000000000000000 <vtableSlotCall>: > 0: ff 43 03 d1 sub sp, sp, #208 > 4: f4 4f 0b a9 stp x20, x19, [sp, #176] > 8: fd 7b 0c a9 stp x29, x30, [sp, #192] > c: fd 03 03 91 add x29, sp, #192 > 10: a8 43 00 91 add x8, x29, #16 > 14: bf 83 1d f8 stur xzr, [x29, #-40] > 18: e0 07 04 a9 stp x0, x1, [sp, #64] > 1c: e2 0f 05 a9 stp x2, x3, [sp, #80] > 20: e4 17 06 a9 stp x4, x5, [sp, #96] > 24: e6 1f 07 a9 stp x6, x7, [sp, #112] > 28: e0 07 00 6d stp d0, d1, [sp] > 2c: e2 0f 01 6d stp d2, d3, [sp, #16] > 30: e4 17 02 6d stp d4, d5, [sp, #32] > 34: e6 1f 03 6d stp d6, d7, [sp, #48] > 38: a8 03 1c f8 stur x8, [x29, #-64] > 3c: a0 43 5e b8 ldur w0, [x29, #-28] > 40: a1 03 5e b8 ldur w1, [x29, #-32] > 44: a5 83 5e f8 ldur x5, [x29, #-24] > 48: e4 03 08 aa mov x4, x8 > 4c: e2 03 01 91 add x2, sp, #64 > 50: e3 03 00 91 mov x3, sp > 54: f3 03 01 91 add x19, sp, #64 > 58: f4 03 00 91 mov x20, sp > 5c: 00 00 00 94 bl 0x5c <vtableSlotCall+0x5c> > 60: 60 06 40 a9 ldp x0, x1, [x19] > 64: 80 06 40 6d ldp d0, d1, [x20] > 68: 82 0e 41 6d ldp d2, d3, [x20, #16] > 6c: fd 7b 4c a9 ldp x29, x30, [sp, #192] > 70: f4 4f 4b a9 ldp x20, x19, [sp, #176] > 74: ff 43 03 91 add sp, sp, #208 > 78: c0 03 5f d6 ret [...] vs. [this commit's vtableslotcall.s; see below for details]. "And also latest Clang 12 trunk still does e.g. > $ cat test.c > void f(long); > void g() { > register long volatile a asm ("x8"); > f(a); > } > $ clang --target=unknown-linux-aarch64 -S -O2 test.c > $ cat test.s > .text > .file "test.c" > .globl g // -- Begin function g > .p2align 2 > .type g,@function > g: // @g > // %bb.0: // %entry > sub sp, sp, #16 // =16 > ldr x0, [sp, #8] > add sp, sp, #16 // =16 > b f > .Lfunc_end0: > .size g, .Lfunc_end0-g > // -- End function > .ident "clang version 12.0.0 (git@github.com:llvm/llvm-project eb31ddd71eb44d53ebe12a09c9587198bb6f2a2e)" > .section ".note.GNU-stack","",@progbits > .addrsig "(This is probably also the underlying issue that eb15ac837e06087fb8148330e9171d6697d89ee6 'android: Avoid throwing exceptions through the bridges' tries to hack arond.)" * For another, this also gets rid of the dddb527db1562f30a2a2b20338dfc8458086a4a9 "Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx" hack. The contents of the new vtableslotcall.s is effectively the GCC 10 -S output of the old vtableSlotCall C++ function from cpp2uno.cxx. (And as cpp2uno.cxx only takes the address of vtableSlotCall, never calls it directly, it does not matter that it declares it with an imprecise extern "C" void vtableSlotCall(); signature.) Change-Id: Icfbf0622a47825ff7cf21008de27d3da6a2f0ebd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99660 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106460 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Avoid warning about deprecation in macOS 11.0Tor Lillqvist1-0/+3
Change-Id: Ie1a7e19093b439eb133632ee881e1e3dbe58132d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98176 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106459 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Avoid unused parameter warning in the !HAVE_FEATURE_PDFIUM caseTor Lillqvist1-0/+1
Change-Id: I218265f0bda7cdfcae523ea386edaec1a9143cef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106283 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106458 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Avoid unused parameter 'pImpl'Tor Lillqvist1-4/+6
Change-Id: I8dd30ed3ffffa0e5340b32ce4399dd05cc57e2b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105962 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106258 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106457 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24There is no QuickTime frameworkTor Lillqvist1-1/+0
The reference was a leftover from 32-bit times. Change-Id: Ie453a4c644787a49f8742eab4b4ea9d49cddf32d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98175 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106456 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-24Colibre: tdf#138350 fix wrong color from monoline color to these HEXRizal Muttaqin32-16/+16
color values: - black : 000000 - magenta : ff00ff - green: 00ff00 In order to obey color replacement function Change-Id: I575709a84b83e7bf61f089477d5edd8810f880ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106391 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit 6c5fa6b299b1736bd37c7f0d901418b4a9401df0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106438
2020-11-23avoid Skia floating point position fixups for rectangles (tdf#137329)Luboš Luňák1-16/+36
Avoid to toSkX()/toSkY() tweaks for rectangular areas, so with AA enabled it leads to fuzzy edges, and rectangles should line up perfectly with all pixels even without tweaks. Change-Id: I45bf5a57a9f2d941eb7ec224992fc452481a2f98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106060 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 5b292e878703ebc32e875406f4116cba145a9042) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106434 Reviewed-by: Caolán McNamara <caolanm@redhat.com>