summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2 dayscurl: upgrade to release 7.71.0distro/lhm/libreoffice-6-1+backportsMichael Stahl5-9/+10
Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis. Disable new optional dependencies "ngtcp2" and "quiche". Change-Id: I595ed909c4e792ac3244643511a338b117e7f102 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit cb0c7e26e5708010b1fe941ae2f66134f31ed876) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97386 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 43130216127913d30074d3fe99c5706dcce44dee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97572 Tested-by: Michael Stahl <michael.stahl@cib.de>
8 daystdf#101830 sw: highlight empty 'invisible' input fieldsSerge Krot1-0/+23
Change-Id: Ibcf4f7ce88c7bf364510c522e224028aa4737790 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96717 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97098 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
9 daystdf#133859 Wizard service: reinitialize data of roadmapIlhan Yesil1-0/+1
Cherry-picked only part from master due to different class architecture in master.. In libreoffice versions before 6.4, an ORoadmap class was used in the wizard. There, if the ORoadmap data are reinitialized, the InCompleteHyperLabel object must be destroyed first, before it will be set to nullptr. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 54a3daec02f2eeada04efcd7958da4152db4611a) Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96925 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
9 daystdf#133270 MAILMERGE progress is not updated during export of many filesSerge Krot2-2/+5
See also https://gerrit.libreoffice.org/c/core/+/90686 for a similar change. Change-Id: I063394f7ef0a68c79366f09c9d2cf5775a57e640 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94663 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 80cea3682b2cf07f1685852cd8809d9db58a1cb5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95481 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit ef61c49236c2bc11175fb26e55870a06b3e92f0c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97042
2020-06-15tdf#45589 sw: invalidate on bookmark insertion/deletionMichael Stahl3-0/+47
Invalidate the text frames when a bookmark is inserted or deleted; also when MarkManager::repositionMark() changes the positions. The other calls of SetMarkPos()/SetOtherMarkPos() look like they're all from code that corrects positions after text insertions or deletions so no additional invalidate should be necessary there. It turns out that one WW8 document in sw_filters_test wants to insert a bookmark on a SwGrfNode; check for that in makeMark(). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87157 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ef8427d12a63127a2eb867637699343d630545dd) Change-Id: I293e6da9042bea5992cb27091b9cff77e5c7961d crashtesting: null dereference of reexporting abi12570.odt to odt FLY_AT_FLY shape is anchored on SwStartNode of fly section. (regression from ef8427d12a63127a2eb867637699343d630545dd) Change-Id: I4fe70237c060cc810af82657bc5791e7024db8f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91336 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 71ed878556422068041025668876fb3300c128df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96318 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-12tdf#101856 copy missing bookmark propertiesSerge Krot5-3/+18
- in case of undo/redo - in case of copying bookmark Change-Id: Ia21f42973b0e7c2cc4abfe2febe9818509aec4d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96064 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96116
2020-06-10tdf#101856 correct Insert bookmark dialogSerge Krot2-2/+6
- left align checkbox "Hide" - do not resize "Close" button - place "Close" button at the bottom of the dialog Change-Id: I57caa83edde2c377dfbf0aaacb60281e4966fbaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95855 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96016 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-10tdf#101856 evaluate condition to expand / collapse bookmarksSerge Krot1-0/+24
Change-Id: I7c135eab0feeca0ede794f6c88a2b06e339d6a14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95795 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96015 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-05tdf#95173 vcl: fix not drawn progressbar widget from UNOMiklos Vajna1-0/+12
Commit e6c2951f1957224aa0e7dc97b33b0450c41f92f7 (delegate RenderContext, invalidate - prgsbar, scrbar, 2015-04-29) switched ProgressBar::SetValue() from direct partial paint to invalidate + paint later, which means setting a progressbar value, then using an external sleep (such as Python's time.sleep()) no longer results in an updated progressbar. Solve the problem by explicitly processing all events with at least TaskPriority::REPAINT priority after the invalidate in ProgressBar::SetValue(), which is similar to what the Wait implementation in the basic runtime does. (cherry picked from commit f7157f04fab298423e2c4f6a7e5f8e361164b15f) Change-Id: I86475fb899f16b72ebefe9d3056c92cedeff4439 Reviewed-on: https://gerrit.libreoffice.org/73952 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 66bfaa01486891627b0748c4ba7b8d86e0fdc439) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95491 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-04tdf#133633 winaccessibility: Add null checkMichael Weghorn1-0/+4
The call to 'AccObjectManagerAgent::GetIAccessibleFromResID' may set 'pImAcc' to nullptr here (s. 'AccObjectWinManager::GetIAccessibleFromResID', which is called from there), so handle that case gracefully. Change-Id: I0dbd48974fd012ff086835b147cd9b9cfc8a052b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95430 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit cb55b2854de31004ab1d0277894f9f2581d5c31b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95419 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2020-06-03use the LinkManager persist to determine the RefererCaolán McNamara1-1/+8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94061 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3ee652e1c18186a5de47797aa4b02defcb29c210) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: I4e93878972492a93af368ffa0560412132431a24
2020-06-03limit forms to http[s]Caolán McNamara2-0/+9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93993 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5d101a65c31e6c2f8dd0edffe05f69055cbd481c) Conflicts: forms/source/xforms/submission.cxx Change-Id: I3ed0bc626f693ec03f610dc7361f93cad914c9d8
2020-06-02tdf#132236 sw_redlinehide: fix SwUndoDelete with sections even moreMichael Stahl5-3/+48
SwUndoDelete::UndoImpl may want to move something like this into the nodes-array: [ 9] 0x6356fe0 TextNode "", [ 10] 0x31cba00 ~DeletedNode , [ 11] 0x64d8840 TextNode "Introduction - xzn Overview Of KmneqxziTY\t3", [ 12] 0x64e9750 TextNode "shell\t20", [ 13] 0x7a0f0a0 ~DeletedNode , The ~DeletedNode become end nodes of section nodes; in this case m_nSectDiff != 0. Don't skip these end nodes because in the above "Untitled 1.odt" example, they are not necessarily consecutive. Between the 1st and 2nd one a new SwSectionFrame must be created via the outer section, so adapt InsertCnt_() to check for extra end nodes in the range and do this. (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94883 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ca8e04f1ab739e14288ab5e0be44723536b9ca4e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94963 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 9c84242dcee576147e520624641b208e874e908c) Change-Id: I7bfba9efca1789392495ebec37eb3e5b6138bd07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95365 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-02tdf#109376 sw: fix SwUndoDelete with end pos on SwTableNode crashMichael Stahl3-12/+80
Commit 6ff263b837831d46d0c215963b70543a9ea5bd2a added a check in SwUndoSaveContent::DelContentIndex() to avoid moving the anchor of a FLY_AT_PARA if its new position would be a table node, because SwFlyAtContentFrame::Modify() requires a SwTextNode to be the anchor. However, that doesn't actually avoid moving the anchor - later, SwNodes::RemoveNode() relocates the anchor to the next node regardless of type! It's probably better to just delete the fly in the situation when the end position is a SwTableNode, which fixes the reported crash. Unfortunately on Redo, the SwUndoDelete::UndoImpl() does not recreate the nodes correctly, hence the fly then is inserted on the wrong node, which later crashes again. The problem is that due to the table node, a dummy SwTextNode is inserted, which should be at the end of the range, but ends up at the start due to an erroneous ++aPos.nNode; - the result is that the fly is inserted on the dummy node and is immediately deleted again, triggering another assert. If there is a dummy node, it also doesn't make sense to call SplitNode(). Yet another problem is that in SwUndoDelete::UndoImpl(), the frames for the moved text nodes are not created, because the first node is skipped with the wrong assumption that it already has frames. Reportedly this started to crash with commit e07feb9457f2ffb373ae69b73dda290140e4005f, previously it was just wrong. Reviewed-on: https://gerrit.libreoffice.org/70683 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 80b73dcc06c671a49fbf238be58c1cd086c5c5f9) Reviewed-on: https://gerrit.libreoffice.org/70764 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 7bba93a99ebb4250f884a68a50aa1912d96f4ba8) Change-Id: I5094638e34c6ed52c836e57691d377b8cd1608f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95364 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-02tdf#131684 tdf#132236 sw_redlinehide: fix upper of frame moved...Michael Stahl2-0/+39
... in SwUndoDelete::UndoImpl; this wasn't fixed properly in commit 6c7245e789f973cf6dad03f7008ab3f9d12d350c - the SwTextFrame was moved into the SwSectionFrame but its upper was whatever it was previously. This is rather ugly because with the constraint from the very special case of tdf#131684 the MakeFrames() requires one node with pre-existing frames, and it's not possible to move the pre-existing frame after MakeFrames() because then the tdf#132236 case will have an empty SwSectionFrame and InsertCnt_() will just delete it. So try to detect the situation with some hack in InsertCnt_() to move it into the SwSectionFrame. (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48) Change-Id: Ic0199c85d7523a49676ad3df1d2c4d8fe135c2ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94881 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 55576842ec72a748d0bad123d41fa03c89fc136d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95023 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 8871f81f218dd49de27d528e54a515d1648d3554) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95363 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-30tdf#131684: Add unittestXisco Fauli2-0/+51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92226 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 3ee27693301b50cdebd6a47e35b6621f0ac50cfe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95022 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 03fe7a259e71d1c3f5190652649f9d4a6f75b4b7) Change-Id: Ic59d922700b4046a1ec94be5365b46dc8a021a00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95131 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-30Cut down on -pthread/-lpthread proliferationStephan Bergmann34-57/+10
Building against libstdc++ effectively always requires -pthread anyway (as various standard C++ headers require it, see the comment added to solenv/gbuild/platform/unxgcc.mk), so many explicit uses of -pthread/-lpthread can be removed. Doing a (partial) test build on Linux with Clang -stdlib=libc++ suggests that libc++ indeed doesn't need -pthread as libstdc++ does. The remaining uses of -pthread/-lpthread are mostly in configure.ac for the various BSDs (which somebody else might want to clean up now), and related to external projects. I tried to be careful to remove -pthread/-lpthread from makefiles only when C++ object files are involved (so -pthread will now be included on the link command line by default). Reviewed-on: https://gerrit.libreoffice.org/71291 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b1141fa61073b3f24e1a3574afa55a954e5a153d) Change-Id: I936e082839cb9a434bd273ce5a1f187a4245dfa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95130 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-30external/libmspub: missing includeStephan Bergmann2-0/+11
Change-Id: I446b26b3c0ffd0d62178f374b570c9fbd1885dd4 Reviewed-on: https://gerrit.libreoffice.org/73813 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d0e38b8f1efc6a0b2b519ce1f82a83c5766f5633) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95109 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-12tdf#108608 more Draw text editing responsiveness fixesThorsten Behrens1-0/+19
Turns out Windows is rather slow at calculating glyph outlines (compared to Linux), I'm guessing it does no caching at all, so just add our own little cache. This re-introduces the initial, simple glyph rect cache from https://gerrit.libreoffice.org/52623, but amended with fixes for: - tdf#120204 and duplicates - tdf#119829 and duplicates This partially reverts commit ac39aba9b2d08b061b0eef651f5ebc7a84391171. Change-Id: I9445604139a2d7242969a225d9cf2967316c3608 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94029 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-09tdf#129096: Document Recovery: Use TypeDetection on loadVasily Melenchuk1-0/+32
Loading of recovered document happend before via XFilter::filter is not updating media descriptor of document. But this is important for password protected documents to store entered password and used encryption type. To avoid this problem let's use TypeDetection which during its work will ask user for password and store all the info in modified media descriptor before actual recovery attempt. Change-Id: Ide2ebf0955e0937cdc7c9d7165593b71f904649b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88844 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Jenkins (cherry picked from commit 8461127750e1fe92a615409505256132e54fb8e8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89789 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> (cherry picked from commit b05c87f00433987b10542866696f0b4aaad015cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93835 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-07tdf#132187: sw: Add unittestXisco Fauli2-0/+27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93485 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 823a224843ee78a33f2d346c02344a88a77b2758) Change-Id: I767f96fd8d373df9b8cbecd9cb75ed114166d0f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93616 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-05-07tdf#132187 sw: fix creation of frames on end node in CopyWithFlyInFly()Michael Stahl1-1/+35
The problem is that the rInsPos node is included in the range passed to MakeFrames(), but it already has a frame, so now it has 2 and that means the next call to MakeFrames() in this position will create all the frames twice. This is tricky because while in practice there is currently only one layout in theory there could be multiple, and then it could happen that RecreateStartTextFrames() will destroy the node's frame in one layout but not the other, while MakeFrames() always works on all layouts. Fix this by checking if all the existing frames survive RecreateStartTextFrames() and if it's not the case (like in tdf#130685) explicitly delete all the frames and including the node in MakeFrames(). (regression from 166b5010b402a41b192b1659093a25acf9065fd9) Change-Id: I1bba11da053fe1c6359b2f76f3a352e44c6a2a1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93416 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 49f26e7dae550aff6ca90b3cda7f89e11ac8cfd4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93375 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d8bea028093fe3d4c0c0af0afad20c2c03bb9855) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93538 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-05-04tdf#131936 Correctly detect OOXML variant on importSamuel Mehrbrodt5-3/+74
Change-Id: I29a6b0454bf741ce8ad49078597b3412a83dedb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92278 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit ff93e4977cb1e23f355d248a77e8d0e56bb0f4b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92766 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 66331ed8f549cd9fad331b7d2a1d7dcf3498a553) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92996 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-28tdf#129887: fix crash during scrolling down documentSerge Krot1-1/+1
regression from tdf#129708 Change-Id: I6c5d7eb90030234e899ab8ce5b3adec33e03962a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86454 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92651 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-28tdf#129708 speed-up: check if we could create outline instead of creation of itSerge Krot17-57/+61
Conflicts: include/svx/svdotext.hxx oox/source/export/drawingml.cxx oox/source/export/vmlexport.cxx sd/source/ui/slidesorter/controller/SlsSlotManager.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/outlnvsh.cxx svx/source/accessibility/AccessibleShape.cxx svx/source/inc/cell.hxx svx/source/sdr/primitive2d/sdrattributecreator.cxx svx/source/svdraw/svdotext.cxx svx/source/table/accessiblecell.cxx svx/source/table/cell.cxx svx/source/table/tablertfexporter.cxx svx/source/unodraw/unoshtxt.cxx sw/source/filter/ww8/rtfsdrexport.cxx sw/source/filter/ww8/wrtw8esh.cxx Change-Id: I0629b4e6ccae4ab9be0142fe39c627f2f9a8f5ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86199 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92650 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-28tdf#129708 speed-up: reuse enumeration for each effectSerge Krot3-68/+139
Conflicts: editeng/source/uno/unotext2.cxx sd/source/core/CustomAnimationEffect.cxx Change-Id: I336278c5a9eec75a2a71fe4d04d2029a5a08e6a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86102 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92649 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-16tdf#131399 Update java settings after slight java version changeilhan1-0/+12
Under linux, the version is now also checked for changes at startup of libreoffice. Change-Id: I572f718cf5afc83a70d98a6897f1d3d6877644f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91037 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 6b6af620ff53209487a146aa3977db328c3a6300) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92025 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-09tdf#131684 sw_redlinehide: fix SwUndoDelete for entire doc in sectionMichael Stahl1-1/+2
The problem is that in SwUndoDelete::UndoImpl(), at the start there is only one content node with a frame in the layout, and there is a special case with m_nReplaceDummy being set so this SwTextFrame gets deleted by the MoveNodes() call in line 969 that moves it into the newly inserted section. As a result of that, MakeFrames() won't do anything because it can't find an existing frame in the same section. In this case, MoveNodes() should leave the frame alone, as it is beyond the end of the deletion and excluded from MakeFrames() - if it wasn't merged before then it doesn't need action, if it was merged before (in a different document maybe) the RecreateStartTextFrames() ought to fix it. (regression from 723728cd358693b8f4bc9d913541aa4479f2bd48 which disabled immediate creation of frames in Copy_()) Change-Id: Iabe2fb1810b0df898b1f57b3d850c3503c79c5d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91842 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 6c7245e789f973cf6dad03f7008ab3f9d12d350c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91886 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 5e2fc4864a5ed4c8361863ba7fa8e83d1c768638) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91904 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-04-07(related: tdf#130685) sw_redlinehide: fix update of pLastNode/pParaPropsNodeMichael Stahl2-1/+4
If you Select All, Cut then move the cursor around a bit then paste, then this happens: sw/source/core/text/txtfrm.cxx:3461: void SwTextFrame::CalcAdditionalFirstLineOffset(): Assertion `pTextNode->IsNumbered(getRootFrame()) == pTextNode->IsNumbered(nullptr)' failed. The reason is this borked MergedPara, which really only has 1 node it's listening on, but pLastNode and pParaPropsNode point to a node that is actually part of a different MergedPara now. $6 = { listener = { m_rToTell = @0x6c02700, m_vDepends = std::__debug::vector of length 1, capacity 256 = {{ <SwClient> = { m_pRegisteredIn = 0x6af5f20 }, }} }, extents = std::__debug::vector of length 0, capacity 0, mergedText = "", pParaPropsNode = 0x6d1c390, pFirstNode = 0x6af5f20, pLastNode = 0x6d1c390 } The reason is that SwContentNode::DelFrames() doesn't update these members properly; at the time when it's called for the previous pLastNode, the offending node has Merge::NonFirst set already in the call of CheckParaRedlineMerge() so it sets the wrong new pLastNode. Fix this by iterating DelFrames() loop backward. (regression from sw_redlinehide) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91597 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 520b0e1679d7a97aa3d91cfc95ca647339da7e84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91524 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit f8d0f77de20d6adf6f532d13003a96856a98f69b) Change-Id: I508fd25af385a25ba9ed78d71aa3d1f02a7ac7a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91761 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-04-07tdf#130685 sw_redlinehide: fix copying to position following redlineMichael Stahl4-33/+69
In DocumentContentOperationsManager::CopyWithFlyInFly(), first CopyNodes() also creates all layout frames, then SaveRedlEndPosForRestore fixes the end position of all redlines that were moved by CopyNodes() (they were moved not by changing their position but by inserting new nodes before their end position). Of course this means that the layout frames are created with redlines that have only a temporary end position, and then things go wrong when the end positions are adjusted, so add something similar to SwUndoDelete::UndoImpl() to recreate the frames in CopyWithFlyInFly(). This hit the assert: sw/source/core/text/redlnitr.cxx:94: std::unique_ptr<sw::MergedPara> sw::CheckParaRedlineMerge(SwTextFrame&, SwTextNode&, sw::FrameMode): Assertion `pNode != &rTextNode || &pStart->nNode.GetNode() == &rTextNode' failed. (regression from ... sw_redlinehide) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91596 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 166b5010b402a41b192b1659093a25acf9065fd9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91523 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit f7aa951014c283bc629eaea14da2ca0d68f99431) Change-Id: I82e0f5b320cab201e762f58800f83e08f4f01048 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91760 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-04-07(related: tdf#130685) sw: fix ~SwIndexReg asserts from ...Michael Stahl1-0/+6
... lcl_DeleteRedlines(), if there are redlines immediately consecutive that get deleted; merge the SwPaM ring in that case which should help. Change-Id: I07b67413ad6ee52bc81b89facc40202d0ca75e2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91595 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 27aa4b16bf704d0246595750daf57b57ff2577b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91522 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c7c157c905b8b70aa3e426a6e4d2ba40963caf1a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91759 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-04-03tdf#131849 Handle changed doc print options when printer changedMichael Weghorn1-0/+5
Previously, the SfxPrinterChangeFlags::OPTIONS flag was only set for the case that the printer itself was considered unchanged ('else' case below). However, this also needs to be done when the printer is considered to have changed, so the flag is properly passed in the call to 'SetPrinter' below, to make sure that changes in document-specific options are properly propagated. Change-Id: Id91ebbbf40888e52149b40ac25f188af4be425f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91626 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 21fc54777d5dedc33d6bfa23b9f1072a6667eebe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91520 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2020-03-24icu: add patch to fix CVE-2020-10531Michael Stahl3-1/+42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 002d1152dc418f7d624409e76cd9d4ac0b42c7f8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90975 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 63b573faf984875cda7a879e696ea75fae81df57) Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90998 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-06tdf#130917 Invalid document after odt->docx with signaturelineSamuel Mehrbrodt2-6/+12
Change-Id: Idf80c41f1315e0690dabd5e8566b62fc64c3ee1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89674 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 0f02805a8949865ffee99477bb26491b7c27a8bc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89907 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-03-04tdf#130680 sw_redlinehide: fix crash in SwUndoDeleteMichael Stahl1-7/+18
The problem is that the code that adjusts pLastNode in SwContentNode::DelFrames() assumes that the nodes are deleted forward but MoveNode() runs backward so the only solution is to put pLastNode temporarily onto some node without checking if it has been fully deleted, while skipping over tables and sections. At the end of MoveNode() it must be on a valid (not fully deleted) node again. (regression from b86ff2c6a88aa41379e74f11e8ec8497ff85ffd0) Change-Id: If54c01f885e0c040aed9068823deae7dd167fd50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89896 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 4769f431d93139eb3c470e5bb4e7c3c33d46a41f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89910 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2ef34d0272fca823ca5d5e795343e8a8ebced583) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89920 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-03-02Delete google_breakpad::ExceptionHandler before calling _exit()Mike Kaganski4-63/+54
While debugging tdf#129712 on Windows, I saw this sequence: 1. nullptr was dereferenced (the reason for tdf#129712). 2. ExceptionHandler::HandleException was called (in workdir/UnpackedTarball/breakpad/src/client/windows/handler/exception_handler.cc). 3. It called ExceptionHandler::WriteMinidumpOnHandlerThread. 4. Minidump was created in ExceptionHandler::ExceptionHandlerThreadMain. 5. Document Recovery dialog was shown in Desktop::Exception (in desktop/source/app/app.cxx). 6. After closing dialog, _exit() was called in Desktop::Exception. 7. All threads except main were terminated. 8. Another access violation was thrown in the "minimal CRT cleanup". 9. ExceptionHandler::HandleException called again. 10. ExceptionHandler::WriteMinidumpOnHandlerThread hung on WaitForSingleObject because handler thread that should release the semaphore was terminated already at step 7. The process had to be killed manually. This change destroys the breakpad handler at the start of Desktop::Exception, which de-registers itself (on Windows it uses SetUnhandledExceptionFilter). Other than preventing the hang, the rationale also is that keeping the handler after first minidump creation is wrong: even if the second minidump creation succeeded, uploading it to crashdump server would give not the actual problem, but some unrelated stack. Change-Id: If12d0c7db519693f733b5ab3b8a288cef800a149 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86104 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 12b5892cf9c78dd917f2e50672cd250478e6c7d6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89690 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-03-02tdf#124776: don't use SearchPathW to get full path of executableMike Kaganski1-4/+2
... use GetModuleFileNameW() for that. We call SetDllDirectoryW and SetSearchPathMode to improve security of the process, and exclude some paths (including current directory) from search when using API that looks for binaries whose names are not fully qualified. So the sequence is this: 1. Program is started using relative executable path like "instdir\program\soffice"; 2. sal_detail_initialize is called, which calls the two mentioned hardening functions; 3. sal_detail_initialize calls osl_setCommandArgs, which in turn calls osl_createCommandArgs_Impl; 4. The latter uses SearchPathW with empty path and first program arg "instdir\program\soffice" to find fully qualified program path. That now naturally fails, because current path is not searched. But to find the process name, we need no search: we can simply use GetModuleFileNameW() with NULL passed as module handle. Let's use that. Note that we can't use _wpgmptr/_get_wpgmptr, because we don't use wide entry point like wmain. LHM-Stuff --------- Dieser Patch löst das Problem wenn Symbols eingeschaltet ist, danach konnte LO nicht mit scalc.exe, swriter.exe, .. gestartet werden den es ist damit abgestürzt. (Dumpfile war im LO-Verzeichnis) Reviewed-on: https://gerrit.libreoffice.org/70844 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c650217cc543080928a26de4bfc07ebb0be5c6ca) Change-Id: I7a0013a0505f7bdd38164b09b045bfade9686664 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89689 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-25tdf#130274 sw_redlinehide: fix ChgAutoCorrWord() if replaced text ...Michael Stahl2-4/+28
... is fully deleted. This crashes on English text with 'i'->'I' substitution. The assumption that there's some part of the found text that is not deleted is only correct for the case where tracked changes are hidden, but not when they are shown. (regression from 9926ea7dd07f1f3d012ddf97941a42bb7fa5717d) Change-Id: I0e81494659ea7e187101a703f64483dd68c73d70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89151 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b7922b56e2dcf1dc1abbf5574bcb672068fa8dbd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89135 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 1e97fb44829481845a7e768392f92f6c00f324de) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89279 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-02-25tdf#129529 sw_redlinehide: infinite loop in SwLayHelper::CheckInsert()Michael Stahl1-1/+3
The bugdoc has this in meta.xml: meta:page-count="819" meta:paragraph-count="302" ... for which SwLayHelper::CalcPageCount() cunningly estimates a maximum of 0 paragraphs per page, and at that rate an infinite number of pages are required... Not sure what a reasonable minimum should be, paragraphs could be 16 pages long even with 64k limit, but it does appear unlikely. (regression from 7e8b4756d95057f069467b34e7849f9354856578 which disabled the use of the layout-cache in the bugdoc) Change-Id: Icd9ab145cc2f0714b50de9b5b4a1ef10ac1d49a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89106 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit a9f2f4b4c9e1fa4e4c4a69517c31d0b8e2063f01) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89133 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-02-25tdf#129553 sw_redlinehide: fix replace of paragraph breaks with $Michael Stahl1-5/+15
The problem is that in the special selections that replace paragraph breaks, the start and end node are actually different, hence have different text frames. (regression from 5e81b966778d82692b4763d892b457186a7f269d) Practically the end content index is going to be 0 typically which doesn't need mapping, but not sure if that's guaranteed anywhere. Change-Id: I77c95c2f3e55edcc7aca6f4540cae90b3be5d79b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89050 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 83122add64ecbf0fd3ba30368d5d87bde3dac278) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88959 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 988383d3dce56536082a639d5a8b0cc0a23da7c4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89429 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-02-20tdf#121458: chart: change "Data Ranges" button enabled condition.Vasily Melenchuk1-9/+5
"Data Ranges" button right now enabled if chart has no own table (as it was before 0074951704022d173a5fdb9df933f47be1dcbb91) or own table exists and it is possible to create data provider (LibreOffice will warn later about destroying data table). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86391 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: chart2/source/controller/main/ControllerCommandDispatch.cxx Change-Id: If92b0aad8a6099250effdb68022addb277ef4371 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89148 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-19sw: fix splitting text frames wrt. footnotes in followMichael Stahl3-0/+849
When the simplified (thanks Vasily) bugdoc is loaded, it has 2 pages and the last text frame 6 on page 1 has N lines, but after hiding tracked changes and showing them again, page 1 has N-1 lines, the last line starting at offset 1064 moved to the follow frame 7 on page 2, and this is the only difference from the state after loading. Frame 6 is formatted exactly 3 times; the difference between the 1st and the 3rd time is that footnote number 8 (footnote frame 34) doesn't exist yet the 1st time, but is on page 1 at the 3rd time. This reduces the space available in the body frame from 14040 to 13817, and SwTextFrameBreak::IsInside() finds there's not enough space for the last line. Interestingly the sw_redlinehide didn't change anything here; this reproduces in the same way back to OOo 3.3. There's a few obvious ways to try and fix this: a) The footnotes that are anchored beyond the end of the current text frame are moved by RemoveFootnote() called later: 4 in SwTextFrame::RemoveFootnote() at sw/source/core/text/txtftn.cxx:508 5 in SwTextIter::TruncLines(bool) at sw/source/core/text/itrtxt.cxx:375 6 in WidowsAndOrphans::FindBreak(SwTextFrame*, SwTextMargin&, bool) at sw/source/core/text/widorp.cxx:338 This could be done earlier, in IsInside(), which already tries to do 2 other things to get more space, so it seems plausible that footnotes which are known not to be in the frame (including the line that doesn't fit) could be moved off the page. b) An approach similar to commit e37ffdd118da2d21c5e78e8c7b67252d0d1adc8c "tdf#125685 sw: disregard footnotes in follow table on table split" would be to temporarily add the footnotes anchored beyond the current frame to the available space, and leave them to actually be moved later. c) When RemoveFootote() is called and it does move a footnote, invalidate its anchor text frame so that it gets formatted again. This seems to have the highest risk of introducing loops though. Let's try out a) for now and see how it works. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88714 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 391613785ae6fbb735cf7a86ea2f6a93161a8769) sw: add test for 391613785ae6fbb735cf7a86ea2f6a93161a8769 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88882 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 6c53c86f3db0559eeb2bbb69051a8b6fb2863b11) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88691 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 0c4445c54da9326deb8e234463496620202c1f85) Change-Id: I54b59637b79d67f5eca61f11bd575145f244381f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88937 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-16tdf#130325 Fix listbox used as dropdownSamuel Mehrbrodt4-4/+7
In this case, the listbox is not used as a static widget, also not as a combobox with dropdown. Instead the listbox is placed in a popup to choose values from. Need to handle this case similiar to the combobox dropdown (Cursor movement only travels through items, Return selects one item). Regression from 7de9417d5f65d35227c7f80f6d587c2a56bde4e0 Change-Id: Idadc3da5847e12e1408203b13ab59eb53fe14eea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88581 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit d92463c88a557eea7a439def39659b1409772583) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88504 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit f475d0574a2df630b2940f0204bb13199f823706) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88690 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-09tdf#93389: keep encryption information for autorecovered MS formatsMike Kaganski5-6/+65
The autorecovery data is stored in ODF, regardless of the original document format. When restoring, type detection generates ODF data, which is stored in the media descriptor attached to document, even after real filter was restored (see AutoRecovery::implts_openDocs). If real filter is not ODF, then at the save time, it doesn't find necessary information in encryption data, and makes not encrypted package. This patch adds both MS binary data, and OOXML data, to existing ODF data for recovered password-protected documents (regardless of their real filter). TODO: only add required information to encryption data: pass real filter name to DocPasswordHelper::requestAndVerifyDocPassword from AutoRecovery::implts_openDocs. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86201 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit dd198398b6e5c84ab1255a90ef96e6445b66a64f) Conflicts: comphelper/source/misc/docpasswordhelper.cxx Change-Id: I4717f067ad3c40167312b99eefef5584a467bfed (cherry picked from commit 6017cdff264afc3b98beeba1330d6df28102fe7a)
2020-02-09tdf#118639: store ODF encryption data for autorecoveryMike Kaganski2-8/+40
When saving autorecovery information, ODF is used. If the original document is password-protected, its autorecovery is also generated password-protected (since ef87ff6680f79362a431db6e7ef2f40cfc576219). But when the stored encryption data for non-ODF document does not contain "PackageSHA256UTF8EncryptionKey" value, following ZipPackage::GetEncryptionKey fails, so the whole save fails. So just generate and append ODF encryption keys where we still have user password. Reviewed-on: https://gerrit.libreoffice.org/84052 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 63634738dd03cc74806ce6843c16ff5e51a371a0) Reviewed-on: https://gerrit.libreoffice.org/84133 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit e569dc9824e95617d921bb8f115d243aea0125b9) Reviewed-on: https://gerrit.libreoffice.org/84232 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit d1450f5bddd0f108078e0dfb11c9f130175fafe7) Conflicts: comphelper/source/misc/docpasswordhelper.cxx Change-Id: I776e28de784489521e4941d1075690f90c056014
2020-02-07Remove a fragment from a file URL early onStephan Bergmann1-2/+4
...as ShellExecuteExW would ignore it anyway Change-Id: I969db094bb7d2ea230ac8c36eb23d71a90fbe466 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86868 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 14b36a16b225bf7c988f118d499a7287c47cd83e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86877 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 51da0d22ff42b20ab38130b7874651ef136ecceb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88207 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-01-23sw_redlinehide: fix SwScriptInfo hidden textMichael Stahl1-0/+1
A missing update of nOffset in SwScriptInfo::InitScriptInfo(); it must be updated for every extent but it's not for the last one in a node. test case: ab cd Delete "bc", hide "d", but "a" disappears. (regression from 0e26d48ad7f18deac8447a306215f79d5c62be27) Change-Id: I99fb88409e184a61866f908722b4430a53914153 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87201 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 53cd5d1f50d3da4efe0938aa340f6a57a0b8501d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87246 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b11ef7de2420a1f35290802145067cbbd2da5d93) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87279 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-01-23Get PDB files to work for soffice.bin and unopkg.binJuergen Funk1-1/+1
..by renaming them to *.bin.pdb, so WinDbg picks them up. Follow-up fix to commit 6ca3adf22b62b88b313c8fc9311183efdabe445a trac#29781 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86465 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d3f138efc185e1ee781943d44eb33b82d46ca577) Change-Id: I5cb7b305c997b423cf0cd70835163811f75b3e25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87268 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-23symstore.sh: collect PDBs for *all* artifactsJuergen Funk1-9/+59
- a number of external library PDBs where missing Reviewed-on: https://gerrit.libreoffice.org/83726 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 6ca3adf22b62b88b313c8fc9311183efdabe445a) §§{JNKCMD:NoBuild}§§ Change-Id: Idafcce87bfefadfa669807a861efab76b4122c62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87267 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-23symstore.sh: use logical operators for test statementsJuergen Funk1-3/+3
No need to spawn two subshells, test can do and/or logical ops itself. Reviewed-on: https://gerrit.libreoffice.org/83066 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7) §§{JNKCMD:NoBuild}§§ Change-Id: I2abba303383f9f0053515088d4fa32753a777a1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87266 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>