summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-02-08tdf#114815 pyuno: avoid 2 threads initing python in parallellibreoffice-5-4-5Michael Stahl1-4/+21
According to the crash reports, it's possible for the grammar checking thread to call GetGrammarChecker, instantiating lightproof, at the same time as the main thread instantiates LngSvcMgr, which also instantiates (some?) (all?) grammar checkers. Ensure that pyuno_loader::CreateInstance() initialises Python only once with a C++11 thread safe static. For the backport, use rtl::Static instead, because on the 5.4 branch MSVC does not have HAVE_THREADSAFE_STATICS enabled. Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf (cherry picked from commit 5357ca82846ea7147ad61e9340f25647a5934eb0) Reviewed-on: https://gerrit.libreoffice.org/49116 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 362b0c521c1c58dc8ea5e87ecbb482d5bdc073f4) Reviewed-on: https://gerrit.libreoffice.org/49298 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-30bump product version to 5.4.5.1.0+Christian Lohmaier1-1/+1
Change-Id: I8e4cb42dec173793cc749ea40c29d626165613ed
2018-01-30Branch libreoffice-5-4-5Christian Lohmaier4-1/+1
This is 'libreoffice-5-4-5' - the stable branch for the 5.4.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.4.x release, please use the 'libreoffice-5-4' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ia49736ce47e2f07b911f9b446345214b8201d8f3
2018-01-30tdf#112033: enable the xml source feature when the experimental features are ↵Markus Mohrhard1-1/+5
enabled Change-Id: I066b2927c5e22664b7a4e96549da3a02ec4c99d3 Reviewed-on: https://gerrit.libreoffice.org/41085 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 65722772f00a40b8ca8adf21e31c22295ef7d215) Reviewed-on: https://gerrit.libreoffice.org/47696 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-30Updated coreChristian Lohmaier1-0/+0
Project: translations 99e18c2ef077a45a42d1aa889256b5d34b4d9760 update translations for 5.4.5 rc1 and force-fix errors using pocheck Change-Id: Ibcf7ffc02864d06fc0d6b6c5cd670f1577560941
2018-01-30Resolves: tdf#114221 generate both std97 and cryptoapi keys from password..Caolán McNamara2-8/+25
when we open a cryptoapi encrypted binary msoffice document. That way when we save as the same format, and try to reuse the generated keys for encryption, we have matching std97 encryption keys available because we always export using that scheme. Change-Id: I25f24a01d102242615768255ce888acb08ef6447 Reviewed-on: https://gerrit.libreoffice.org/48712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b5914ba44f2fff9f282b6a5cbe21cbebf19e45b2) Reviewed-on: https://gerrit.libreoffice.org/48914
2018-01-30DOCX import: handle horizontal flip of bitmapsMiklos Vajna4-2/+33
Horizontal mirror on the UNO API level, mirror on the vertical axis internally. (cherry picked from commit 4bdbb5502f5995727017e22bb8a74b9f45552067) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx Change-Id: If142274a8f81a6875059a2651af6d8470870a36a Reviewed-on: https://gerrit.libreoffice.org/48902 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-30tdf#115044: do not load external documents if it is not allowedVasily Melenchuk1-0/+9
Referenced external document data can be loaded after user permission from dialog or corresponding settings. Change-Id: If3aec37c8bbdee4aebeb99c7807e87c26df8e592 Reviewed-on: https://gerrit.libreoffice.org/48398 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 8b98991a66197a71953dbb900dc3aece6b4f9e3a) Reviewed-on: https://gerrit.libreoffice.org/48870 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-30CheckLinkFormulaNeedingCheck() for named expressionsEike Rathke3-1/+12
This is a combination of 3 commits. CheckLinkFormulaNeedingCheck() for .ods named expressions This is specifically necessary for named expressions that are used in conditional format formulas, for which RPN is generated at a later stage, not during import. (cherry picked from commit eae9648e99be53ba441d9d8207aac6f3ce211ef2) CheckLinkFormulaNeedingCheck() for .xls named expressions (cherry picked from commit 8512f13c42ae3fbb287a555616fe10ff04295616) CheckLinkFormulaNeedingCheck() for .xlsx named expressions (cherry picked from commit a1f933ee2b9e23a505d937035821e9571cf4119c) Conflicts: sc/source/filter/oox/defnamesbuffer.cxx e03cb5767c34f8157a492a6d6c3b0700d065052d 217c89822ab477a6c383d170ae739e44efd10fa3 Change-Id: I54ab8dc14f81d6b18b0d17f448187d19d8e396fc Reviewed-on: https://gerrit.libreoffice.org/48858 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-29tdf#106780 Fix for invalid attribute in impress ODFAbhishek Shrivastava1-2/+16
This patch fixes the invalid ODF generated in impress. In tables now the attribute is shown as table:name="default" instead of "text:style-name". For strict XML version we only set table:name="default" For Extended/Compatibility XML we set both text:style-name and table:name Change-Id: I894fd31f5f0eed3f77b216b3114b5da53acf1f9f Reviewed-on: https://gerrit.libreoffice.org/48373 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e3e2f6911d6231c706ce8c77e5cd6733335d6342) Reviewed-on: https://gerrit.libreoffice.org/48812 (cherry picked from commit 5563f111d5700bb03884cd469288b09281e37dd1) Reviewed-on: https://gerrit.libreoffice.org/48825
2018-01-29ofz#5747 short->sal_Int32 like in StgDataStrmCaolán McNamara1-2/+2
Change-Id: I254c00b1142d7187beabe5d18532efec036de494 Reviewed-on: https://gerrit.libreoffice.org/48757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-29ofz: check state in readblockCaolán McNamara2-16/+14
and change state to a bool and reuse it more Change-Id: Iaa46004b144836431dd386a68a8ab688fd1477f2 Reviewed-on: https://gerrit.libreoffice.org/48689 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-27tdf#114173 Preserve size of chart legend during xlsx exportBartosz Kosiorek3-21/+65
This is a combination of 2 commits. tdf#114173 Preserve size of chart legend during xlsx export During export chart into .xlsx file, the information about size of legend was not saved. Example of proper size: <c:w val="0.41459448854442293"/> <c:h val="0.23161616722845749"/> another issue was hardcoded "layoutTarget" which was always "inner": <c:layoutTarget val="inner"/> also properties regarding default text style was not preserved: <c:txPr> <a:bodyPr/> <a:lstStyle/> <a:p> <a:pPr> <a:defRPr sz="900" b="0" i="0" u="none" strike="noStrike" kern="1200" baseline="0"> <a:solidFill> <a:schemeClr val="tx1"> <a:lumMod val="65000"/> <a:lumOff val="35000"/> </a:schemeClr> </a:solidFill> </a:defRPr> </a:pPr> <a:endParaRPr lang="pl-PL"/> </a:p> </c:txPr> With this patch all these issues was resolved, and in case of layoutTarget "outer", the field is not availble at all, according to specification. Change-Id: I2c9b7a112bdd911542b5273e660222d7fefa2d88 Reviewed-on: https://gerrit.libreoffice.org/47358 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 84392651d2731cce91c3b2e144bed4ac07e4ddf1) crashtesting: multiple export failures since... commit 84392651d2731cce91c3b2e144bed4ac07e4ddf1 Date: Wed Jan 3 23:27:16 2018 +0100 tdf#114173 Preserve size of chart legend during xlsx export Change-Id: Iebc936a0f490d6b707dfee0343732753f56728e7 Reviewed-on: https://gerrit.libreoffice.org/48147 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fa68bed11c180ebb0d45fb7779d538098b2921ff) Reviewed-on: https://gerrit.libreoffice.org/48153 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/48726
2018-01-27xmloff: ODF export: don't write LO_EXT attribute unless ODF extendedMichael Stahl1-1/+4
The loext namespace is not defined when exporting standard ODF versions, which triggers an assert() in SvXMLNamespaceMap. (regression from 4469b29faeb8dbf7793a5d81d9c5ddebacf3015f) Change-Id: Ic93fb0ea8fe092463d3fd18a0fbf4429d8652642 (cherry picked from commit 55650f65de478bcee65fe1e1cf19f106e407f999) Reviewed-on: https://gerrit.libreoffice.org/48694 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-27CheckLinkFormulaNeedingCheck() for conditional format expressionsEike Rathke4-2/+29
This is a combination of 4 commits. Prepare CheckLinkFormulaNeedingCheck() to use either RPN or tokenized code Conditional format formulas aren't finally compiled until needed so the check will have to operate on the tokenized expression instead of RPN code. (cherry picked from commit faa0305ba3d0dc698fce4915d4f3a1fb52422380) CheckLinkFormulaNeedingCheck() for .ods conditional format expressions (cherry picked from commit 2930ba2ac5d9423f2848b968edcd8ddc71966186) CheckLinkFormulaNeedingCheck() for .xlsx conditional format expressions (cherry picked from commit fef24d9f999ee54d7936900485d97ff26656f517) CheckLinkFormulaNeedingCheck() for .xls conditional format expressions (cherry picked from commit af2a2a0c72db312902e466c36697b5c198041e82) 45eb1ab5efa0ec9da2663f20427d2474ce300826 31ede1a23223a798141a0891deeabd8cf88fff58 afa112cc591b411d80ead48bf726788d361f6eb3 Change-Id: I68837e9bd33f125ab47b10b1a6fa18175abd1627 Reviewed-on: https://gerrit.libreoffice.org/48719 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-27CheckLinkFormulaNeedingCheck() for .xls and .xlsx formula cellsEike Rathke7-2/+20
This is a combination of 3 commits. Move implementation to CheckLinkFormulaNeedingCheck() for further reuse (cherry picked from commit 55e484c7bcd3ef218e08d3fd93f97bf98fd8cb7f) CheckLinkFormulaNeedingCheck() for .xlsx cell formulas (cherry picked from commit f96dbc3dd9c33202f75e29ef49d962386595995d) CheckLinkFormulaNeedingCheck() for .xls cell formulas (cherry picked from commit 6bc48275558c3f76c4da25eb8af3c48583ac5599) a6dd195f7eb4d43483e87eeca59f651e7bf2dcb8 2587fbc4fec39b6f2c8e733331815a2953dee308 Change-Id: I541d2b6e12a88371c064b901b00e71206ee0c18e Reviewed-on: https://gerrit.libreoffice.org/48143 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-27Flatten ScRangeList::Join() and ScRangePairList::Join() recursionEike Rathke1-75/+89
This is a combination of 2 commits. Flatten ScRangeList::Join() recursion Joining an existing list of identical ranges could end up in a very deep (but not infinite) recursion which could lead to stack exhaustion. Recursion is unnecessary if we re-enter the loop with the picked range. Continuing the loop as it was done after recursion isn't necessary either, to the contrary, as long as there is one join try the entire list again. Commit f6eefd96cb16a9b5607fe59bdbf9b1121c9b56e8 pointed this out as the UBSan build runs with ulimit -s 8192 Reviewed-on: https://gerrit.libreoffice.org/48360 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 03f429665b4d57f63b8e2862a55e5c4273bc7a2b) Flatten ScRangePairList::Join() recursion Similar to ScRangeList::Join() done before. Reviewed-on: https://gerrit.libreoffice.org/48361 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 73049e5dbf9430df077dd26bed9d01435f745544) e513b4c72bc211c196e13761b63446174321a389 Conflicts: sc/source/core/tool/rangelst.cxx Backported. Change-Id: Ibbc542fc8ae6d1509744aa731771eb6e32a38841 Reviewed-on: https://gerrit.libreoffice.org/48411 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-27tdf#115088: Pasting multi-line text from external source behaves strangelyTamás Zolnai1-1/+4
Regression from: e68b6e349c31ac1376e90218013e1e7612f2b522 AppendTextNode might be sufficient for import (when there is no content in the document), but for clipboard operations better to use the original SplitNode method. Change-Id: I7de3e9bc9c5356acb0b4cc43927a0d39079522b2 Reviewed-on: https://gerrit.libreoffice.org/48124 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 657da4697379274295e9fd32d3abc1334ebd50d2) Reviewed-on: https://gerrit.libreoffice.org/48206 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-27tdf#114939 sal: fix endMD5() off-by-oneMichael Stahl2-1/+93
Because of the odd non-standard rtl_digest_rawMD5() API that is apparently necessary for MS Office interop, and there not being any good reason for bug-compatibility here, just fix the bug. Change-Id: Iaa0f0af4e24a5ddb9113c1ebd126f9822b5af1f6 (cherry picked from commit 18b022cadfa590df9dbefe0433b58838bcc3d2af) Reviewed-on: https://gerrit.libreoffice.org/48019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 17e01d692bf1ff13f3c2f5af599c688d52a911b6) Reviewed-on: https://gerrit.libreoffice.org/48525
2018-01-27ofz#5535 max decimal places for rtl_math_round is 20Caolán McNamara2-2/+5
Change-Id: I636e086c51ceb70bdac72acfbabe99ad29003cdb Reviewed-on: https://gerrit.libreoffice.org/48268 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/48303 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-26gtk3: single click with selection set doesn't unselectCaolán McNamara1-1/+1
this is a safe backportable fix, the unconditional nFlags |= SelectionEngineFlags::CMDEVT looks the real dubious thing to me, but only the gtk3 backend has swipe support so just returning immediately on a swipe definitely ok Change-Id: Iade26d0d9260ce76dfb2766ac9e5ca9fa9275bf4 Reviewed-on: https://gerrit.libreoffice.org/48528 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-25tdf#115080 menu id collisionCaolán McNamara1-5/+5
21 collides with the pattern field menu id Change-Id: Ia90995861adabbe1615e24ee10defe25cee76c56 Reviewed-on: https://gerrit.libreoffice.org/48487 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-25Add to nPos once instead of in each iterationEike Rathke1-5/+3
(cherry picked from commit d728492f4aa195fd4aec3ddb116879de76a95c6d) Change-Id: I9ab9d5be1edead3a83375d87910bc9128c894b85 Reviewed-on: https://gerrit.libreoffice.org/48302 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-25tdf#109062 restore osx scrollwheel logicCaolán McNamara1-9/+12
to pre commit f7d2bf216afa10268e6a7c1d4613a2fd8f7c7f3c Date: Tue May 16 10:12:09 2017 +0100 Resolves: tdf#103174 & rhbz#1367846 improve gtk3 trackpad scrolling state. Change-Id: If5a494441731e73136158b4905c2744ba8bc8875 Reviewed-on: https://gerrit.libreoffice.org/48306 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-25tdf#114628 unit test for line spacingSzymon Kłos1-0/+94
* two cases 60% and 150% line spacing Change-Id: I2ce66cd19f459b738243052b5c12da0bbb883ebe Reviewed-on: https://gerrit.libreoffice.org/47303 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/47582 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-25ofz#5566 sw: HTML import: ignore <DIV> in table structure elementsMichael Stahl3-12/+24
Looking at the HTML4 DTD https://www.w3.org/TR/html4/sgml/dtd.html, inside TABLE only various elements defining the structure of the table allowed, except inside cells (TD and TH elements). DIV in a table but outside cells may cause cursor positions to go off the rails, so better ignore such invalid DIV tags. Reviewed-on: https://gerrit.libreoffice.org/48359 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8b1a83bffe35ae0e71735569512c1586bcb37b25) Change-Id: Ia6195d80670631669c252d572242874b13642b74 Reviewed-on: https://gerrit.libreoffice.org/48526 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-25curl: fix CVE-2018-1000005/1000007Michael Stahl3-0/+148
* don't upgrade to new release, no idea how the new windows build system likes targeting Win XP which is still supported in 5.4 Change-Id: I4fbd7f1c5f1f0563895f6f8ede10063621d10a4b Reviewed-on: https://gerrit.libreoffice.org/48542 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-24ofz: check nLevel against maParaSprms sizeCaolán McNamara1-1/+2
Change-Id: I9bcaf176e6a2f70348712ca98c4176125c2f455e Reviewed-on: https://gerrit.libreoffice.org/48521 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-24update creditsChristian Lohmaier1-2055/+2608
Change-Id: I50973ddb45ec9269eac4954026ff25e28289dc5d (cherry picked from commit 3475b95a18f1b1368bcfc20bd3d09b9c02ec33cb)
2018-01-23tdf#112153: Set button theme properlyTelesto1-1/+1
Change-Id: I0665880c0d0348fcbb3bcf04d9172405c8e31eb7 Reviewed-on: https://gerrit.libreoffice.org/48334 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 44af50465a02b6f5566be45913a34fdbdba90133) Reviewed-on: https://gerrit.libreoffice.org/48455
2018-01-23tdf#114460 vcl: handle nested parentheses in PDF roundtripMiklos Vajna3-0/+11
The roundtrip of the pdf image failed due to this. (cherry picked from commit f58a16d5987c8e8c16580c514ce0c7b0895b4105) Change-Id: I88a9657e242dd2659f9bf06233e5fcbfeb43ceb5 Reviewed-on: https://gerrit.libreoffice.org/48453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-23tdf#115023 Check mpControlData for nullptrMaxim Monastirsky1-1/+2
Control::ImplClearLayoutData happens to be called post dispose, but Control::dispose already destroyed mpControlData. So put back the nullptr check that was removed in e8b49f09074fe184374bee5062715357427ae044 ("new loplugin: useuniqueptr: vcl"). (But IMHO it's odd that we even try to send lose focus events to disposing windows. So maybe it would make sense to replace the "! pOldFocusWindow->IsDisposed()" check inside Window::ImplGrabFocus with "isDisposed()" which comes from VclReferenceBase, and set much earlier?) Change-Id: Iddaf7e05d6cb56c28a34884876770753fcf7179e Reviewed-on: https://gerrit.libreoffice.org/48246 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 2a2b37202a735b34da914c03b2f6e1495f833b51) Reviewed-on: https://gerrit.libreoffice.org/48252 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-23Handle also the case where a range extends an existing one with overlapTor Lillqvist2-4/+65
Check for a new range being joined Extending an existing one in any of four directions (up, right, down, left), within a tab (sheet), that is. And add unit test for this. Reviewed-on: https://gerrit.libreoffice.org/42304 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 596efaad51735a130e7b7bd27dbc34dc07f32f68) Change-Id: I4bd0525c2837f8b4b9d5a8967e0d5d661c6a5e2f Reviewed-on: https://gerrit.libreoffice.org/48410 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2018-01-23its defineresource not define resourceCaolán McNamara1-1/+1
regression from commit 64d624b65124ac02d8ee59b135593fd9d8eb9067 Date: Sat Jan 9 22:55:28 2016 +0100 Fix typos Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Change-Id: Ifdf45e97b81523c84c73b93d14ed75b7b6909f77 Reviewed-on: https://gerrit.libreoffice.org/48357 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-23ofz#4754 sw: HTML import: fix invalid tables being createdMichael Stahl1-0/+1
This 75-byte horror creates 2 nested tables, where one SwTableBox is in the SwTableLine of the inner SwTable but in the SwSortBoxes of the outer table, which is of course invalid. The root cause is that in SwHTMLParser::SplitAttrTab(), we move the m_pPam backward once and forward twice, moving it ouside the inner table. Change-Id: I63f6508afe1270ccdeb05da6f222b0aba5259889 (cherry picked from commit e1a4a8c180f98aac0ab21a22a6a03d2109c712be) Reviewed-on: https://gerrit.libreoffice.org/48146 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-22Related: tdf#114251 disable vectorization of svDoubleRefEike Rathke2-1/+15
It doesn't work, not knowing how to handle implicit intersections not only produces huge unnecessary matrix operations but also delivers wrong results. Unit test will follow as a separate commit. Change-Id: I14982d4a53d6af57196da998e53d426502c22fec Reviewed-on: https://gerrit.libreoffice.org/46647 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 67444cbe5dae6e24db776ab712017ad063319276) Reviewed-on: https://gerrit.libreoffice.org/46670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-22Type svIndex does not necessarily mean range name, tdf#114251 relatedEike Rathke1-0/+7
Change-Id: I5e7930b7f93ee44fb0d6b4c86f261afde8ed2ccc Reviewed-on: https://gerrit.libreoffice.org/46615 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit ecac94f3a6872538c19827603b52f1ed7e671a4c) Reviewed-on: https://gerrit.libreoffice.org/46668 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-22copy ScAddress before possibly joining itCaolán McNamara2-1/+3
Change-Id: Ib1148584b9771da67d3f4b3141184228e1bbe3a2 Reviewed-on: https://gerrit.libreoffice.org/48271 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f6eefd96cb16a9b5607fe59bdbf9b1121c9b56e8) Reviewed-on: https://gerrit.libreoffice.org/48298 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-20tdf#115079: check that row frame belongs to table frame to avoid segfaultJulien Nabet3-1/+13
A row frame may not belong to a table frame, when it is being cut, e.g., in lcl_PostprocessRowsInCells(). Its SwRowFrame::Cut() has been called; it in turn called SwLayoutFrame::Cut(), which nullified row's upper in RemoveFromLayout(), and then called Shrink() for its former upper. Regardless of whether it will be pasted back, or destroyed, currently it's not part of layout, and its height does not count. See bt https://bugs.documentfoundation.org/attachment.cgi?id=139171 Change-Id: I4010e1f246a3ebb89b3f972a03619a2775146da4 (cherry picked from commit daf1b10f4e266818b6e14f0f1dfddd66f0a3a2f0) Reviewed-on: https://gerrit.libreoffice.org/48234 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-19ofz#5477 if the para is already oversize, nums would go negativeCaolán McNamara1-4/+5
Change-Id: I183e1377747f662da1204e90a24fb4f8f2268699 Reviewed-on: https://gerrit.libreoffice.org/48158 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-18Resolves: rhbz#1535541 fdo#88004 mimetypes are .macroEnabled not .macroenabledCaolán McNamara22-57/+57
Reviewed-on: https://gerrit.libreoffice.org/48121 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 10b07347911aee87d13b343072bac01abe0e535a) Change-Id: If7942ec9d4cd40f29fae2b9a8f76df1ef08bfc17 Reviewed-on: https://gerrit.libreoffice.org/48125 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-18ofz#5447 on plcf save force current Fkp to stick in cacheCaolán McNamara2-5/+21
Change-Id: Id7b6c442df10c6de7226702a9bf3ba559a0c2e9a Reviewed-on: https://gerrit.libreoffice.org/48054 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2018-01-16Resolves: tdf#114539 only pop own parameters from stackEike Rathke1-1/+2
... and not another pending one.. Change-Id: Ief5c27ccfb0b4121f2ba019e0fb8770dabbf60cf (cherry picked from commit 4b444b4c1efc2be219e6975e30048ff616fdac0f) Reviewed-on: https://gerrit.libreoffice.org/46801 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-16don't export category info to bubble charts, tdf#103988Markus Mohrhard1-1/+1
Change-Id: Ic2ecd959841172db3f4016b4a1ba667238c6c508 Reviewed-on: https://gerrit.libreoffice.org/46749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 1252f32496193e8ed532de744db31413768b8efa) Reviewed-on: https://gerrit.libreoffice.org/46815 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-16fix validation error in lineChart export, related tdf#57832Markus Mohrhard1-2/+2
Change-Id: I282a6f476830d688837a9731234aaba37a13de16 Reviewed-on: https://gerrit.libreoffice.org/46673 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 70f9eb96ce3346e24d11ece1b2a75798cbb3c476) Reviewed-on: https://gerrit.libreoffice.org/46767 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-16handle ocWebservice similarly to ocDdeCaolán McNamara10-45/+252
might have too much in here seeing as we don't need to worry about ocWebservice calling into itself Change-Id: I0145f38cc1c1f9ff514a496f7101d81cde9e7c67 Reviewed-on: https://gerrit.libreoffice.org/47819 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-16Better handle ScDde formulas with missing dde-link entriesCaolán McNamara7-11/+19
typically each ScDde formula has a matching table:dde-link which results in a ScDdeLink getting inserted during the load. If that dde-link is missing then no ScDdeLink exists and ScDde() will create a new one without cached content. So detect that ScDde is used in the freshing loaded ods and defer fetching new content until the right time. only call GetHasMacroFunc to set SetHasMacroFunc and bHasMacroFunc is not accessed any other way, so this is an oxbow Change-Id: I016b53288076d83dd49e92e245346a5f7f560522 Reviewed-on: https://gerrit.libreoffice.org/47757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b0597ba5d745974fce752e1b677451a19350d351) Reviewed-on: https://gerrit.libreoffice.org/47818 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-16tdf#114992: fix crash in deleting sheetJulien Nabet1-1/+1
See bt: https://bugs.documentfoundation.org/attachment.cgi?id=139087 Change-Id: Iee72385a8e5400436da72fe5e18b8cdfccad193d Reviewed-on: https://gerrit.libreoffice.org/47850 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 1d71f886d6760e5b3eeb4a0f9aaaead0816a45aa) Reviewed-on: https://gerrit.libreoffice.org/47860 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-16Add back initialization of ScNavigatorSettings::maExpandedVecStephan Bergmann1-0/+1
...lost with 2ea92be9973e6892727eae37ae958863702b3658 "convert SC_CONVERT constants to scoped enum". And indeed, e.g., opening the document from <https://bugs.documentfoundation.org/show_bug.cgi?id=114932#c2> through steps 1 and 2 in a UBSan build reports a use of an uninitialized (bad-valued) bool in ScNavigatorSettings::IsExpanded. Change-Id: If0dfadc6bd8033e61e334f59b3028ab005a892cd Reviewed-on: https://gerrit.libreoffice.org/47767 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit fbec01b7af438fc7409c875e59be7483772b53a2) Reviewed-on: https://gerrit.libreoffice.org/47787 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-01-15ofz#5254 Bad-castCaolán McNamara3-1/+23
Change-Id: I318d441d841dd4c783f87ac2f3f699852e8b1039 Reviewed-on: https://gerrit.libreoffice.org/47805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>