summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-06-22sw: add BIRT layout test documentMichael Stahl2-0/+6
This nested table is an example that was broken by commit 91b2239783dc716bd71ce7962bfd7e341dfe4175 - if loaded with a wide window, it goes into layout loop; if loaded with a tall window size where page 2 is visible, strangely it doesn't loop. Change-Id: I5e73cfcd928ff1a321667c1a75b0ba7f348d4b77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117587 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a41c71838d4662adf1ada9d46ec6e070cae7e695) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117603 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-22tdf#116501 sw: layout: check for flys in SwTabFrame::ShouldBwdMoved()Michael Stahl3-9/+45
On loading, this hits loop control warn:legacy.osl:580715:580715:sw/source/core/layout/layact.cxx:543: LoopControl_1 in SwLayAction::InternalAction This is because there's a fly frame 404 anchored at the last text frame 353 on page 2 inside the nested table 347. ShouldBwdMoved() sees that there is space on the bottom of page 2 and hence the follow flow row joined, but then it immediately splits again in the same way as before due to the fly with WrapTextMode_NONE. But then the outer table's cell 273 (upper of 347) is invalidated again, hence the loop. Try to check for overlapping flys in SwTabFrame::ShouldBwdMoved() by reusing CalcFlyOffsets(), which is ... not quite ideal, but perhaps better than copy-pasting half of it to a new function. This should have less side effects than the previous fix, but a problem remains that clicking on the shape on bottom of page 2 causes the layout to go wonky, but that was also the case with previous fix. Note there's a check of SwLayouter::DoesRowContainMovedFwdFrame() there already, but that doesn't help because it will only detect when the fly itself was moved forward, but in this case the fly remains on the page. Also likely it wouldn't be a good idea to move a text frame forward if the only thing of it that fits on a page is an anchored fly (i.e. its follow has mnOffset=0) because that can be intentional. Change-Id: I0376f7dcb784c006990336233c97f5093aaccb77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117473 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f1439db62eb36ef5fbc9111b87dc4e0f24b3cb86) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117602 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-22Revert "tdf#116501 fix freezing at embedded text tables"Michael Stahl4-38/+3
This reverts commit 91b2239783dc716bd71ce7962bfd7e341dfe4175. This breaks documents that have many nested tables. For example Eclipse BIRT generates reports with tables nested 8 levels deep, they run into the counter in no time and, ironically, one goes into a layout loop because of this counter. Change-Id: I7451d01787903bbc60b305da3dc72f8259175e97 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117472 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ee042a371e98cdcc59848f0b953f1ce545e18e31) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117601 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-22Resolves tdf#140360 - Provide option to turn off sidebar's minimum widthHeiko Tietze3-2/+11
Boolean option Sidebar:General:MinimumWidth introduced defaulting to true; if false the sidebar width is under full user control Change-Id: Iab1413a83adf90461feb5d6416aad174439392ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116715 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit f43fdcad400b6ff51f0810d923fe75d5a2cfde0c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117414 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-21tdf#141311: Rotation spinbox in sidebar used to have 2 decimal placesKatarina Behrens2-1/+2
regression from weld-ing (c85fcc6e1994eb8e079aaca85066ab4d67149c15) Change-Id: Iad0725fd4542ecdddb65092846dbf9d103016d9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117408 Tested-by: Jenkins Reviewed-by: Katarina Behrens <bubli@bubli.org> (cherry picked from commit 7a717c8b9319edcc12e50ab78554b8e0e7049cbf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117419 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 1bec8a3d3b16bb8881bd49f58d8786421ff5f839) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117554 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-21ofz#34221 avoid OOMCaolán McNamara1-15/+17
Change-Id: I1987d39ea8ff195b397b0ee3fb0e45f9bfbfb572 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117516 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-21tdf#142873: Fix print preview zoom-out zoom-in buttonsJulien Nabet2-4/+4
.uno:ZoomOut has been renamed .uno:ZoomMinus .uno:ZoomIn has been renamed .uno:ZoomPlus Change-Id: I06e7e66550399e53032a0df39a98846982acba48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117279 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit c21398066b6bf630070ed291456f2663e06d94b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117427 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-06-19tdf#142852 forward surrounding-text requests to an active drawing editengineCaolán McNamara1-1/+12
when present. As we do for related CommandEventId::[StartExtTextInput/EndExtTextInput] Change-Id: Ie5b57c8a8a1a258efc2be079a2674b1ca620dc9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117421 Tested-by: Jenkins Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-18tdf#127028 "bpmn" template should have ext. otg instead of ottTomaž Vajngerl2-7/+7
"bpmn" is an template for draw documents and not text documents (writer) so it should have the extension otg and not ott. This is also important for the template manager as it categorises the templates based on the extension, so the bpmn was not categorised correctly. Change-Id: I503b972711830dc3c5ab98d9c24f974862ffc540 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116775 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit e9a824dd6c1c33777461874d9892343d193c867d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116907 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-18Update git submodulesOlivier Hallot1-0/+0
* Update helpcontent2 from branch 'libreoffice-7-1' to 0ef840bfd6928f312b3ece83c5a8bbd225767646 - Mute l10n on some internal field names Change-Id: Ie794e15c31def6111eccd83f3e7a744984045cf6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117310 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 0849d16f3b86339a8906c496f89db64d2995fa6f) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117311
2021-06-15Adapt to flatpak-builder 1.0.14 split "dest" + "dest-filename"Stephan Bergmann1-88/+176
see <https://github.com/flatpak/flatpak-builder/issues/399> "flatpak-builder 1.0.14 breaks build of org.libreoffice.LibreOffice, empty /run/build/libreoffice" Change-Id: Ia6383d8afb97396cb690a9859fc5d1c8f513970e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117263 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-15Resolves tdf#142513 fix zoom caller handlingJim Raykowski8-21/+23
Calling ZoomPlus has always executed shell SID_ZOOM_OUT case handling. ZoomMinus, which replaced ZoomIn, does SID_ZOOM_IN case handling. This patch changes ZoomPlus to do SID_ZOOM_IN case handling and ZoomMinus to do SID_ZOOM_OUT case handling and makes appropriate changes required by these name changes to provide expected zoom results in all module shells that have handling for these calls. Change-Id: If148f4f7866bfc8fc6452ad1c1dace723a125ef6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116287 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit ec629c5ee22d02f99d66a5cf975ce239876b7f4d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116702 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-15Resolves: tdf#142767 cannot use itemid of 0 in ValueSetsCaolán McNamara1-3/+4
Change-Id: I2c2b655b512e4e7869fe3784f1b073ecdbd0dac9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117123 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-14Avoid Clang -Werror,-Wunused-command-line-argumentStephan Bergmann1-1/+1
> [CXX] bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx > clang-12: error: argument unused during compilation: '-fno-stack-clash-protection' [-Werror,-Wunused-command-line-argument] as seen e.g. on macOS 11.1 ARM64 when building against Clang 12 trunk. Clang supports -fstack-clash-protection on > $ clang --target=x86_64-unknown-linux-gnu -fstack-clash-protection -fsyntax-only -x c - </dev/null but not on e.g. > $ clang --target=aarch64-unknown-linux-gnu -fstack-clash-protection -fsyntax-only -x c - </dev/null > clang-12: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument] or > $ clang --target=arm64-apple-macosx11.0.0 -fstack-clash-protection -fsyntax-only -x c - </dev/null > clang-12: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument] Change-Id: I98625bb7ed37bf00e97634c1c8d1f87fe3263af9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109719 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117134 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-14Resolves: tdf#127013 differentiate non-/array separators and restrictEike Rathke2-28/+61
This is a combination of 2 commits. Resolves: tdf#127013 differentiate non-/array separators and restrict Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117068 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit bb54d6d8241a06a6772052b77b67d6a4f686426c) Related: tdf#127013 Check loaded separators for validity ... not only if something is present at all. That way future restrictions can reset separators. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117072 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 381bc9d9acd461415cf81eef71ec3dd935a07b62) I738bcb9e052e8dbecb0a6cd07bbae8f4a8ea1c35 Change-Id: I9ff6b816b0c7af9081954fa407a4d516a576a338 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117075 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-11tdf#140623 Chart OOXML import: set text overlap to falseTünde Tóth3-9/+17
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 <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6185d1ff0130b3d178d5e50eeb6944ab70db41f9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116905 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-11EMF tdf#142745 Improve performance of FILLRGN, PAINTRGN, EXTSELECTCLIPRGNBartosz Kosiorek1-13/+20
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 <gang65@poczta.onet.pl> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117022
2021-06-11tdf#142721 restore SwShellTableCursor if the orig selection was a single cellCaolán McNamara1-6/+10
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 <michael.stahl@allotropia.de>
2021-06-11allow system firebird 4Caolán McNamara9-197/+11
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 <caolanm@redhat.com> 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 <michael.stahl@allotropia.de>
2021-06-10tdf#136766 Zoom slider in calc print preview has white backgroundNoel Grandin2-17/+30
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 <noel.grandin@collabora.co.uk> (cherry picked from commit d693223b84b518701d308678801ccc50877490dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116904 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-10tdf#139658 OOXML: fix broken chart import at labels with quotesTünde Tóth3-2/+32
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 <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116998 Tested-by: Jenkins
2021-06-10Update git submodulesAndras Timar1-0/+0
* Update dictionaries from branch 'libreoffice-7-1' to 39658b5705671893f251e78655c3bb775a1b0d2f - tdf#141408 updated Ukraininan dictionaries Change-Id: I56aea01cbff18871bee91118f3f0701284caf87e Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/114308 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/115723 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-06-10tdf#141769 ScTextWnd has to be available before the editview is createdCaolán McNamara3-1/+18
Change-Id: Iec3b4180c4dc83723224b7122a1513cb8fe3ea0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116921 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-06-10dtd files are not xml files and shouldn't have xml headersCaolán McNamara17-20/+0
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 <michael.stahl@allotropia.de>
2021-06-10xmllint: Namespace prefix menu on menuseparator is not definedCaolán McNamara1-1/+1
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 <michael.stahl@allotropia.de>
2021-06-10tdf#142629 import psd image with transparent backgroundNoel Grandin2-4/+11
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 <noel.grandin@collabora.co.uk> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116941
2021-06-07tdf#142478 fix crash when searching and a viewshell change occursTomaž Vajngerl1-1/+11
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 <quikee@gmail.com> (cherry picked from commit 3b75f9add7ed80e803b0771d86892d6ca0f47e71) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116703 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-04update creditsChristian Lohmaier1-1908/+1968
Change-Id: I46f39d507cc96cbcd0d59b4edfcbb109efefdb69 (cherry picked from commit 0d42ca4f39160bdc28a5855261c227c63161dd8a)
2021-06-04Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-7-1' to ee29ff1930cf1907812365209b69326a17400969 - update translations for 7.1.4 rc2 and force-fix errors using pocheck Change-Id: Id46165455a260dfa20c5481c1e19a8b2a9426f5a
2021-06-03tdf#142546 broken formulas in .FODT filesNoel Grandin1-0/+5
regression from commit 81fe31d2c8977791f9b90ab1da4fbb1a778f87fb Date: Tue Nov 3 18:25:10 2020 +0200 use fastparser in XMLEmbeddedObjectImportContext Change-Id: Ib5bae81001ae97c574c078c979484f016c7d4323 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116664 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 06a983b213b8fb71fdac1004868d7b4fdd6a9833) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116470 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-02upgrade to Expat 2.4.1Caolán McNamara4-14/+16
drop ubsan patch in favour of fix applied as https://github.com/libexpat/libexpat/pull/398 Change-Id: I59eb9e24206b9a4cf323b7f7d48d8df0792a1c46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116102 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-01Adapt to hamcrest-2.2-3.fc35.noarch.rpmStephan Bergmann1-0/+2
Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116506 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116456 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-01tdf#142325 RTF import: tolerate invalid hex markup like "\'3?"Miklos Vajna4-5/+77
The RTF spec says \'hh is the expected form, where both "h" are 0-9, a-f or A-F. But Word accepts the bugdoc, so don't reject this input, handle \'<number><junk> as \'0<number>. At least the current case ignores the actual value, as it's a single character to provide a non-unicode value after \uN for old readers that don't support Unicode. Change-Id: Ib61247ab08278ca5012cc887cee26c7571c29fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116499 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 6fc8a6b0b52509d735971f079d7b1660559d475d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116457 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-06-01Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"Stephan Bergmann1-1/+4
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=aa475c4ac80733f85ba47b109fc1900f05e810e2> towards GCC 12, so that now "the return type is the original rvalue stream type not its base class." (And which would thus have caused issues like > sfx2/source/control/bindings.cxx:1323:19: error: dynamic_cast from rvalue to reference type '::std::ostringstream &' (aka 'basic_ostringstream<char> &') > ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : "")); > ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > include/sal/log.hxx:198:6: note: expanded from macro 'SAL_STREAM' > (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str()) > ^ > include/sal/log.hxx:341:20: note: expanded from macro 'SAL_INFO' > SAL_WHERE, stream) > ~~~~~~~~~~~^~~~~~~ > include/sal/log.hxx:155:68: note: expanded from macro 'SAL_DETAIL_LOG_STREAM' > SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \ > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ > include/sal/log.hxx:133:45: note: expanded from macro 'SAL_DETAIL_LOG_STREAM_PRIVATE_' > ::sal::detail::StreamStart() << stream) == 1) \ > ^~~~~~ now. While the issue with old libstdc++ that originally prompted the dynamic_cast was > sfx2/source/control/bindings.cxx:1323:19: error: no member named 'str' in 'std::basic_ostream<char>' > ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : "")); > ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > include/sal/log.hxx:194:40: note: expanded from macro 'SAL_STREAM' > (::std::ostringstream() << stream).str() > ^ > include/sal/log.hxx:336:20: note: expanded from macro 'SAL_INFO' > SAL_WHERE, stream) > ~~~~~~~~~~~^~~~~~~ > include/sal/log.hxx:155:68: note: expanded from macro 'SAL_DETAIL_LOG_STREAM' > SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \ > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ > include/sal/log.hxx:133:45: note: expanded from macro 'SAL_DETAIL_LOG_STREAM_PRIVATE_' > ::sal::detail::StreamStart() << stream) == 1) \ > ^~~~~~ .) The libstdc++ macro _GLIBCXX_RELEASE is reportedly available since GCC 7.1. Change-Id: I1ee6eabb66355c1f28b9d305cbd85bac50d6b0e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115121 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 1f3dddd6f21d91c429190ae314dadeec409f35f4, plus follow-up 95e26d3dce4f5a3b2d010d5ca47b4e450905a100 "tdf#142326: Adapt to 'libstdc++: Implement LWG 1203 for rvalue iostreams'") Change-Id: I7c8fef25e15fcfa9b83924467dc86dc2957fbd7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116447 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-31tdf#138302 partial revert tdf#108496: DOCX: redesign of override in listsJustin Luth5-0/+25
LO 6.4.5 commit cf13fe3e6f6a40f6db064d65d4514d13a23a31f0 was only concerned about DOCX, but just elinated shared code. So restore the shared code and just don't execute it for DOCX. It doesn't look like RTF was working before this, but this does fix DOC format. I looked for existing unit tests in rtf and doc, but none were found that hit this code. Change-Id: Id624f73181384f38e1ef9f27575e0fb82eea19c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116349 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> (cherry picked from commit f49e5902a3737c02fabf5bec23243ccb126426c4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116170 Reviewed-by: Justin Luth <justin_luth@sil.org>
2021-05-31tdf#136292: Fix crash on invalid JSON from the extensions APIMuhammet Kara1-1/+10
Change-Id: I91ed555f93173dee10e87025b231560693be50b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116390 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> (cherry picked from commit e98b0891d6e0f1d6be4e4a4761bd1ab16bfab85c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116168 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-28tdf#137199: sw: convert list format string to prefix/suffix for ODFVasily Melenchuk3-1/+29
Since internally LO is able right now to use list level format strings and prefixes/suffixes only for backward compatibility, there is a need for conversion from format string (like "%1.") to prefix ("") and suffix (".") still used by ODT. Change-Id: If4b459e1b25b7f0ce511e6ac2de0824bb2c43d05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116288 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116316
2021-05-28tdf#117957 WMF Replace ellipses with rects to fix tests on arm64Bartosz Kosiorek2-4/+4
The issue is caused by floating numbers, On x86_64 it is: 338.499728160392-445.269903703769 on arm it is: 338.499728160392-445.26990370377 As in test files, we have two ellipses (which are made from small lines), which points rounds differently on different architectures Change-Id: I44dd5c7b3b13f3b1680d5a3a8348d6f467cb2f7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116270 Tested-by: Jenkins Tested-by: René Engelhard <rene@debian.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116314 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2021-05-28tdf#139915 DOCX import: fix anchored obj position with to-char and TEXT_LINEMiklos Vajna3-13/+40
There were multiple problems here: - commit 8f1a1092d47947847e1d888b0284e8364c663d1f (tdf#97371 DOCX import: fix text covered by shape, 2016-01-28) disabled to-char anchoring for TEXT_LINE (e.g. "alignment top, relative to line") because changing the anchor type of a TextBox could not be changed, but this has been implemented in sw/ in the meantime, so it can be dropped - Now that the anchor type is to-char, we can set the vertical relation to TEXT_LINE, but Word's positive value is "below line", and ours mean "towards the top of the page, from the bottom of the line", so we need to drop the workaround of commit 3303a4c5f21874453e634d84408c50e7a0055a4d (tdf#135153 DOCX import: avoid line-of-text relation with to-para anchoring, 2021-01-18) Once these are in place, we can fix the remaining problem by inverting the vertical position of the shape, which instantly fixes the overlapping textboxes in the bugdoc. (cherry picked from commit 2f21e4f357ec60450df84ddd858c3cf0a4711b02) Change-Id: I895abb76d3bd3bbe3a84e5c27a77df722b96226a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116155 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-28tdf#142150 nothing already selected on MouseUp without previous MouseDownCaolán McNamara1-1/+3
if mouse down was on tooltip (possible on macOS) Change-Id: Icb4328fa6977356c3bac5f37d42e99ae8d4e4b98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116158 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-27add missing xmlns:loext to example_sl-SI.xmlCaolán McNamara1-1/+1
added to example.xml by commit 71ee09947d5a71105d64fd225bb3672dfa7ce834 Date: Tue Sep 19 15:37:04 2017 +0200 TSCP: add advanced classification dialog but not to example_sl-SI.xml Change-Id: I8aa46554867db8c51bd118b6cc87e649b922cdfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116157 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-05-26tdf#142467 crash on calling 'getInfoHelper' in final classCaolán McNamara2-1/+4
IPropertyArrayHelper & rInfo = getInfoHelper(); crashes when CandleStickChartType is final for unknown reasons. I see this with gcc-11.1.1-1.fc34.x86_64 in 7-1 locally but also in the fedora libreoffice-7.0.6 built with gcc-10 so this isn't a recent problem. #1 0x00007ffff6f4fe91 in cppu::OPropertySetHelper::getFastPropertyValue(int) (this=this@entry=0x5bdd588, nHandle=nHandle@entry=3) at cppuhelper/source/propshlp.cxx:549 #2 0x00007fffad45e9ff in chart::CandleStickChartType::getSupportedMandatoryRoles() (this=0x5bdd520) at chart2/source/model/template/CandleStickChartType.cxx:219 Change-Id: Ia029162587da1fc00df32866863deb186c7e11bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116153 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-26tdf137314 Add margin to CppunitTest assertionsJan-Marek Glogowski1-2/+2
The test had multiple failures on Windows with: oox/qa/unit/vml.cxx(79) : error : Assertion Test name: tdf137314_vml_rotation_unit_fd::TestBody equality assertion failed - Expected: 1490 - Actual : 1491 So add a 1px margin to all value checks. Change-Id: I70298db253299a57cc37eed482c0816d902fbeab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116192 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 60b98189281524c85b559ee3b6adc1381b793b9d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116154
2021-05-26Seperate SvxBackgroundColorItem from SvxColorItemGülşah Köse2-12/+78
SvxBackgroundColorItem derivated from SfxPoolItem instead of SvxColorItem. Casting is common usage to control if object is this or not. When we can cast SvxBackgroundColorItem to SvxColorItem we can not seperate them anymore. eg: Char color is a SvxColorItem and char background color is a SvxBackgroundColorItem. They can be hold together and we should understand they are different types. Change-Id: I7b1879a1b00de26c0b8a2d9f8d658aa3aef75ecb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116135 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116183
2021-05-26tdf#96061 Unset the highlight propertyGülşah Köse3-0/+38
When we have highlight property on specific part of the text the following texts were highligthing. To prevent this we unset the highlight property when we have not highlight property anymore. Change-Id: I802cde1c784afe47201a9ba4f41827dd0c705035 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115800 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116176 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-05-26Check first if there is such a "bin" directory before attempting to use itTor Lillqvist1-4/+6
In the test-install target in Makefile.in we remove the "bin" folder of the LibreOfficePython framework. Change-Id: Idf3d440c4f9465f21b5dcae60d4fc5ac21965dd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106284 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106398 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115914 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-05-26tdf#132752: docx import: improvements for first line indent in listsVasily Melenchuk3-1/+17
As far as I see, Word is using lists with id=0 and no list definitions to reset list numbering used in this paragraph. At the same time Word is still using some of default list properties. For example in this scenario parent style has defined first line indent, but in paragrath it is overwritten by "not existing" list=0 without definitions. To this moment I know about only first line indent behavior, but probably some other properties are also affected. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport16.cxx Change-Id: I344c907bb7a7b83a91f5727e13ad184fb44137b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115795 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116093 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-26Related: tdf#81757 Do not even try to re-enter ScDocShell::Do*Recalc()Eike Rathke1-0/+10
That happened when loading bug doc https://bugs.documentfoundation.org/attachment.cgi?id=103462 where form selection events fire asynchronous recalcul() and BASIC Main also calls recalcul. Change-Id: Ic27fb340c7b5019453723c7cabe2122905d400f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116133 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 807f3508c9319d7f94820ea1282e306594418fce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116152 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-05-25tdf#142479 on 'return' select the entry the cursor is in before calling SelectCaolán McNamara1-0/+8
Change-Id: Ic11f8a12c93d1999dd6fbe555b9823660eb703d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115968 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-05-25tdf#137314 apply conversion from vml angle unit 'fd'Regina Henschel3-4/+26
Fixes wrong rotation in tdf#109129 and tdf#142432 too, but they have further, unrelated errors. Change-Id: I7bd56876bb42b261fe425f80cf9beb639c3ac276 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116078 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116094
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 08:26:12 +0000