summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tdf#104823: unittestVasily Melenchuk2021-12-242-1/+60
| | | | | | | | | | | | Ensure reading and writing to datasources Change-Id: Idbc907a21fe3b881d1b835ed0e8c795c4ea36863 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127311 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127334 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#145057 Fix saving color filter when multiple data ranges in sheetSamuel Mehrbrodt2021-12-245-2/+30
| | | | | | | | | | | When mutliple data ranges existed in one sheet, only the first one was considered when exporting color filters. Consider all of them, as any could hold a color filter. Change-Id: I13ae2018057eef7ef24fc8298c814a93df24f74b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127337 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#135061: sw_uiwriter3: Add unittestXisco Fauli2021-12-233-0/+44
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127326 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 22f3f806abc0ef3ef02cd6733bdb3f950085dd17) Change-Id: Ied2ae576810a9f66e51883375959d372af59abe4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127356 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#135061 sw_redlinehide: fix copy into delete redline following tableMichael Stahl2021-12-231-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pasting, the entire document body is covered by a delete redline. The insert position is in the last node, whose SwTextFrame has a MergedPara, and the problem is that the MergedPara::pLastNode continues to point to the last node of the document, even when the delete redline is adjusted to end in a newly inserted node by SaveRedlEndPosForRestore::Restore(). Thus afer the 2nd paste, SwDoc::SearchNumRule() goes into infinite loop from node 141 to 86 and then jump via the bad MergedPara back to 141. The reason is that in DocumentContentOperationsManager::CopyWithFlyInFly() the RecreateStartTextFrames() isn't called. This is because it only checks if the preceding node is a text node, while here it is a table node. Fix this by checking if the node at the insert position is merged to a node preceding the previous node. Change-Id: I103b60b2bec86af11006ed591cfda2feb5f575a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127273 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 70ac13eecfa620e94770a64110eeaa05f8c266e6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127317 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f7455f031b5338b55b0c58822b3502913603e99c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127355 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#135061 sw_redlinehide: create frames following hidden tableMichael Stahl2021-12-233-52/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When pasting, the entire document body is covered by a delete redline. The insert position is in the last node, following a table; table nodes do hot have any connection to frames if they are hidden by redlines, so MakeFrames() won't create frames for the inserted nodes. Refactor SwNodes::FindPrvNxtFrameNode() so that it can detect that table nodes are hidden in the current layout and continue to search in this case. For multiple layouts, MakeFrames() may need to use different nodes per layout, as the "nearest" one in one layout may be hidden in another. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127272 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit af4e20426ad24c6f2c0164b37472f2b7b54ecd30) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127316 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 1ca3c0d70b31ed173a896bcb37cc731b5324a573) Change-Id: I3bb2c861c861438ac2695ab49dd91dc2bde87db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127354 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* sw: simplify SwNodes::FindPrvNxtFrameNode(), improve commentsMichael Stahl2021-12-232-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127269 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 25aa814aa466cb0a59e34dfef33c50065c445f60) sw: simplify SwNodes::FindPrvNxtFrameNode(), pEnd is always passed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127270 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e0f13ce0f9e2dac836c42141bb848d2bf4fbda75) sw: simplify SwNodes::FindPrvNxtFrameNode(), de-golf conditionals Change-Id: Ie5b35793ce38e6338e34d47725e649a56078d603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127271 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b922988e2cd57c9397b9e512a7616a10612b2b8f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127315 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 04313336e665c10bbb2d1a47e41e7b38e5c3c2cb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127353 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* Missing initialization of mnMaxTextWidthSamuel Mehrbrodt2021-12-231-0/+1
| | | | | | | | | | | -> No text displayed in sidebar dropdown Fallout from d52b2831ba5ef1475ca148c298ae69291d273255 Change-Id: I908b0c07eaa71d4b19a41c413658a6328e4f99d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127320 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#145062 sw: try to fix UBSan crash in UITestMichael Stahl2021-12-223-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /sw/source/ui/fldui/fldref.cxx:470:32: runtime error: downcast of address 0x60700065f330 which does not point to an object of type 'SwGetRefField' 0x60700065f330: note: object is of type 'SwInputField' a8 04 00 78 30 d8 f7 f1 8c 2b 00 00 60 9a d4 4c 8c 2b 00 00 00 b6 57 00 10 61 00 00 00 00 00 00 ^~~~~~~~~~~~~~~~~~~~~~~ vptr for 'SwInputField' #0 0x2b917d44b1fc in SwFieldRefPage::UpdateSubType(rtl::OUString const&) /sw/source/ui/fldui/fldref.cxx:470:32 #1 0x2b917d463aa9 in SwFieldRefPage::TypeHdl(weld::TreeView&) /sw/source/ui/fldui/fldref.cxx:358:5 #2 0x2b917d45f9e4 in SwFieldRefPage::Reset(SfxItemSet const*) /sw/source/ui/fldui/fldref.cxx:258:5 #3 0x2b917d436efd in SwFieldPage::EditNewField(bool) /sw/source/ui/fldui/fldpage.cxx:110:5 #4 0x2b917d48e725 in SwFieldDlg::ReInitTabPage(std::basic_string_view<char, std::char_traits<char> >, bool) /sw/source/ui/fldui/fldtdlg.cxx:214:16 #5 0x2b917d48f411 in SwFieldDlg::Activate() /sw/source/ui/fldui/fldtdlg.cxx:233:9 #9 0x2b8c8ac6f2b8 in Timer::Invoke() /vcl/source/app/timer.cxx:75:21 #16 0x2b8c8abaec67 in Application::Yield() /vcl/source/app/svapp.cxx:532:5 #17 0x2b8c87842191 in Dialog::Execute() /vcl/source/window/dialog.cxx:1056:9 #18 0x2b8c8a7bfabd in SalInstanceDialog::run() /vcl/source/app/salvtables.cxx:1685:23 #19 0x2b917cc6879c in weld::DialogController::run() /include/vcl/weld.hxx:2516:47 #20 0x2b917cf6e99c in SwFieldInputDlg::run() /sw/source/uibase/inc/inpdlg.hxx:56:47 Apparently SwFieldPage::Init() is called from SwFieldRefPage::Reset() and replaces m_pCurField with whatever is at the cursor position now. This should avoid crashes but it's kind of ugly. Should the dialog perhaps switch to a different tab page? Change-Id: I9c46665680090a5f164fd5d594fd3e7b1ab31f48 (cherry picked from commit d73f2e3132786a20794e3ac66f9b487fc737d514) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127307 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#137318 sw_redlinehide: fix JoinNext() if deleted node contains redlinesMichael Stahl2021-12-222-6/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GetRedlineMergeFlag() of the deleted node is None also if there are deletions contained completely inside the node, but in this case the merged node does need a MergedPara, so check if the deleted node had a frame that has a MergedPara in addition to the flag (which remains as an "optimization"). (regression from d258fc29560baa5ecae03ebc2740e11420643e27) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127011 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 31f51598fd08c2b76583a1baad0c0d6d4b336664) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126979 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a82e1cf48b7e1d228f99a136b115bcb56a2e4bac) tdf#137318 sw_redlinehide: fix assert on export moz715138-3.doc to ODF (regression from 31f51598fd08c2b76583a1baad0c0d6d4b336664) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127145 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d246fcf94638604911ef11ff2f4bdc0c5ba8dbfc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127170 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 66526bc24b884b361b06aea7529227b486423853) Change-Id: I44456f230374ec1de159106678e80fb4670c9f33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127306 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#144565 sw_redlinehide: fix mailmerge when flys anchored at last nodeMichael Stahl2021-12-221-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The InsertPageBreak() calls SplitNode() which is not ideal as the flys anchored at the last node of the document may end up anchored to the newly inserted node and this one will be removed again a bit further on: GetNodes().Delete( aDelIdx, iDelNodes ); ... which is what crashes, when the SwNodeIndex of the anchor is moved hard to a different node, which causes inconsistencies such as: sw/source/core/text/txtfrm.cxx:1263: TextFrameIndex SwTextFrame::MapModelToView(const SwTextNode*, sal_Int32) const: Assertion `static_cast<SwTextNode*>(const_cast<sw::BroadcastingModify*>(SwFrame::GetDep())) == pNode' failed. Instead, always use AppendTextNode() and then set the break item directly, which even simplifies the code. (reportedly a regression from 166b5010b402a41b192b1659093a25acf9065fd9 although i wasn't able to find an earlier version that didn't crash in some way) Change-Id: I4cac74fc86fc505f62b14cf0d7a7f9689c7402ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126921 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 42448f48bb48a13d6618a181b12840db6d85c574) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126945 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit eb4ab0c70c549cabf5625a824eee950f82fbf622) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127305 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#104823: support for sdt plain text fieldsVasily Melenchuk2021-12-2223-70/+592
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squashed commit containing set of changes: * Create a input field from sdt text block. * Advanced support for reading field data from data bindings which can point to custom xml or properties xml. For this XOOXMLDocumentPropertiesImporter idl interface was extrended with extra getterrs to get properties as xml dom elements. * Support for exporting of this feature back to docx. For this some extra parameters for sdt block are kept in newly introduced grabbag for input fields. If field does not contain grabbag it being exported as before (FILLIN or whatsoever), otherwise sdt block is counstructed based on data from grabbag. * Basic support for updating custom xml values back into custom xmls with usage of xslt transformations. To achieve this extra parameters were introduced to XXSLTTransformer: now it is able to support in-memory transformation stylesheets. Some unittests were corrected: since sdt plain text edit area is a field located inside paragraph in outout corresponding sdt is also located inside paragraph (instead of Word's approach with paragraph inside sdt). Seems this is not critical. Change-Id: I1a73ef300db3619804f7adf18579bea708764c14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127015 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127284 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#139922: sw_uiwriter3: Add unittestXisco Fauli2021-12-211-0/+27
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125318 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 837bb7370b702399562a3b0b4e444237c66879a8) Change-Id: I4401ba7d00dae654a6e3c897719e5f1a112a9abb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127157 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#139922 sw autocorr: don't return GetPrevPara if isEmptyJustin Luth2021-12-211-1/+4
| | | | | | | | | | | | | | | | | This fixes a LO 6.2 regression caused by commit 4cf5a46f16dec8ce16c6662ce5c17903e28b8fa3. Change-Id: I4aee8f4e79a40a8b8f82faa3e62dead80a952510 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125037 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 59dc5d00b04927d07df2dcc3c17acfdc760d8765) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125144 (cherry picked from commit 133fe29d06445daadc556cff013d5194a883ea9b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127156 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#136452 sw_redlinehide: fix crash in undo of delete across sectionsMichael Stahl2021-12-213-1/+130
| | | | | | | | | | | | | | | | | | | | | | | The problem is that on the first SwUndoDelete, the m_nSectDiff branch MoveNodes() creates a top-level SwTextFrame for the node "Korean", then the m_nReplaceDummy branch does another MoveNodes() to move the same node into the section, but its frame remains outside the section. Generalize fix 55576842ec72a748d0bad123d41fa03c89fc136d for tdf#131684 to check the last SwTextNode inside the section if it has a frame outside the SwSectionFrame. (regression from 6c7245e789f973cf6dad03f7008ab3f9d12d350c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126257 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2b256c84aa4c063c8161b32a7b424daa28b5741b) Change-Id: I30495d8f3d8fc0d70cb20df44409174edc2d4a4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127152 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#104823: basic support for reading field data from databindingVasily Melenchuk2021-12-219-3/+84
| | | | | | | | | | Change-Id: Ie45eb18205c1c54a631303b45887e54e456b6d5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125550 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127129 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* sw: support for other sdt attributes roundtrip in datepickerVasily Melenchuk2021-12-217-29/+88
| | | | | | | | | | | | | | | | Word Control Field with datepicker is implemented with LO datepicker, but during this conversion we lose some field data, like control color, data mapping, etc. This data is already retrieved and stored in grab bag, so we need just to keep this grabbag in field and use it again on export. Change-Id: I6af8204fe1a7d2f9081d83372a6786b2f86260d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125486 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127196 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* sw: refactoring for docx sdt blocks outputVasily Melenchuk2021-12-212-482/+356
| | | | | | | | | | | | | | | | | | | | | | Previous approach with almost duplicate storage and processing for paragraph-level and run-level sdt blocks was very bulky. Especially this became visible once supported std elements list start to grow. Paragraph-level sdt block and run-level sdt block data are almost identical, so they can be kept in one standard class (SdtBlockHelper) and use the same methods for collecting data from grabbags and writing to output without passing huge amount of parameters. Change-Id: I4e1183eddf20317e954cb8aca72e97a4fc45ac68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125372 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127158 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* writerfilter: extend SdtHelper for better support control typesVasily Melenchuk2021-12-213-59/+64
| | | | | | | | | | | | | | | There is much more different controls which must be supprorted in future. So approach with isInsideDropDownControl() and validateDateFormat() is not sufficient. Use enum to determine and store control type. Change-Id: Ibea7fde117c059053195be213a3ae821644f277c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125471 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127149 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#99027 Set default table border width to 0.5ptSamuel Mehrbrodt2021-12-212-4/+5
| | | | | | | | | | | Change-Id: Ib6c8a6e63271f400d69702c3c090678d6c016af3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126922 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit c84ec0b1debb9b72f05ffc1d669608afc454cec2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126947 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#137466: docx: support w:placeholder & w15:color in w:sdtPrVasily Melenchuk2021-12-2015-18/+165
| | | | | | | | | | | | | | | | | | Content controls in Word can contain some other elements which are not supported by Writer. Put them into grabbag and write back to DOCX on save to avoid losing quite sensitive data. Test testSimpleSdts is modified: testcase is actully containing 4 sdt elements with ids in input and output. Change-Id: I1f9addd03ed828bf375ccac5188a004f011e8a0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125271 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127126 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* Fix gpgmepp build with glibcMike Kaganski2021-12-202-0/+33
| | | | | | | | | | | | | | | | | | | | posix-io.c: In function '_gpgme_io_spawn': posix-io.c:492:23: error: void value not ignored as it ought to be 492 | while ((i = closefrom (fd)) && errno == EINTR) | ^ make[1]: *** [Makefile:964: posix-io.lo] Error 1 Change-Id: I0e7abc33200ca7436c72e925447e681fd241c6a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123259 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126265 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126561 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126926
* tdf#81507: word content control support for w:multiLineVasily Melenchuk2021-12-206-7/+84
| | | | | | | | | | | | | <w:text multiLine="1"/> is now supported for import/export to DOCX. Like other content control items it is stored in grabbag. Change-Id: Id6f1aa0072dc5db980d0fa43cab4b38a0aa047fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125024 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127128 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* Adapt to Bison 3.8 internal yyn -> yyrule renameStephan Bergmann2021-12-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | see <https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865> "glr2.cc: log the execution of deferred actions" including "Rename argument yyn as yyrule for clarity." YYBISON was defined as 1 rather than as a representation of the Bison version prior to <https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09> "yacc.c: provide the Bison version as an integral macro", which shouldn't be a problem here. And YYBISON is apparently completely undefined with /usr/bin/bison on macOS. (The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch with the actually used "yyn" and "yyr1" ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it untouched.) Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127124 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* avoid windres preprocessor quoting-messups with current cygwinThorsten Behrens2021-12-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | | apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Conflicts: - solenv/gbuild/platform/com_MSC_defs.mk Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov <git@litvinovg.pro> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097 Tested-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#139843 sw_redlinehide: fix crash while updating reference fieldsMichael Stahl2021-12-173-5/+5
| | | | | | | | | | | | | | | | | | Use layout in MakeRefNumStr() when checking if node is numbered, because a hidden node has a null SwNodeNum. (regression from ae246b44da1708417aaaefe4f9186cfbbb9a9137) Change-Id: Iea797c03018929601ea797f00e3cf2d7749e55ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126857 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit cc02c0e32fda654cb4bcb93f87ceb48b356e1d84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126876 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 0d05c7a566f0fd9660c48b3efb74d3c3d969226d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126956 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#141175: sw_uiwriter3: Add unittestXisco Fauli2021-12-172-0/+30
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126851 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 41f7b1b12dfdfce508f04878409854fb9da38874) Change-Id: Iba615528f8515fe60dc71bc61c0d815c0e1962e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126955 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#141175 sw_redlinehide: fix crash in lcl_DeleteRedlines()Michael Stahl2021-12-171-1/+2
| | | | | | | | | | | | | | | | | | | The GetNext() returns itself if it's alone in the Ring. (regression from 27aa4b16bf704d0246595750daf57b57ff2577b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126844 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 19f2054c6063177d08c818c5b7eeba7ab9178249) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126824 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 7b672a6d89581885c305068a714a72b5352de12f) Change-Id: Idf92ce5362c4a4acf1582f463fe7bafc8553b400 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126954 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#136855 sw: fix ReplaceRangeImpl() restoring of rPamMichael Stahl2021-12-171-2/+2
| | | | | | | | | | | | | | | | | | This broke in CWS swrefactormarks2 (commit df6d312ca537402463e4eb0530f22b956600fc02) but for spell-checking the ReplaceRange() wasn't used until commit e1629c210ad78310e3d48c0756723134a27b89df. Change-Id: I4a6256b65b89e21e9e87ff45d0c5e6c4577a5846 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126842 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d16c5f47600d236e911ae50d0e58a3f2256f5a61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126822 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 6af4500fffe0d0db03b4d4a7e77cf627124aefc1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126953 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* sw: fix assert fail with ShowRedlineChanges=false and para formatMiklos Vajna2021-12-176-1/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails like this: loolforkit: sw/source/core/layout/wsfrm.cxx:4551: void UnHide(SwRootFrame&): Assertion `rLayout.GetCurrShell()->ActionPend()' failed. #4 0x00007f98e9f8c198 in UnHide(SwRootFrame&) (rLayout=...) at sw/source/core/layout/wsfrm.cxx:4551 #5 0x00007f98e9f8c839 in SwRootFrame::SetHideRedlines(bool) (this=0x7f98c40f7bd0, bHideRedlines=false) at sw/source/core/layout/wsfrm.cxx:4664 #6 0x00007f98e9b18afd in sw::DocumentRedlineManager::SetRedlineFlags(RedlineFlags) (this=0x80a4120, eMode=49) at sw/source/core/doc/DocumentRedlineManager.cxx:1097 #7 0x00007f98e9cfa503 in SwEditShell::SetAttrSet(SfxItemSet const&, SetAttrMode, SwPaM*, bool) (this=0x8885840, rSet= SfxItemSet of pool 0x808fd10 with parent 0x0 and Which ranges: [(63, 64), (120, 120)] = {...}, nFlags=SetAttrMode::DEFAULT, pPaM=0x0, bParagraphSetting=true) at sw/source/core/edit/edatmisc.cxx:187 #8 0x00007f98ea995f07 in SwTextShell::ExecParaAttr(SfxRequest&) (this=0x8bd0820, rReq=...) at sw/source/uibase/shells/txtattr.cxx:451 Fix it the same way commit dd489bc01adc22fc5015ea56b61d66104af184a8 (tdf#125754 sw_redlinehide: avoid recursive layout in SetHideRedlines(), 2019-06-19) did: make sure that SetHideRedlines() is called before EndAllAction(). (cherry picked from commit 39392ee94c78692a9179f7face15af0c9e74e492) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120139 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 6b393b6cc65992ba6af4476024bb2f26518c388b) Change-Id: I6304abec2e2e2967a8369b0219492bebcd606d03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126952 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#145093 sw track changes: fix crash at moving list itemsLászló Németh2021-12-173-2/+80
| | | | | | | | | | | | | | | | | | | | | over a tracked paragraph insertion (both in Show Changes and Hide Changes modes). Note: we needed a Python UI test, because uiwriter doesn't crash on Linux without this fix. Likely regression from commit a19dc0d9cc35ae1e200f51d86950595f6771e9c3 "sw_redlinehide_3: update frames in MoveParagraph()". Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123551 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit eda5ac4a63fac6bce939b6791dec52270618dc29) Change-Id: I3026c9136e2fa6dcc1f6b5bad1677846a6cfe614 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126951 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#145381 handle closing brackets in URLs correctlyArmin Le Grand (Allotropia)2021-12-152-6/+35
| | | | | | | | | | | | | | | | | | | | | The task presents an URL that ends with a closing bracket. If pasted to LO, the closing bracket got interpreted as not being part of the URL due to the heuristical interpretation of URLs in urihelper. Adapted this to handle matching brackets, so that an closing and ending bracket will be added to the uri text when there is a matching pair. Added unit test to testFindFirstURLInText with simplified uri example. Change-Id: I58dd460a37d0066ff46845832eabd2a790e4ccd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126832 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 76f29376183be48c076ada06159581ea981de3d1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126874 Tested-by: Armin Le Grand <Armin.Le.Grand@me.com> Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
* tdf#145671 Don't open URL twice in cell edit modeSamuel Mehrbrodt2021-12-115-7/+13
| | | | | | | | | | | Change-Id: I8a324d6a037c8a5c0efc0b2825657513c2f9841c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126159 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit b9362e87a3646a6693b81fb0d40e28ce7813a251) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126421 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#145828 Sidebar line styles: Default to "thin" widthSamuel Mehrbrodt2021-12-111-6/+6
| | | | | | | | | | | Change-Id: I78d754d36c7ea41f7e3259be331d23b8a25c480f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125771 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 2f43d95a0fb4bdd7121968ff9f365ffc325e5647) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126420 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* Border tab page: Use 'thin' widthSamuel Mehrbrodt2021-12-111-2/+2
| | | | | | | | | | | | | instead of random number Change-Id: I89f3be2d6bba02f1fbe52065fab81caded2656f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125699 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit f4eb555ff5294db037ea6e4d9510d0ca11276fa7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126419 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* border tab page: Explain how thick lines areSamuel Mehrbrodt2021-12-111-6/+6
| | | | | | | | | | | Change-Id: I802c0736dde6d87c8548968cfa9ce0481aba4f76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125700 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit d256707293706e2252f1e94bfb91fc84c34e5fae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126416 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#48622 Fix layout issue when "Custom" was selectedSamuel Mehrbrodt2021-12-111-56/+36
| | | | | | | | | | | Change-Id: Ie32a763b88cfc26b61d942214b16e008179d410c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124898 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 3746379f251091696b73463f7b27e8ef732dd20b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126415 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* Save with Glade 3.38.2Samuel Mehrbrodt2021-12-111-241/+343
| | | | | | | Change-Id: I238f8a5adee999fcaad09e8813742fba37a30396 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126414 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#127341 Do not activate TextEdit at right-klick on URL in calcArmin Le Grand (Allotropia)2021-12-102-2/+16
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126618 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 110d3504c1f738a1d7f740cc212064dafa4fb224) Change-Id: I1881c007a05f56d5cb7914da56243f551c2da1cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126597 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#48622, tdf#145828 use correct default for border line widthArmin Le Grand (Allotropia)2021-12-071-1/+3
| | | | | | | | | | | | | | Use correct default to create the intended 0.75pt cell border using the border formatting tool in the standard toolbar Change-Id: I8e95a7ab888cdc1b04929fd41753e550b96f3de4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126484 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 8995bc21ee570c9a914df71817a132c3b3637059) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126446 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#48622 Adapt sidebar line styles to new defaultsSamuel Mehrbrodt2021-12-054-34/+82
| | | | | | | | | | | Change-Id: I81287d90c2250838391fa79d2f6455219ea822c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124680 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit cd116a1b6775777f393990cc3419733164dee52f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126057 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#48622 Add new border line width defaultsSamuel Mehrbrodt2021-12-0525-104/+121
| | | | | | | | | | | | | | | | | | | | | | | | * Hairline (0.05pt) * Very thin (0.5pt) * Thin (0.75pt) * Medium (1.5pt) * Thick (2.25pt) * Extra thick (4.5pt) This unifies the default border line widths throughout the program. Users can still set any line width they want by chosing "Custom" in the "Border" tabpage. Also, existing documents won't be changed. The new defaults are just for newly added borders. Change-Id: I7af85dc189a688a749812824508c33c7814b50f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122683 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 41b99644e8913dd4797775f4931382e93fa12a00) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126056 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#48622 add border line thickness predefined values in UIVasily Melenchuk2021-12-053-13/+84
| | | | | | | | | | | | | | | | | According to multiple reports border line width selection will be more intuitive with some predefined values. Here is an implementation of this proposal: line width can be selected from combobox from predefined values (thin, medium, thick and custom). Classical spinner is right now hidden unless custom line width is selected. Change-Id: I87a6237335b79a5f5b63e109360e1ea8f12ae071 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114709 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 089c7d05fde13251eb8cd8daaf7627b6bb0072f9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126055 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#145062 sw: deal with failing insertion of field in SwWrtShellMichael Stahl2021-12-039-46/+59
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126191 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e58583e70b3434a158a3902cc7ae81d0b3bdfc49) Change-Id: Ic0c479e97b7a5f6fcc7f7eb454eb77a5c47de9db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126329 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#145062 sw: really destroy text attribute when insertion failsMichael Stahl2021-12-031-0/+8
| | | | | | | | | | | | | | | | SwTextNode::InsertHint() is documented to destroy its argument SwTextAttr in case insertion fails, but it doesn't do it on all branches. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126190 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 89eb90ceea414974289b57f15e769d08b80fe9a3) Change-Id: I270df9acf36993d894899c20c86a6bc43d782001 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126328 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* nss: upgrade to release 3.73Michael Stahl2021-12-025-121/+7
| | | | | | | | | | | | | | | | | | | | | | Fixes: CVE-2021-43527 Memory corruption via DER-encoded DSA and RSA-PSS signatures Includes: nss: upgrade to release 3.71 * external/nss/nss.getopt.patch.0: fixed upstream * external/nss/nss-win-arm64.patch: fixed upstream * external/nss/nss_macosx.patch: one hunk was fixed upstream Conflicts: download.lst Change-Id: I5c3f169c57fc2763029b07ad7e325b2f53b7e28f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126218 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit c8e21d246bcb4289cb25c82be440cd07b7418436) (cherry picked from commit c99f4359a2901bde5d6cfb623a47f99ba2d5e18a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126255
* oops, fix merge error in commit 08abcae56b13b11d699a30553f7edfc54225d687Michael Stahl2021-11-171-7/+3
| | | | | | | | | "ofz#40593 remove Objects from m_xResizeDrawObjects if deleted during parse" Change-Id: I715530cc19b670eef109e59148db2aac05bd33be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125376 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* postgresql: upgrade to release 13.5Michael Stahl2021-11-171-2/+2
| | | | | | | | | | | | | | Fixes CVE-2021-23222. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125308 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 71b9369f1cc40143108e3f2189d96e402895e315) Change-Id: I4e16fcc60c634382a864f66b211d0e0170a06db0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125334 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz#40766 svtools, sw: HTMLParser: really stop inserting control charsMichael Stahl2021-11-171-1/+5
| | | | | | | | | | | | | | | | | | | 35d248cab1f0d4800f72abb5cb6afb56f40d9083 forgot to fix one place where control characters were in a presumed XML declaration. Another place looks missing where comments are handled, but it's not clear if these can be passed on to Writer. Revert the previous fix from commit b3325ef8cdfc2c82eec34e747106f75a9fccb7e4. Change-Id: I11ad13de9122533626e512ce0384051e3e5bd97f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125306 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a7116b890ccd6dd1721413b4de6591a8057668ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125333 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz#40593 remove Objects from m_xResizeDrawObjects if deleted during parseCaolán McNamara2021-11-172-3/+33
| | | | | | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124563 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2f01faaf88b6d172d7293f0c9e2a061d99b8ceb5) fix misplaced line Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124630 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4ed359093c991291216c39cffe14a60e607ec551) Change-Id: I11fa665175ef067a36f4822676c02d4df1e1e250 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125332 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz#39304 short timestamp recordCaolán McNamara2021-11-171-5/+8
| | | | | | | | | | | Change-Id: I8f783473dd5d4679846c7c866cd1853ef7d919fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122628 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit bfc70a9f314bbb5b03247be25544e9b4cc467f8d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125331 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
generated by cgit (git 2.34.1) at 2024-05-11 15:34:20 +0000