summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-20tdf#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-20tdf#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-19tdf#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-19tdf#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-19tdf#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-18tdf#128195 Keep spacing below last paragraph in header (docx)Samuel Mehrbrodt
Add a layout compat option to keep the spacing below the last paragraph in the header in doc/docx files Change-Id: I259511183a8252e04d9951357dbdd4f4832523ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94577 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9b5805d1ef2b9e9c4e8f389c069807bf4489ea95) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96337 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-06-18tdf#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-18detect 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 707cd62e00a75f5a07ef3a4acf5df9d49e8e07c1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96030 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 07d3f573a6fb3556b90bbba979454ece91ae5a07) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96043
2020-06-18tdf#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-18tdf#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-17python 3.8--only compile: add tp_print to PyTypeObjectAdministrator
This is a backport of four commits to allow Ubuntu 20.04 to compile. 50ccb7e82b7053306721cbe220323be072306a29 d1786724b8e8e474e1f7e39012c1f19611841dc0 893a5249b934f92f072b89b9b558c9de593aa557 23d9966751566028c50ca95ca203d20f36c64f30 Thanks to Stephan and Noel who corrected various portions of my initial patch. Change-Id: I15f016024754165fd093ef95c52d7ba3f6d34397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96521 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-17tdf#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 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96467 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-17tdf#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-17tdf#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-16Resolves: 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-16tdf#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-16tdf#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-16rhbz#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-15Resolves: tdf#133985 make ok the defaultCaolán McNamara
Change-Id: I5fa0db660c03fb85a6a661b70fa9c14014c92579 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96279 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-14tdf#131912 sw: fix spell check correct deleting flysMichael Stahl
* SwEditShell::ApplyChangedSentence() should not call DeleteAndJoin() + InsertString() but ReplaceRange() * ReplaceRange() and SwUndoReplace need to set a new flag DelContentType::Replace to tell SwUndoSaveContent::DelContentIndex() not to delete flys but instead record the previous anchor positions * SwUndoReplace::UndoImpl() should also not call DeleteAndJoin() + InsertString(); instead call ReplaceRange() for the start node and then DeleteAndJoin() for any regex "\n" that were inserted (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: I485d79510ae233213cb4b208533871934c5e5ec6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96201 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit e1629c210ad78310e3d48c0756723134a27b89df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96204 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-14tdf#133459 Fix import of fields with user defined number formatsMaxim Monastirsky
commit 59ace23c367f83491a37e844d16f7d716eff6346 ("tdf#101710 Fix invalid style:data-style-name attribute") had a side effect of exporting user defined number formats under <office:styles> instead of under <office:automatic-styles> (which is valid, and what Calc does since forever). As it turned out, this didn't work well for fields: - For fields inside headers or footers, their number format wasn't imported at all. The reason here is that fields use the XMLTextImportHelper::GetDataStyleKey method to resolve data styles, and that method checks only automatic styles. Actually it resolves also styles from <office:styles>, because SvXMLImport::SetAutoStyles has a special code that merges styles from <office:styles> into automatic styles during content.xml reading. The problem is that headers and footers have their contents stored inside styles.xml, and no merging happens at this stage (unless it's a flat odf file). One way to solve this could be to explicitly check for styles from <office:styles> in XMLTextImportHelper::GetDataStyleKey (e.g. see previous gerrit patchsets, or XMLTableStyleContext::GetNumberFormat) I chose to simply modify the condition in SvXMLImport::SetAutoStyles, so that merging happens anyway. - Fields whose format resolution depends on the merging of SvXMLImport::SetAutoStyles, did import the number format itself, but not its language setting. This can be in one of three ways: (a) Fields in the document and the header, when both use the same format. In this case the format is stored once in styles.xml, so at least the consumer from content.xml depends on merging. (b) Field in the document with a user defined format - a regression of the above commit. Now stored in styles.xml under <office:styles> instead of in content.xml under <office:automatic-styles>. (c) Field in a header with a user defined format - depends on merging as a result of the above fix. The reason here is that the merging isn't done with the original SvXMLNumFormatContext objects, but with a newly created fake ones, which only have the format id correct (with the assumption that those formats already imported, and calling code could just find them by the id). The problem is that the fields code uses XMLTextImportHelper::GetDataStyleKey to get the language setting from style objects, and set the IsFixedLanguage property according to it, while we know that those fake objects don't have the language correctly set. Try to fix that problem by setting the correct language on those fake objects. Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: Ibb362df019921e040708d3bda83bf155535ec7af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95612 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit cd0dc1bc592d7952c36659da33d99ab964fe2e93) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96267 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-14tdf#133953 use a popover to show interactive row/column resize intoCaolán McNamara
because a simple tooltip won't fire under gtk for that interaction Change-Id: I487b5c05805e3d0233da9a3b3c5ff1912d98baf6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96275 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-13use dynamic_castDavid Tardon
Change-Id: Iac420c2dd37be392ae817e0433de68c983546667 (cherry picked from commit 06248bbaf21723f505d99c65906e5c6781c54c83) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96270 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-12sw: reindent thatMichael Stahl
Change-Id: Iea5784d98d2780166c88912f898f3da95d45e2ab Reviewed-on: https://gerrit.libreoffice.org/84623 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 933dc9f99d6f8d608f67514d1236b5b2904f2b0a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96203 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-12tdf#132321 sw: adapt fly at-para deletion to at-char wrt. sectionsMichael Stahl
971205dc2110c1c23ff1db1fc4041e2babf6fa9f changed at-char selection to check that not only the start is at the start of the section or the end is at the end of the section, but that both are true. Let's do this for at-para flys too for consistency, changing what was introduced with 91b2325808a75174f284c48c8b8afc118fad74e4. Change-Id: I1ec93b076d729288ce0809d1cfc24379aa9591ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96125 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit be2f539012d818eaa2d40a9cf199b53d32e1dee4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96149 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-12tdf#83309: docx import: allow for lists tabstop at zero positionVasily Melenchuk
Zero position is valid value for tabstop, but previously it was treated as "no tab stop defined". Right now writer distinguishes tab stop at zero postion and no tab stop. Change-Id: Ie32da3d36a263644ba85a882029a8b29ae0501c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95132 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d2e428d1abb9f2907c0b87d55830e8742f8209b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95561 (cherry picked from commit a380a06c1872091e8fa8c810e95a8e1d5dfe1820) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96178
2020-06-12tdf#132254 sw: fix block selection copy reversed orderMichael Stahl
The problem is that SwEditShell::CopySelToDoc() relies on the passed target SwPosition being after the target range by CopyRange(), but due to an erroneous update of aInsPos in CopyImplImpl() it was at the beginning of the target range. (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: Ie0846bd44f9349517878efcca996440bede05611 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96063 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 63a43218c369a43624e6bdbe880b7caa40a3b61a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96092 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-12crashtesting: sw: fix export of ooo24576-1.doc and ooo79410-1.sxw to odtMichael Stahl
Crashes because an at-char fly has its anchor node deleted, and during deletion of its text frame its SwAnchoredObject is updated, which asserts because of inconsistent anchor node in the fly and mpAnchorFrame; the immediate cause of the inconsistency is that SwNodes::RemoveNode() changed the fly's anchor node. The root cause is that in the sw_JoinText(bJoinPrev=true) code, a fly anchored at the end of the deleted node isn't moved to the surviving node. SwTextNode::JoinPrev() uses different arguments to ContentIdxStore::Save(), so use the same here. The implementation of several ContentIdxStore functions, including ContentIdxStoreImpl::SaveFlys(), ignore positions that are equal to the passed nContent index, so passing in SwTextNode::Len() looks wrong. (crash is regression from 98d1622b3721fe899c4e1faa0b4cc35695253014) Change-Id: I3a4d54258611da6b15223273a187c39770caa8e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93583 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b2b234269b13d5dfd8e7123a25d282d88fee33a0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96104 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-12tdf#120394: DOCX list import: simplify zero width space hackVasily Melenchuk
Since introducion of list format string hack with creation of zero-width-space can be much more simple. It was being used to indicate existing, but empty list label suffix to avoid stripping down numbering. Change-Id: I9a0c6047f806b2c656ef5dbab0c6b38200818bd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94383 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95346
2020-06-12tdf#132744 sw: fix subtle difference when checking end of sectionMichael Stahl
In a few places, such as CopyFlyInFlyImpl() and DelFlyInRange(), the passed start/end positions aren't necessarily from a cursor but can be section start/end nodes instead. (regression from 971205dc2110c1c23ff1db1fc4041e2babf6fa9f) Change-Id: I1fb24f1f9d027aa3685ac5a7459891cb8c2b9a41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96124 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit cc4b5091e739116a7ec83513fa1cd856f0130330) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96147 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-11tdf#101856 copy missing bookmark propertiesSerge Krot
- in case of undo/redo - in case of copying bookmark Change-Id: Ia21f42973b0e7c2cc4abfe2febe9818509aec4d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96038 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-11tdf#132754: DOCX import: changed default list start nubmerVasily Melenchuk
Default value for list numbering startAt is zero. If it is not proveded numbering starts from this value. Change-Id: I2cf7be9063e7bfb8b72d6ba77fcd9507e33bb848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93899 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit f8211e84a5239de25fe6dc45a4bb6b6f8673a1ee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96048
2020-06-11Resolves: tdf#133862 crash in customize toolbar in embedded mathCaolán McNamara
Change-Id: I2fc7f3620145e48516c3ca73c0a5d08dce11d78a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96035 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-06-11Fix 32bit linux buildSamuel Mehrbrodt
Change-Id: I4faf3fb20c632163f98264d162bbf85f80b3603d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93797 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit fa0d576378cafab396a3fb75b1dbe1905d5df9ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96090 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-06-10tdf#133641 sw: fix crash double-clicking CH_TXT_ATR_FORMELEMENTMichael Stahl
Only search for separator if there is one. (regression from 1c94842e053a20a739a181d38a35c324df3e62a7) Change-Id: I6697faa7cb83cab48084f9710f8c5018b9e738e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95905 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit cb28054d831c38ef645f635ecd80475fb5735679) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95979 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-10tdf#132725 sw: SwUndoDelete: don't group if flys are be deletedMichael Stahl
The fly would not be deleted by CanGrouping() but would be deleted later in RedoImpl() via the IsAtStartOfSection() check so just force a new Undo action in this case. (regression from 91b2325808a75174f284c48c8b8afc118fad74e4 and 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: I68f9f6b7fd0306bc0853a370b1030463a0024edc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96002 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 32c162ad1723512763b74d01eaec32c1296f3a55) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96037 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-10tdf#101856 evaluate condition to expand / collapse bookmarksSerge Krot
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/+/96003 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-06-10Update git submoduleszdposter
* Update dictionaries from branch 'libreoffice-6-4' to 9e5e632fd91eb14f4fd80023477a001a3bbea049 - upgrade Slovak spellchecking Change-Id: Id3bc65f957187d2c2ba98ba76a1ed4e9fab72c97 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/95987 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-10tdf#132597 sw: fix inconsistent handling of ExcludeFlyAtStartEndMichael Stahl
IsDestroyFrameAnchoredAtChar() checks the position but the only caller, SwUndoInserts::UndoImpl(), really wants to exclude the entire nodes, see IsCreateUndoForNewFly(). (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: I763ad3b7d82af03f6910dcf34315f793d090c62e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95952 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit f9fb86408e6e06c262332be26674305ae5c05bb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95982 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-10tdf#120394: docx import: support for w:styleLinkVasily Melenchuk
Previous implementation for w:numStyleLink was referring just ordinal styles, but there can be another abstract list marked with w:styleLink which should be used in given context. Change-Id: Ic5d4fe8bfd41b19e2f65d74defb6961e38ec9a9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94332 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95892
2020-06-10bump product version to 6.4.6.0.0+Christian Lohmaier
Change-Id: I0d8d1d617c14fed144b545c9c02d90e220b0f097
2020-06-09tdf#133604 sw: DOCX export: put CH_TXT_ATR_FORMELEMENT in its own runMichael Stahl
Commit b03fefcc4dbdfee3b9eeb5fa0e586dd12ddcd3d2 ought to have fixed this but didn't; the run following the CH_TXT_ATR_FORMELEMENT still ended up inside the field result. But when importing that into Writer, it appeared correct; Word shows the problem. (regression from 94e0b8407b02d76b27324b8b08012eb024aca9e9) Change-Id: I1fc1328223353422a83d403e8f790d156dbec4e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95843 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 7f2908b83a39bbb6fa648d6815265ad203f86ddc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95882 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-09tdf#133474 DOC import: fix lazy-loading of images with zero sizeMiklos Vajna
DOC typically contains images with a size hint outside the image, but this is optional. Make sure that we load the image in case the size is not available without loading. The effect is that once SwWW8ImplReader::MapWrapIntoFlyFormat() calls SwGrfNode::GetTwipSize(), we always get a valid size. Ideally without loading the graphic. (cherry picked from commit 369355da5c1e25bad7124dd6e187d9e381759751) Change-Id: I81536ceb44c6e455e9bf274a5852008443f9d64f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95907 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-09tdf#133595 FILESAVE XLSX: invalid content when opening file with shapeSerge Krot
Change-Id: I67fe29bbc9b982328a3efe63874922e7ed1a5854 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95490 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2081ab036bfd203d4d3be07064ef783baae97c3b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95671 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 23506180a82bae5c77bd1df4bef73dd4f687dae2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95880
2020-06-09tdf#101856 correct Insert bookmark dialogSerge Krot
- 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/+/95938 Tested-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
2020-06-09cache foreign content in win32 clipboard code (tdf#133267)Luboš Luňák
The slowness in tdf#133267 on Windows is because the Calc operation repeatedly calls ScDocument::IsClipboardSource(), which calls ScModule::GetClipDoc(), which proceeds to fetch the clipboard content, which means fetching it from the system clipboard if it's not owned by LO. Other LO clipboard implementations such as gtk3 or qt5 already do caching, and it seems that it's easy to do for the win32 code. Change-Id: I4696cc7488d66803fd5dd2963d27900957decdec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95163 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit fda6ad1458fcd5087c3dde56300b9d0367af6db5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95246 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 9b311cabd908c6bc9e7f7d461ee11eaf0ea6b18c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95749 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-09Resolves: tdf#125981 use original label, not current labelCaolán McNamara
Change-Id: Iddc1d3e38e70d91d60947d9867dcfb03cb5128d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95678 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-06-09Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-6-4' to c5cb3837549e8a2cfaeaf2afd3ad1a13f801d7cb - update translations for 6.4.5 rc1 and force-fix errors using pocheck Change-Id: I239cedab570e1b84982ec412851223028aadcaaa
2020-06-09tdf#126025: Non-const GetPropertyValueByName must use non-const Sequence []Stephan Bergmann
...which internally calls getArray to make sure it references a unique sequence. Regression introduced with 85f28ec44a2c169c91dac9346e9c71feda6a6cab "Clean up C- style casts from pointers to void". Change-Id: Id80b75f06322c65fc31040cc0b1892fe3a0aeaab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95862 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b505cd8635171e39d055b9a800f672a6313d8cea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95873 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-06-09tdf#132596 writerfilter: fix paste of RTF with header/footerMichael Stahl
The problem is that writerfilter inserts the content of header/footer into the body text, but then DomainMapper_Impl::PopPageHeaderFooter() calls RemoveLastParagraph() and deletes a body paragraph containing a fieldmark, and then in Undo some SwHistoryTextFieldmark can't find it, and since ffb26b81e1c7ff1d64959200247bb2edd5a569da this crashes. This is because of the borked error handling in DomainMapper_Impl::PushPageHeaderFooter(); the m_xBodyText->createTextCursorByRange() call throws an exception that is swallowed, so the m_aTextAppendStack doesn't have an entry containing the position in the header. To fix the error handling, set m_bDiscardHeaderFooter = false only when everything was successful. Also fix the call to be xText->createTextCursorByRange instead (this is a regression from 232ad2f2588beff50cb5c1f3b689c581ba317583). Then it turns out that Undo still crashes, because sw can't Undo changes of header/footer content, so just return early unless it's a new document. Change-Id: Ie5aeb45447c5fbd4b3ae15c4cffb9800583a6d1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95797 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 27151ccf2305eac4192f8c4ceeee267170096a19) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95824 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
generated by cgit (git 2.34.1) at 2024-06-30 16:37:50 +0000