summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-23jsdialog: click action for drawing areaSzymon Kłos
Change-Id: I2434bec675559a97e5d251c6d6a958464b6db034 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96853 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-06-23jsdialog: generate JSON for drawing areaSzymon Kłos
Change-Id: Ic9402f0f7c891868790b657cd7e9860e46f3e8e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96852 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-06-23Move SalInstanceDrawingArea decl to header fileSzymon Kłos
Change-Id: I941b8f52a4c69c65c3ccbe08f3cf6d1427783f90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96850 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-06-23fix tinderbox_windows compile errorDennis Francis
Change-Id: Ibe3651b6c9f37ddac6cc628f9f3ade46f102c2dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96906 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-22lokit: Introduce new flag "sc_print_twips_msgs"...Dennis Francis
for conditioning all changes needed to allow calc messages in print twips coordinates. Change-Id: I407b4d4d4e0a1dfb2c4339cafa10b368b437c82d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96904 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-22add row/col limits to the JSONDennis Francis
Change-Id: I92cead8212f30d0cc9b811be21b6639830e84fa4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96903 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-22lokit: table-outline: skip empty collections...Dennis Francis
while encoding the information as string. Change-Id: I890efc4a9b60125c68c663a69569864308fdbdcf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96902 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-22Unit tests for ITiledRenderable::getSheetGeometryData()Dennis Francis
(Testing of groups/ouline case is not included) Change-Id: Ia53e5489c376d2d86461a9fd3db4f5b7dc963b99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96898 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-22Introduce ITiledRenderable::getSheetGeometryData()Dennis Francis
ITiledRenderable::getSheetGeometryData(bool bColumns, bool bRows, bool bSizes, bool bHidden, bool bFiltered, bool bGroups) and implement it for the Calc derivation (ScModelObj). The aim is to use it actively in LOOL instead of the interface: ITiledRenderable::getRowColumnHeaders(const tools::Rectangle& /*rRectangle*/) This is used by the LOOL to fetch the sheet geometry data for just the current view-area in the clients, so LOOL queries this everytime some client's view-area changes. Like the existing interface, the new one will provide all 'kinds' of sheet geometry info [col/row sizes(twips), hidden/filtered and grouping]. But the difference is, it generates data for the whole sheet (not view-area specific). So the method need not be queried every time the view area changes in the LOOL clients, and more importantly it enables the clients to locate any cell at any zoom level without any further help from the core. This means core needn't send various client(zoom) specific positioning messages in pixel aligned twips. It just can send all positioning messages in print twips uniformly to all clients. Change-Id: Ib6aee9a0c92746b1576ed244e98cb54b572778c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96892 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-22failed cell dependency check should not set invalid values (tdf#132451)Luboš Luňák
Calc's dependency check done before parallel formula cell group calculation tries to ensure valid cell values for all the dependencies of the group's cell, and if it detects a problem such as a cycle it bails out. But since ScFormulaCell::Interpret() simply bailed out without doing anything, other cells could use that cell's possibly incorrect value for their calculation and get their dirty flag reset. This fix adds a flag to mark that bailing out is in progress, which ensures the bail-out is short-circuited and no cell values are set. Change-Id: Ia93c70d456682e19ce533abd2cf65ce35ffed9ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96838 Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins (cherry picked from commit e1b6dcc97d6b5ff15b2e9341d3943ffc05aa3236) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96802 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-06-22Fix a chrash in LOKit (Japanese-only)Andras Timar
Change-Id: I09c8d3a129c0d1d2fab561add0447869156b193f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96682 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2020-06-22[cp] Be more relaxed with accepting certs in serfAndras Timar
The Desktop product uses neon, so this patch is for Online. When the WOPI-like host uses a self-signed SSL certificate, serf refuses to fetch resources from it, so Insert - Image and Create from Template operations fail. Related commit: a08552a8c36754930a3268e27aefee70d5cf21df But in case of serf somehow we do not trigger the interaction handler, we get an information message box with the text "Image file cannot be opened" So I decided to patch serf. The result is the same. * In Collabora Online 4.0.x we do not check the cert of WOPI-like host anyway. * In Collabora Online 4.2.x we optionally check the cert of WOPI-like host. The Create from Template and Insert - Image cases will be exceptional, where we won't check it. Generally it should not make a big difference. Change-Id: I3937bf450ef70f3a793ec1c793336d18209b6e62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96652 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2020-06-22tdf#121384 don't leave a bare trailing : in PYTHONPATHCaolán McNamara
and don't insert any empty path entries if that situation was to arise Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96707 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Jenkins
2020-06-22tdf#133990 sw_redlinehide: fix Undo with section before tableMichael Stahl
... at start of document. The section node wasn't included in the PaM passed to SwUndoDelete, so on Undo it called MakeFrames() starting from the contained table node and crashed when reaching the section's end node. Fixed, then it crashes in Redo, because SwDoc::DelSectionFormat() calls SetModified() which calls some event listener which causes EndAllAction() to be called, which by itself is scary and then it crashes because the nodes array contains a bunch of deleted nodes. Not sure if that SetModified() serves any purpose, but it's pointless in Undo. (1st crash is regression from 68880a3004623553bf1920ad8a4a4d2be4bca234) Change-Id: Iafdd073ca9577bf54dd5a8ad2eb8f8f110db93b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96620 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 57d488660572d62ef0371e50dcdd4ca7a6d98a14) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96634 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-22tdf#134009 sw: prevent spurious undos in SwColumnFrame::DestroyImpl()Michael Stahl
SwUndoFrameFormatDelete is created for every destroyed column frame. Change-Id: I11e0399487a41c52768175faf3a3699b302ad317 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96558 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 102a99e46bca9fb292cc1b2e7604020eb9ca43f4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96576 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-22tdf#134021 sw_redlinehide: fix crash if document contains only tableMichael Stahl
This sets the m_bTableDelLastNd flag in SwUndoDelete, so a SwTextNode is created so that there's something in the document, and there are 2 problems with Undo: 1. ~SwIndexReg assert because there's a shell cursor on the text node; could fix this with some PaMCorrAbs() but let's just call DelFullPara() which takes care of that. (this likely isn't possible in the !m_bTableDelLastNd case) 2. no frames are created in MakeFrames() because there's no node in the document with layout frames, so delete it at the end. (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48) Change-Id: I6d8535ae1a2e607d665660f149b344e817bc8ab0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96604 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 5d836621326c68decaae09f1911d2d036a251b43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96632 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-22tdf#132326 sw_redlinehide: no frames allowed in Undo SwNodesArrayMichael Stahl
This crashes in SwAccessibleParagraph::GetRealHeadingLevel(); the a11y should have been disposed earlier because the node it's connected to is in the Undo SwNodesArray. When SwUndoDelete::SwUndoDelete() calls SwNodes::MoveNodes(), all existing frames must be destroyed; the MoveNodes() would reset its flag temporarily inside a section, to delay creating the frames inside the section when moving to the live SwNodesArray, but this also prevents the deletion when moving in the other direction. (crash is regression from 723728cd358693b8f4bc9d913541aa4479f2bd48) Change-Id: I13719bf98ea96b8d68db3ee78cf7f4b61a99e7e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96734 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit a60dd9ef1361c5925803acaa5292e99277d1faf3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96701 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-22tdf#127635 sw_redlinehide: put point at the end of deletionMichael Stahl
SwWrtShell::Insert() is called with a selection, so it first calls DeleteAndJoin() to get rid of the selection. With redlining enabled, this leaves the cursor as it was before, so if the point was at the start it still is at the start, so the following Insert will insert at the start of the selection. But then AutoCorrect wants to do things and it uses TextFrameIndex and ViewToModelPos and gets a result at the end of the delete redline, while the cursor remains at the start of the delete redline. Avoid this by swapping the selection after DeleteAndJoin() (and also DeleteRange() for consistency) so that insertion happens at end of redline (swap "above" DoWithBreaks because it creates temporary PaMs). (regression from sw_redlinehide) Change-Id: Ib5b0475f610c2ce426e9202e9d325dd0cc451d5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96743 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 398ba26077f9029bdf6f7378bfc9ce8376b6f02d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96705 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-22tdf#131353: Fix build with poppler 0.86.0Martin Whitaker
Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789 Tested-by: René Engelhard <rene@debian.org> Tested-by: Jenkins Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> (cherry picked from commit b42ab78fb871924896b3cc38a7b2f1257151f711) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96639 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-22tdf#133981 sw_redlinehide: oops, InsertCnt_() is missing null...Michael Stahl
... pointer check. (regression from 55576842ec72a748d0bad123d41fa03c89fc136d) Change-Id: I4478c45d10ac516afd6360e4083b00d667c678fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96621 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 17f47b3972301273716466656e775f3f09d681d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96692 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-22tdf#134023 sw ui: stay at footer ONLY when showing controlJustin Luth
This adds a missing piece to LO 6.4's commit 342a5890dbcddccb4013e201e3ff3d9e6967e733 That tdf#84929 commit message suggested: One additional limitation could be added to only apply this if it is dealing with the footer, since in the case of a header there would be no screen-jump. and this bug report shows why that is necessary. I'm not sure why I didn't apply that immediately. Perhaps to help identify situations where the entire concept might be bad? Change-Id: Icea861bec45262eed88c38bb7eea910289c06870 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96487 Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit c3cf3e908add6b6617eb0ee12385fbd8a70a9887) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96494 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit df4585686eb56d95a871dd528ad06fd980a58591) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96505
2020-06-19Avoid unhelpful -Werror=stringop-truncationStephan Bergmann
...emitted at least by recent GCC 11 trunk (even with --disable-optimized, where optimization level traditionally has some impact on what warnings of this kind are emitted exactly): > tools/source/misc/json_writer.cxx: In member function ‘tools::ScopedJsonWriterNode tools::JsonWriter::startNode(const char*)’: > tools/source/misc/json_writer.cxx:42:12: error: ‘char* strncpy(char*, const char*, size_t)’ output truncated before terminating nul copying 5 bytes from a string of the same length [-Werror=stringop-truncation] > 42 | strncpy(mPos, "\": { ", 5); > | ~~~~~~~^~~~~~~~~~~~~~~~~~~ etc. Change-Id: Id96964b178b61879cf2373c5b418f5c9df4a226f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96593 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins (cherry picked from commit de32eb539bbcf291f9968ae12696e1317fdb855d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96749 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2020-06-19asan: need to use malloc instead of new for tools::JsonWriterNoel Grandin
because the LOK API expects memory returned from those calls to be malloc'ed Change-Id: If6fbfb60c433bd6e58bc90a9a90a90663e2e1c60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96676 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-19new json writer for LOKNoel Grandin
we shave about 3 memory copies off in the process, and make the class play nicely with our string types. Change-Id: I1f614fb35b1de499ac99e3b33ac638ad81054bed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96393 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-19android: fix the build output directoryHenry Castro
When compiling in a different build output directory, the "liblo-native-code.so" file is created in the source directory and it fails compiling the "online" project Change-Id: I4782a69796fb298e9c1a6c4370720b18587735e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95602 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-06-19android: Fix linking of liblo-native-code.so on x86_64Michael Weghorn
This is similar to commit c6dadf5035c8e1c31dbd3fccec167bd4a906bf54 ("commit android: Fix linking of liblo-native-code.so on aarch64."). Build previously failed with Linking obj/local/x86_64/liblo-native-code.so .../x86_64-linux-android/bin/ld.gold: error: cannot find -landroid_support clang++: error: linker command failed with exit code 1 (use -v to see invocation) make[2]: *** [../Bootstrap/Makefile.shared:62: obj/local/x86_64/liblo-native-code.so] Error 1 make[1]: *** [.../android/CustomTarget_lo_android.mk:18: .../workdir/CustomTarget/android/source/done] Error 2 make: *** [Makefile:282: build] Error 2 I quickly checked that the app actually runs on an x86_64 AVD and is able to open and display documents after successfully building with this commit in place. Change-Id: I92b3759af6a86a6717c287d035b6a1add3a9af7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85204 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95601 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-06-19nss: Fix Android build for x86 and x86_64Michael Weghorn
... which previously failed with cd freebl; make libs error: unknown target CPU 'armv8-a' and cd freebl; make libs error: unknown target CPU 'armv8-a+crypto' respectively. Change-Id: Ib8a6bfc615c4fb15a1e5dd3e55bba187ff34a891 Reviewed-on: https://gerrit.libreoffice.org/84369 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95600 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-06-19tdf#128502: Avoid potential crash in mobile app with multiple open documentsTor Lillqvist
Change-Id: Ibb819818db40b2f086e5c1f2330a7f8f2fcc1727 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95148 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-19lok: symbolic link to the "include" directory when builddir != srcdirHenry Castro
When compiling the android variant build in a different build output directory of the "online" project, it fails due to the missing "include" files. Change-Id: If9056788b3d043e4ae8ad3f799885995c0ab0cf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95603 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-06-19LOK: hyperlink were inserted as button instead of text objectPranam Lashkari
Change-Id: I393e5cb34d90fc6def6c62be9216df1acd9b5f4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96624 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-19lok: formula bar: disable tunneled tooltipsMarco Cecchetti
Tooltips overlaps the entered text. Change-Id: If003217fe1270a4a3ebc0ba9eee71cb8f6765760 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95792 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-19Fix sending reference marks for current selectionSzymon Kłos
When selecting range on mobile in validation dialog the message wasn't sent due to missing ViewShell Change-Id: Iaab543368469cd363b54b1a89f6983b8c01877ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94693 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-06-19tdf#133982 sw: fix Copy of document that starts with nested tableMichael Stahl
Started to assert with ef8427d12a63127a2eb867637699343d630545dd because a bookmark was created on the wrong node but this never worked. Change-Id: Ife01a3c8041b4c7d08b2d749dde77ced388f7215 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96556 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 4de190d55900387bc07971bac84f7cd52e329146) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96578 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-06-19tdf#134019: ofz#20904 check boundsCaolán McNamara
Change-Id: I5d6d381ebd359b233b309e08131f3dda21310d80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89620 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8e3a29110c8ad739bedeea90932663608d8d3935) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96573 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-19tdf#132944 sw_redlinehide: delete of insert redlineMichael Stahl
Because of an existing insert redline with SwComparePosition::Equal this hits the DeleteAndJoin() call in AppendRedline() and so what happens on Undo is that the SwUndoDelete first creates all the layout frames and then the SwUndoRedlineDelete creates the frames a 2nd time. Because this can happen not only for Equal but also Inside case, it appears best to prevent the "inner" Undo from recreating the frames; it's always SwUndoDelete. This is quite hacky... Change-Id: I4438dd09bb6c2edf8154d333de403483768755fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96233 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ad0351b84926075297fb74abbe9b31a0455782af) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96517 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-19tdf#132321 tdf#133957 sw: for at-para fly, ignore anchor SwIndexMichael Stahl
... because it's always 0, and not registered at the node; this fixes the case when it's anchored at a non-empty last node of a section. (follow-up to a0d0665060b75c1e7f0234b698c940d2f9d600f8) Change-Id: I627e11e84a2dcfc2944d3c9f3fd22e3c3785e505 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96350 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b314735568c1e9ab8ca52413017425bc2ef12973) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96341 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-19tdf#132093: Take aUIScale into account againStephan Bergmann
...which had inadvertently gone missing with bbab991c70e2a1867493d701168f49a0d0dcbd48 "Avoid -fsanitize=implicit-signed-integer-truncation in weld::MetricSpinButton" Change-Id: Idaccb7d1d088f1a3183f19deb3d8ca413d8b1440 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96470 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5e3ac497193794b4db22d23c8efa9065786d1b9f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96490 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-19Resolves: tdf#133780 allow sorting search result treeview columnsCaolán McNamara
Change-Id: I7d5b1ffdaf99fd2e28dfd124db0fbbd4036e2dd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95878 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
2020-06-19tdf#133898: get a context in default ctr (i18npool/calendarImpl)Julien Nabet
See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=161882 Change-Id: If5a6c5e2b52af9ef97af9522296aaa58352cfa69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96161 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 56e2183b4916888fa104b62411151401932d8f92) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96179 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 0634b66805f0f4bc3f45a44b1f6a984f17ff8a09) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96421
2020-06-19tdf#133957 sw: SelectAll should select fly in empty sectionMichael Stahl
Ctrl+A should select everything in the section; if the section is empty, there's no text to select, and then the shell will cancel the selection because SwCursorShell::HasSelection() returns false - so check if there are flys anchored there, which fixes the Copy. To fix Delete, a few more checks for empty selection need to be changed. Change-Id: If54160bdca976ad5f153b89cf8492f4da1e774b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96324 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 2d89b9929e85bede4c72684a12e7508751875f0e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96368 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-19rhbz#1847031 null-derefCaolán McNamara
Change-Id: Ic9327788ebf49ac1ab0d3463f2f1e4d87ef14cb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96339 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-06-18[cp] ReleaseNotesURLAndras Timar
Change-Id: Iff5941ffc49be5fe583ee8966d18b5e7277648ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96594 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-18tdf#133145 sw ContinuousEndnotes: fix moving endnotes to a previous pageMiklos Vajna
Regression from commit 4814e8caa5f06c4fe438dfd7d7315e4a2410ea18 (tdf#124601 sw: add ContinuousEndnotes layout compat option, 2019-09-30), the problem was that SwFrame::GetPrevFootnoteLeaf() did not take the new compat flag into account when determining the previous footnote page for endnotes. Do the same pattern here as the cases already handled in the above commit, just try to get the "last but one" and not the "last" page, since we try to move these endnotes to a previous page. (cherry picked from commit 35bb0594b2d977312ef06fc5262cc7592bc13d0f) Conflicts: sw/qa/core/layout/layout.cxx Change-Id: I77841a3a0fb68f054941184ee2a8aca0707d2a9c
2020-06-17Revert "Revert "Restore original $licensepath of the optional EULA of MSI ↵Andras Timar
package"" This reverts commit ce7c473dfb6a0eeab99811b29e205fa8b5379f9d. I don't remember why I had to revert my original patch on master a year ago. But for Collabora Office builds it has to be like this, apparently.
2020-06-17Fix 983db96a17630be906b868d2be811663f0d846f6Julien Nabet
warn:unotools.config:172285:172285:unotools/source/config/configitem.cxx:409: ignoring XHierarchicalNameAccess to /org.openoffice.Office.Writer/FormLetter/PrintOutput/AskForMergeFormLetter/FileOutput/FilePassword/FromDatabaseField com.sun.star.container.NoSuchElementException message: FormLetter/PrintOutput/AskForMergeFormLetter/FileOutput/FilePassword/FromDatabaseField /home/julien/lo/libreoffice/configmgr/source/access.cxx:436 missing comma + confusion in switch cases in SwMiscConfig::Load + typo Encyrpted->Encrypted Author: Gülşah Köse <gulsah.kose@collabora.com> Date: Fri May 22 11:51:33 2020 +0300 Add an option to create encyrpted PDF files with mailmerge. With that option user can create encyrpted pdf files with a password column in database via mailmerge. Change-Id: I1ae9bbeb3f69ed9c0ba51709852f8edd5f2dc683 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95033 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 90d3311b08cef7418376d183b7116223db3e627d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95248 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-16Add an option to send email encrypted PDF files via mailmerge.Gülşah Köse
Change-Id: I002e054b685bd3367c4183014adc1dbd0843a365 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96303 Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Tested-by: Gülşah Köse <gulsah.kose@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96479 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-06-16sw reqif-xhtml export: add a new RTFOLEMimeType parameterMiklos Vajna
This is similar to commit e0f20211a8048a87b078aa4cf0f28c0c847487ad (sw reqif-xhtml import: add a new AllowedRTFOLEMimeTypes parameter, 2019-12-16), except that was for the import and this is for the import. The situation was similar, SfxBaseModel::impl_store() still had the custom store parameters, but later functions lost it, so at the end OutHTML_FrameFormatOLENodeGrf() in the sw HTML export could not respect it. Fix the problem in a similar way, so the SfxMedium instance created for the duration of the export provides the custom options via SfxMedium::GetArgs(). Change-Id: I71d2c7920f42d98133f345703cfdfd50f0e8550c Reviewed-on: https://gerrit.libreoffice.org/85321 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96477 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-06-16detect inconsistent SUMIFS() ranges when range reducing (tdf#132431)Luboš Luňák
03b352b9599514e4e244e1907510713cf1331284 introduced reducing of the SUMIFS range to the cells that actually contain data, but tdf#132431 introduces incorrect ranges that lead to negative indexes, and correctness checking of ranges comes only after the use of these indexes. Change-Id: Ia13db83d222310d470a0a8ecef51dbdd7992d479 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95898 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 21cff8d14e2396a964cf9f2e4af1d43efdadb5c1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96144 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-06-16disable spurious SAL_WARNNoel Grandin
in the FastParser case, those name/prefix fields in context are not initialised, so don't warn for that case Change-Id: I485dd1b86d81ea2b6f03fa6a8ecf5fb23d46a8e1 Reviewed-on: https://gerrit.libreoffice.org/83153 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96433 Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-06-16tdf#128502: Add a FIXME commentTor Lillqvist
The view id concept is badly broken. Way too many wild assumptions that the "current" view is the one we expect here and there. For instance here. Change-Id: Icf36808b2c09f0b3fd8070deecf175ba7f52b5f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95508 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96363 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>