summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-09-12tdf#104602: don't re-draw page background when bOnlyTextBackgroundJustin Luth1-3/+2
In 2014 Writer gained support for Paragraph and PageStyle DrawingLayer FillAttributes, it changed some behaviour with PaintBackground, so that compat setting BACKGROUND_PARA_OVER_DRAWINGS now overwrote the entire "hell" layer as the page background was re-applied. Only DOCX uses this 2012 compatibility setting. Change-Id: I69517efb7d82acd719d6a27a09ba61554dbf1ec9 Reviewed-on: https://gerrit.libreoffice.org/41744 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/42166 Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-09-10tdf#112306: containsSemiMixedTypes is true for blanks-onlyMike Kaganski3-46/+66
Also export containsNonDate Change-Id: I16283a272d51e6c305f8c381c359168c1e3848a8 Reviewed-on: https://gerrit.libreoffice.org/42130 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/42131 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-09-08tdf#112280: Export spin animation in PPTX.Jan Holesovsky3-10/+89
Contains also: tdf#112280: Unit test. Change-Id: I9f13bbc2bd3a3de582491ea5b2ad16535589420a Reviewed-on: https://gerrit.libreoffice.org/42079 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-09-08tdf#111974: Ensure sufficient space for all sheets in FormulaBuffer...Dennis Francis3-1/+11
and not just for the number of sheet fragments. This is important because we changed the internal storage of FormulaBuffer from based on std::map to std::vector in d17a83fa549f828f29e6939b16ba8b568a75f95e Added simple unit test that loads the bugdoc in subsequent_filters-test.cxx Reviewed-on: https://gerrit.libreoffice.org/41792 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> (cherry picked from commit 20169423d492b58ab93fb0e8e9d2918c0baebc92) Reviewed-on: https://gerrit.libreoffice.org/41841 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Conflicts: sc/qa/unit/subsequent_filters-test.cxx Backported. Change-Id: I7320dd537266e540d585d3fccfbb8665bba457c7 Reviewed-on: https://gerrit.libreoffice.org/42057 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 500b5727fd5902b7d14c6e707c2ad3d2b227bb1a)
2017-09-08Resolves: tdf#112269 libwpd fixCaolán McNamara2-0/+43
Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 Reviewed-on: https://gerrit.libreoffice.org/42056 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 05da1c67e49a2d758799db735a826c4d292fea44)
2017-09-08tdf#112163 sw: avoid crashing in layout on this documentMichael Stahl1-4/+11
SwTextFrame 0x5dfb7a0 is join locked so doesn't GetFormatted() so doesn't have a SwTextLineAccess created; add some defensive programming just to make it not crash. Whether this is the right fix or just a workaround for something going wrong in the 179 layout stack frames is beyond my meager knowledge. In case anybody has an obvious idea, the layout frames that are currently being formatted (SwTextFrame or SwTabFrame) are: #3 0x5dfb7a0 is master of 0x5e56330 #4 0x5e56330 #10 0x5e5f3f0 is follow of 0x5e56330 #19 0x5e60d30 SwTabFrame::Split #30 0x5e56330 #44 0x5dfb7a0 #53 0x2cefae0 master of 0x5dfb7a0 #57 0x63d1440 SwTabFrame::MakeAll is follow of #58 #58 0x5e106c0 SwTabFrame::MakeAll #68 0x5e812d0 #77 0x5e11f80 is master of #68 #86 0x2cef600 is master of #77 #90 0x5f86c00 SwTabFrame::MakeAll #91 0x63d0150 SwTabFrame::MakeAll #98 SwFlowFrame::MoveFwd #101 0x63cf3d0 #110 0x5e05ff0 is master of #101 #119 0x5e0c700 is master of #110 #128 0x5bd0ad0 is master of #119 #136 0x5f8b800 is master of #128 #145 0x86b29a0 is master of #136 #154 0x2c37340 is master of #145 #158 0x5e04ab0 SwTabFrame::MakeAll #168 0x2c371a0 #173 0x5e16340 SwTabFrame::MakeAll Change-Id: I716b5faec1512cbf1fbdb04a436da302bd628c51 (cherry picked from commit 6c8c51231e7415ecc20d1343211acf8382666613) Reviewed-on: https://gerrit.libreoffice.org/42041 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b8e84ac201f5611635177f8404c28f7fa8d0c806)
2017-09-08tdf#112164 sax: handle errors on last call to XML_Parse()Michael Stahl3-5/+10
If XML_Parse() is called with isFinal=1 and there are open tags, that is an error (XML_ERROR_NO_ELEMENTS) that must be converted to an exception. This reveals that we already had an incomplete input document, which needs to be moved to "fail" now. (cherry picked from commit e530a7ddb1c9423487ce936e6b23b8e36449d555) tdf#112164 add test document (cherry picked from commit aad2cdce2a2e89f35366c55878129d268cc92bef) Change-Id: I7ce3b51bd87923b5edde621508cf38d7ebbc2b14 Reviewed-on: https://gerrit.libreoffice.org/41965 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 3604ca211204b9a0971a65c96a5075ba43f15693)
2017-09-08tdf#112122 xmloff: inserting index marks into editengine throwsMichael Stahl1-2/+9
Catch the exception, since that isn't even invalid input, editengine just can't do it. Change-Id: I362923889add4f1a1d3f8f18b0795993119d54b1 (cherry picked from commit 98552e46521b012e7694c056eca956ae4ee27a0c) Reviewed-on: https://gerrit.libreoffice.org/41759 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 037d5fa9b129a4060f8f572cb72801b7dfa1608f)
2017-09-08tdf#109261: Crash when adding a video to a slide with zero undo stepsTamás Zolnai1-2/+6
When undo is disabled (no undo steps), ReplaceObjectAtView() method frees pPickObj, so we need to save it's reused data first. Reviewed-on: https://gerrit.libreoffice.org/41822 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 27068e6cc39aed8ebfa5fdd7a67acb89f5adcb89) Change-Id: Icbc800d4d33cf229006aecde7d62aa2a7ea35879 Reviewed-on: https://gerrit.libreoffice.org/41861 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3ce90f78ed77c76ec6e0af3731f2fb37628ef89c)
2017-09-08Resolves: tdf#112018 number-columns-repeated has the data type positiveIntegerCaolán McNamara2-1/+1
Change-Id: I534885fe7a36a8e3ad891a3f5ed50b589f36e3b9 Reviewed-on: https://gerrit.libreoffice.org/41692 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3415764d00044a19568b3a1b5d5382c73a0342c9) Reviewed-on: https://gerrit.libreoffice.org/41964 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit eab61f66c6cfa4b290c8789a375e6894be054f32)
2017-09-08Resolves: tdf#107249 round ascent/descent/extleading on conversion to intCaolán McNamara1-10/+15
Reviewed-on: https://gerrit.libreoffice.org/41944 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 0c8b749e602b6743857a9bc4efb24b6183690311) Change-Id: Ia3ab5960d5288f5831aaa4ade800ca7513dad766 Reviewed-on: https://gerrit.libreoffice.org/41956 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit e0ea7df25faeaae9f98ebde32f49eec92603d629)
2017-09-07tdf#99617 convert powerpoint angle to degreeRegina Henschel1-6/+6
1 powerpoint angle unit = 1/60000 degree Roundtrip test not yet possible because of tdf#106002. Change-Id: I5854c4f9f013f1a2db7e9536fc9cf5198c7a02ed Reviewed-on: https://gerrit.libreoffice.org/34279 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/42078 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-07lok - support for watermark - fix namespace problemMarco Cecchetti1-1/+1
Change-Id: I76426f11c3155263652d786c62eb32f823ee1f18
2017-09-07tdf#106867: Export videos in PPTX.Jan Holesovsky10-9/+235
Contains also: tdf#106867: Implement pptx export of AnimationNodeType::COMMAND. tdf#106867: Import target for commands in PPTX. tdf#106867: Write also the extended markup to fully support embedded videos. tdf#106867: Unit test for the export of embedded videos. Change-Id: I7f4f389a72aa7ecef65d87f07bb69ba8f3374a14 Reviewed-on: https://gerrit.libreoffice.org/42017 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-09-07tdf#111884: Implement export of group shapes in pptx.Jan Holesovsky6-39/+90
Contains also: tdf#111884: Unit test. related tdf#111884: GroupShapes are now handled in oox. Change-Id: If12984c0670db6396cbfd0dcb8ae1f5a9b591705 Reviewed-on: https://gerrit.libreoffice.org/41766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/41997 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-09-06build fixAndras Timar1-1/+1
Change-Id: Ic364e27f8ad4996ae1756ec57222cf37fd7ca814 (cherry picked from commit a1ab6d4ec05c5d091db6f3f1ebafe38438efc5ba)
2017-09-06lok - support for watermarkMarco Cecchetti1-5/+44
Extends doc_renderFont in order to generate text of requested size. Change-Id: I0ebd48f8714b7772b764f3aba3e13754869c5117 Reviewed-on: https://gerrit.libreoffice.org/42015 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-06Revert "tdf#111798 Fix deformed export of flipped custom shapes to pptx"Jan Holesovsky5-74/+5
This work is incomplete, rather I'll fix my conflicts. This reverts commit 9c0387ef602d84d0079828f0ad4b53ada7ab1d8a. Change-Id: I20961cee4a5c28fc5486ca385974e9fcd5827dbe Reviewed-on: https://gerrit.libreoffice.org/42012 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-06Fix PageShape export to pptxPaul Trojahn1-1/+2
The export code is not called, because the PageShape is actually of type presentation.PageShape and not drawing.PageShape. A PageShape has no text at all, which results in an empty p:txBody element that fails validation, so it needs to be checked first if the shape actually has text. Change-Id: I559f15c2396739c74d5c4f36eb952754bc040ce8 Reviewed-on: https://gerrit.libreoffice.org/38574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/42002 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-06tdf#111798 Fix deformed export of flipped custom shapes to pptxPaul Trojahn5-5/+74
Shapes were deformed because flipping wasn't considered when removing the rotation. Also WriteShapeTransformation needs information about flipping to convert the angle correctly. Change-Id: I7d485e93c00e02b9ec6c73ad6ae2876e5bc6360a Reviewed-on: https://gerrit.libreoffice.org/41462 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/41996 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-09-04tdf#109241 desktop: Win32: prepend "program" dir to $PATHMichael Stahl4-11/+50
The problem is that python modules (*.pyd) find DLLs in the wrong places. This is because sal_detail_initialize() calls SetDllDirectoryW(""), which removes (sometimes?) the "current directory" from the DLL search order, which is deliberately initialized to the "program" dir by CreateProcess() calls in officewrapper.cxx. Loading DLLs still works for LO's own DLLs since they are all in the "program" directory, which is the same directory where all the executables are, so it is searched first. But CPython loads its modules with LOAD_WITH_ALTERED_SEARCH_PATH, which doesn't search the directory of the executable but the directory of the immediately loaded DLL i.e. the *.pyd file instead, i.e. python-core-X.Y.Z/lib. It would be possible to call SetDllDirectory(".../program") instead but probably that would require patching python since it needs to be done in the real exectuable, not in the wrapper executable. So overwrite the $PATH again (like was done in the days of the office of the holy trinity) in the officewrapper.cxx and genericloader.cxx to prepend "program" and get priority over the rest of $PATH. This still doesn't protect against C:/Windows/System32/LIBEAY32.DLL since that has higher priority than $PATH but hopefully nobody is *that* stupid. This patch fixes soffice.exe, swriter.exe etc., and unopkg.exe. The python.exe wrapper already prepends "program" to $PATH. Change-Id: If03f07eba9a2c7fc6cf44f82f639b5d0b4c62e20 (cherry picked from commit 9990e98d67bf14003cde8f0138d2dcfa804406ac) Reviewed-on: https://gerrit.libreoffice.org/41817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 4ce1f36e6f4fd7ea923cf2ae81895f6e45919ba6)
2017-09-04tdf#111939: Fallback to getting view data from best view shell...Dennis Francis1-0/+6
...when ScDocShell::GetViewData() returns nullptr. This is needed when a macro is run from the macro editor window instead of running the macro from Tools menu in the Calc window. Change-Id: I89c23c2ec08e8e9907f02eb1389236111530058b Reviewed-on: https://gerrit.libreoffice.org/41733 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk> (cherry picked from commit c864fc9eab79d0b24036588cf8fc37ef51bd1907) Reviewed-on: https://gerrit.libreoffice.org/41757 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 980fbcaf9de67013b1e72806de7746543040d48e) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2017-09-04tdf#104252 EMF rendering, set correct VirtualDevice sizeSzymon Kłos2-3/+6
ClipRegion is bounded to device size. That resulted in missing text in case of PDF export with EMF+ images under Windows (with hardware acceleration). VirtualDevice size was always equal to the screen resolution what is not enough to draw complete PDF. This patch modifies VirtualDevice size to match target size. Change-Id: I762be6a6ca6fab3897b57f370fecc3f3568a58cb Reviewed-on: https://gerrit.libreoffice.org/41390 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2017-09-03tdf#89139 Fix exporting of DateTime to CacheDefinition according to ISO 8601Bartosz Kosiorek4-57/+146
With this commit, the date is saved in Excel format, like: "2009-07-06T10:53:02" We are now exporting attributes: "minDate" "maxDate" "containsDate" This is necessary to export properly .xlsx file. Without that MS Office 365 is displaying error, and it is not even trying displaying .xslx file content Reviewed-on: https://gerrit.libreoffice.org/41162 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> Change-Id: I1239f5582173afe99bf9178fd4edd1dc5ca28e8e Reviewed-on: https://gerrit.libreoffice.org/41871 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-09-01Resolves: tdf#112123 check m_xAutoStyles like in similar methodsCaolán McNamara2-0/+3
Change-Id: I099da789a0e64fd862d09bb462ccb699e1dc8b9f Reviewed-on: https://gerrit.libreoffice.org/41753 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3576aa7a7328b04faf222451d73681db7c1d9c54)
2017-09-01Resolves tdf#112101 crash on particular file with office:event-listenersCaolán McNamara2-2/+3
Change-Id: I99a007543f90f4024666d296e9a775f8cee15086 Reviewed-on: https://gerrit.libreoffice.org/41725 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit fb8fba4a99e71ba9faa9d93dc126bae80baffdde)
2017-09-01Resolves: tdf#112017 crash on particular odtCaolán McNamara2-1/+2
Change-Id: I6ba2e73562a16afecb6abdfe4f1a40b1e316379e Reviewed-on: https://gerrit.libreoffice.org/41712 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 932a81e9c31a3a5bf5edad3d9e79b111e19b113d)
2017-09-01tdf#100501: Adapt to Java 9 (at least on Linux x86-64)Stephan Bergmann2-2/+8
Checking with both jdk-9+181_linux-x64_bin.tar.gz and jre-9+181_linux-x64_bin.tar.gz as currently available at <http://jdk.java.net/9/> "JDK 9 Early-Access Builds": For one, make SunVersion::init understand <http://openjdk.java.net/jeps/223> "JEP 223: New Version-String Scheme" at least insofar as to accept strings like "9" with less than three dot-separated segments (where the missing segments are treated like "0"). For another, at least for Linux x86-64, libjvm.so is now apparently located in a path without an "amd64" architecture segment, "lib/server/libjvm.so". (But could that also be "client"?) Other platforms may need further adjustments. (cherry picked from commit 52ffad9bb7be800790de6d918154dbeade88cadd, plus cda4cea7cdfc9a8de814b901b3b957f029d36aaf "tdf#100501: Fix thinko") Reviewed-on: https://gerrit.libreoffice.org/41678 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c83aec1d026b9567e7e6d982e4d19f3a566b66d2) Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713 Reviewed-on: https://gerrit.libreoffice.org/41700 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit a2fb0739bd1a9823f9b52f8efabae0bcf9ff6b0c)
2017-09-01ofz#3154 check bounds of special sprmCaolán McNamara8-29/+52
Change-Id: I82566e2f2ad479c392f06ae7149e3781c0338e50 ofz: sanity check L_VAR2 record bounds Change-Id: I862457a7239108974f360a87b4f6ccf433eae364 Reviewed-on: https://gerrit.libreoffice.org/37534 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 016e4d0e2650b2fb350068d86e8d392a7ef5acb1) ofz: stay within available data Change-Id: Ic959cf5b2cd92ba5bc297e686beb1fd50427a994 Reviewed-on: https://gerrit.libreoffice.org/36102 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 fdcac49119d3fc9f6216af834e7afc56d2c2e376) Reviewed-on: https://gerrit.libreoffice.org/41648 Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f33a136dc6bcb8bc0ed6ddd6c3d38d75e067e6eb)
2017-09-01ofz#3186: wrong starting offset for JOHAB 0x6D blockCaolán McNamara1-1/+1
Change-Id: I4de6d9d781b2f2313d8fd338b34dcb31434efe91 Reviewed-on: https://gerrit.libreoffice.org/41640 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 4f982fb4f6ec635f8f900431761a55ab7d5cac2a)
2017-09-01tdf#62363: When pie chart sector is too small do "Outside" placementDennis Francis1-2/+10
...of its label when "Best fit" label placement setting is used. Change-Id: Id201d922505de0e134286f4772abe282bb0722bc Reviewed-on: https://gerrit.libreoffice.org/41572 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 8c8edfabdee656ac5a9a0b1106f90baf315f1dd4) Reviewed-on: https://gerrit.libreoffice.org/41622 (cherry picked from commit d44e12f1f77514059375e6da3f981a992ff7de7e)
2017-09-01tdf#112106: Corrupted pivot table after XLSX -> XLS conversion in CalcTamás Zolnai3-3/+34
Always write out a data layout name. Reviewed-on: https://gerrit.libreoffice.org/41739 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit a2f2a40e37aadc0a32435a33402a21a678464ba4) Change-Id: Ic0b43d9c0365eca5e417fe9f2fe4b77b538f3278 Reviewed-on: https://gerrit.libreoffice.org/41755 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-09-01tdf#108352: Structure of pivot table coming from XLS is altered in LOTamás Zolnai5-2/+90
Reviewed-on: https://gerrit.libreoffice.org/41713 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit b90bdb1c0d27fd87c85a2d1d6ea66070b97b7977) Change-Id: I001daeaa12cd41cc36033a26457f960d8b8a5c0e Reviewed-on: https://gerrit.libreoffice.org/41717 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-09-01Follow up changes related to DOCX form control exportTamás Zolnai1-16/+14
These lines are expected to be called only for DOCX format. AnchorType is a Writer specific attribute so it can be used to decide on the file format. Change-Id: Ie92f1ff801fac09cb9f658e523244ffc928690f2 Reviewed-on: https://gerrit.libreoffice.org/41655 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit dada5958c1a5565e9d7e098c75c90f60e575ab62) Reviewed-on: https://gerrit.libreoffice.org/41661 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-08-28crashtesting: failure on exporting tdf95568-1.ots to xlsxCaolán McNamara1-3/+7
since... commit c0cc02e2934aeb12dda44818955e5964496c186a Date: Thu Aug 17 21:47:22 2017 +0200 tdf#50097: DOCX: export form controls as MSO ActiveX controls Change-Id: I55f1dcbe454e696df71a7656c796e36e91c42762 Reviewed-on: https://gerrit.libreoffice.org/41651 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 317e3d43c937e7d3bff61b100c08f04c837c4d25)
2017-08-28tdf#63673 Never ignore detected BOMMaxim Monastirsky2-2/+4
SwIoSystem::IsDetectableText was returning false only because the detected line end isn't the same as the system default one. Instead return true whenever there is a known BOM or at least there is no 0x0, and actually use the detected line end. Change-Id: I20cc1642e7ad2e6e13dfb48c325a00c44f818f15 Reviewed-on: https://gerrit.libreoffice.org/33404 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2017-08-28ofz#3121 check bounds betterCaolán McNamara1-3/+3
Change-Id: Ib1eacda7e4cdf1d0238532f4e38059a9c30556ac Reviewed-on: https://gerrit.libreoffice.org/41628 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b72dee386ac15a7fd6098503772e606c5f059a20)
2017-08-28ofz#3110 GeneratePLCF only generated word6 sized missing entriesCaolán McNamara1-2/+2
BTE was 2 bytes in word 7- but 4 bytes in word 8+ Change-Id: I24007d26fccc5edc104320bd2eb8f9c62399c988 Reviewed-on: https://gerrit.libreoffice.org/41625 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 35c07f69a28c24a8561f86ff82387f11a85d368a)
2017-08-28tdf#111934 xmloff: ODF import: self-referential conditional style crashMichael Stahl2-0/+5
It's invalid input and also causes stack overflow. (cherry picked from commit 9fe857b7bd126ff4856fc4689d375881653b97a2) tdf#111934: add document for filters-tests Thanks to infostud91@gmail.com for the document; unfortunately git tells me that i can't set the commit author to just an email address. (cherry picked from commit 6e090b4272b8fa12d2032ff0c0ea4bfb24c0d2d2) Change-Id: Ie0b9dcaefcfcf254326151f345f4802ed66b994d Reviewed-on: https://gerrit.libreoffice.org/41535 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 f07bb0fed885f7a13c08f2bc3203e727db7cef1c)
2017-08-26tdf#89139: list all items in pivot table definition, incl. hiddenMike Kaganski3-30/+68
Change-Id: I14ce935185a6e0e3739fcf01fdefa031d814e821 Reviewed-on: https://gerrit.libreoffice.org/41509 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/41588 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-08-25libxml2: bunch of CVE fixesMichael Stahl6-0/+517
Change-Id: Ic786fef17cbdb574c342925a4c57875123ef3151 (cherry picked from commit 486d3b214c270fbd2651a0b0895d600e0f647750) Reviewed-on: https://gerrit.libreoffice.org/41460 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 706ff0383f865b67d97bffb7f47e54645517c484)
2017-08-25update creditsChristian Lohmaier1-4439/+4626
Change-Id: I6e6399008c62fb4feb1ddc4fef306d6c3c0cc0ca (cherry picked from commit dd2f55c37c32fb6fab514c18649f46f36ce93b49) (cherry picked from commit 8f01b0f1fe0675123736df4eee637408a6b322ad)
2017-08-25tdf#99692 sw: fix the fix: don't set bNullContent if node was splitMichael Stahl1-1/+2
When showing the redlines in rhbz908615-13.odt, the following assertion happens: Assertion `IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark(rPaM) && "<CrossRefBookmark::CrossRefBookmark(..)>" "- creation of cross-reference bookmark with an illegal PaM that does not expand over exactly one whole paragraph."' failed. This is because in DocumentContentOperationsManager::MoveRange() the flag bNullContent is set after the node has been split; in this case the nContent is of course always 0. Later the function then restores aSavePam to the index 0 of the next node, when it actually shouldn't do anything because the JoinNext() already positioned it correctly at the merge-index of the re-joined node. (regression from 850795942b3e168cab8ce88b4f2b421945ff29ca) Change-Id: I64d50e70b19e2fd81537a9771fa8706898b17642 (cherry picked from commit 6a018363791945b6fd7f04f2aa311e4f4753f6aa) Reviewed-on: https://gerrit.libreoffice.org/41305 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 3ddc16fc26a06a95b7e373ee930881f91b22ad1f)
2017-08-25Resolves: tdf#111943 really really limit the match, tdf#108292 follow-upEike Rathke1-8/+9
getRemainingCount() could deliver a wrapped around overflow value if mnIndex was already greater than the end index, which could happen if when/for non-matching larger block sizes were added, and if then a match was found behind those blocks a non-requested/unexpected index was returned, which in turn led to the assert() being hit in ScInterpreter::CalculateLookup(). In non-debug could result in an invalid block position access. This happened with the bug case document of tdf#111943 which in master can be loaded. Also, the start and end index are not dynamic and don't have to be recalculated each time, so make them const; column argument values are unused after. (cherry picked from commit 25b3806ac509006573e669acc33643af3bd77380) Change-Id: Ic294cade4e8e7828bee394e5ade61d7127be6bbb Reviewed-on: https://gerrit.libreoffice.org/41397 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 8d8044d25a6d112854655ef0ad51f1a904350f0f)
2017-08-25tdf#98700 docxexport: don't force on ParaKeepTogetherJustin Luth3-2/+13
The mere presence of SvxFormatKeepItem was ENABLING it during export, without checking to see if it was actually turned on or off. Both DOC and RTF check the value, and set accordingly, so do the same for DOCX. Merely toggling the setting on and off is enough to create the property, so this is a nasty bug that only affects inquisitive people. Change-Id: I02d83a255f5b4ff8c5124302a52a3126dad40b67 Reviewed-on: https://gerrit.libreoffice.org/41318 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-on: https://gerrit.libreoffice.org/41324 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 067746290351c62b502425713360019a9863519a)
2017-08-25cairo_canvas: shape clipping box doesn't match where its text is renderedCaolán McNamara2-2/+2
since (I believe) commit 34d7602954d4483b3bc9db700e7df2c15348947a Date: Wed Nov 9 15:22:43 2016 +0200 tdf#55469 Consistent line spacing across platforms the point of that was to have the same line spacing on all platforms to fix the cairo text layout bounds to use the same algorithm as the generic text layout Change-Id: I26d3dec8354a9eac1423557f7d52a08f37c8843c Reviewed-on: https://gerrit.libreoffice.org/40368 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 72b66ad4505803caaf154cd224fb00e27b6b0156)
2017-08-25Watermark: not visible if page background was setSzymon Kłos4-6/+34
Watermark was drawn under the page background. It has to be placed on the upper layer to be visible. Change-Id: I132a313eed6fb712aafdca14a38fe559aa4231c8 Reviewed-on: https://gerrit.libreoffice.org/41289 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/41557 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-08-25tdf#111876 Save correct relative links in CalcSzymon Kłos4-3/+38
Relative links were saved as: file:///a/file.odt instead of: ../a/file.odt Relative path was based on source document, not target. Unit test contains spreadsheet with relative link to the "../xls/bug-fixes.xls" file. Change-Id: I803b7b8936bde9644ae5760756ee7249677f2641 Reviewed-on: https://gerrit.libreoffice.org/41500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/41555 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-08-25tdf#108926: Notes placeholder text boxes not shown in PPTsTamás Zolnai3-162/+178
Regression from: acb2943c8125f4ceed74f35f31776929dedeb8d8 Call this placeholder related code not only for normal slide pages. Reviewed-on: https://gerrit.libreoffice.org/41517 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit b766cab621690a3aaf4e10fcf925ebab1c1925b8) Change-Id: Iae185ac7e5d2505554692045516cc51dbdcd735b Reviewed-on: https://gerrit.libreoffice.org/41528 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-08-25tdf#109184 auto cell color should be transparentSzymon Kłos3-1/+20
Don't add color to the property map if is set to auto. In this case white color was assumed and tables were white instead of transparent. Reviewed-on: https://gerrit.libreoffice.org/41255 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit d239bf6d79e93f650a4241fcd2da0cb77c9cb95b) Change-Id: I7f203b8f3831b86ba8de33dc57de227b3029c6d9 Reviewed-on: https://gerrit.libreoffice.org/41451 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>