summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-11-27Version 5.0.4.1, tag libreoffice-5.0.4.1libreoffice-5.0.4.1Christian Lohmaier3-0/+0
Change-Id: I59bcb4d2bf333eef815e0981af3c78d14937a920
2015-11-27bump product version to 5.0.4.1Christian Lohmaier1-1/+1
Change-Id: I5cdba5d99f9c67f8b0873bf0ab47c6e4a122c9e5
2015-11-27Branch libreoffice-5-0-4Christian Lohmaier4-1/+1
This is 'libreoffice-5-0-4' - the stable branch for the 5.0.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I71ce94cc580bb7283cf61f8fc16151a38ca260da
2015-11-27fix baseline build (old cairo) - 'cairo_rectangle_int_t' does not name a typeChristian Lohmaier1-0/+2
Change-Id: I723122069541bc5752164554e693268267969b1a Reviewed-on: https://gerrit.libreoffice.org/20240 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-11-27update creditsChristian Lohmaier1-1175/+1205
Change-Id: I6f999f36d6ef57dadddd774e6ef60ceb9cb8033c (cherry picked from commit 9affe65c4d398c7f34e184b77c62e5ecd522b8f7)
2015-11-27update emoji autocorrect entries from po-filesChristian Lohmaier2-1/+122
Change-Id: I58d60ee1121fcd1bf84ef998ed9116386dc3c70f
2015-11-27Updated coreChristian Lohmaier1-0/+0
Project: translations 6d28ea63432c6b5844f224f68276096be053c1a3 update translations for 5.0.4 rc1 and force-fix errors using pocheck Change-Id: I4d6d82a8ed09f9eb5874108b27ab758455a13566
2015-11-27tdf#78902 VML import: workaround for extreme top marginMiklos Vajna3-9/+24
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516: DOCX import: fix context stack when importing header/footer, 2014-03-05), though that just made an existing Writer layout problem visible. RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those import pictures as sw graphics, not draw ones. <w10:wrap type="through"/> is normally mapped to our page wrap (as it uses "through" in the "not only wrap around, but also in the holes of the shape, if it has any" context, not in our "text should go through it, so no wrapping" one), but for some reason in this case (most probably due to the extreme large negative margins) Word handles the situation as our through, i.e. the text should not go to the second page, as it would normally happen with a "Word through" wrapping. Work around the strange situation by ignoring the wrapping request for extreme top margin values. (cherry picked from commit 37b5f1ed3139b8569bfec0fcb5077f6b66b79acd) Conflicts: oox/source/vml/vmlshape.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937 Reviewed-on: https://gerrit.libreoffice.org/20212 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-26regex result offsets can be negative if a group was not matched, tdf#94810Eike Rathke1-14/+22
"(abc)|(def)" matches "def" with result offset sequences {0,-1,0},{3,-1,3} And thus the assert() calls introduced with 4cf1d290bab29e18e1312b63ff862f5102e00387 and ce91f3c1292f3e9b84157acf10b67ad9ca16719d were hit. Change-Id: I571b6c7d47349a2cc7b1d1e34193b2865012a49f (cherry picked from commit 4dd2d40673299966ad639d799e925e64ae5560cf) Reviewed-on: https://gerrit.libreoffice.org/20174 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
2015-11-26Resolves: tdf#92687 implement drawPolyPolygon via cairoCaolán McNamara1-22/+151
modeled on the quartz impl (cherry picked from commit 742da70e6dd2407641835cbcac54b09aeddcb9db) Change-Id: I2f6776c14c7350954932df2bffcca36172f13473 Reviewed-on: https://gerrit.libreoffice.org/20083 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-26Resolves: tdf#95352 resize the columns when the edits repositionCaolán McNamara2-30/+50
instead of assuming they are in their final position when the top level dialog resizes. Cause there's a timer/idle involved so the final position isn't known yet (cherry picked from commit d4d4e00a5a449bdf46608ce0cecbfa07c340e555) Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca loplugin:vclwidgets (cherry picked from commit 4882664e39718109e2ae80348da8b914eb8b2ae6) Change-Id: I3e5d88bdc2ecae6164c75da8ddf1b8cfe0ed325f Reviewed-on: https://gerrit.libreoffice.org/19796 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-26vcl: OutputDevice::GetTextArray() should always init pDXAryMichael Stahl1-1/+13
CppunitTest_writerperfect_writer file libmwaw/pass/Acta_1.0.hqx uses the font "Courier", and for unknown reasons we can't properly load that font, because the PhysicalFontFamily::mpFirst for "courier" is null. This causes OutputDevice::GetTextArray() to fail to create a SalLayout and return early before initializing the passed pDXAry, which then generates lots of DrMemory warnings. Let's hope the callers are happy about an all-0 pDXAry. Change-Id: I07b29a59660cf5cd060fd77da5d96021f9d8f9f5 (cherry picked from commit e6e409b684f9b046dcde9f0615018508f769c369) Reviewed-on: https://gerrit.libreoffice.org/20206 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-26Default off OpenGL until 5.1Caolán McNamara1-7/+0
Needs a bit more work, so lets play it safer and default off for windows for now and leave it on for 5.1 This partially reverts... commit 1bc91425e43f8bd30e3dcdec4a30771de54c55c8 tdf#93662 - allow GL by default only on recent drivers on recent windows. Feature for triple review for 5.0.2 - enables GL by default for some subset of very recent GL drivers, on Windows 7+. Change-Id: I7a12540afd9f1889db15810db448db466b35241d Reviewed-on: https://gerrit.libreoffice.org/19950 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-11-26tdf#61228: Wrong function names in Formula Writer are considered as SUMJulien Nabet1-9/+14
Unknown names make the formula fail PythonTest_sw_python, especially set_expression is ok Variables are taken into account Thanks to Mike Kaganski for his help on this patch. Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2 Reviewed-on: https://gerrit.libreoffice.org/20122 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit d667e3210b12c7ce3b3727e2a0e369a520fbaaa4) Reviewed-on: https://gerrit.libreoffice.org/20159 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-26tdf#92272: We need to twiddle the bytes from BGR to RGBTor Lillqvist1-1/+26
As far as I see, the surfaces created in the DX canvas are of D3DFMT_A8R8G8B8 or D3DFMT_X8R8G8B8 format, which means that the bytes (in memory order, on little-endian Windows) are B,G,R,A/X. So if the desired destination wants R,G,B,A, we need to swap the blue and red bytes. Let's hope this doesn't break anything else... Change-Id: I1b90d2cf95418f6557cac633ec6fce27599e8a61 Reviewed-on: https://gerrit.libreoffice.org/20161 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-26tdf#95783: Don't calculate width of text with glyph fallback as way too wideTor Lillqvist1-3/+6
The old code in MultiSalLayout::GetTextBreak() only makes sense if the base level character width is zero where a fallback level has a non-zero character width, and vice versa. But this is not the case for Windows, at least not any more now when using UniscribeLayout and not SimpleWinLayout. This simple change fixes that: Only use the width from a fallback level if the width at the base level is zero. Hopefully it does not cause regressions for other documents or on other platforms. (But, I repeat, I find it hard to believe that the intent of the code could really have been to ever add two or more non-zero widths for the same character from different levels of fallback and use that.) Change-Id: Ic66c55db4b7463f9e04fcedec76f1c44f5e62e03 (cherry picked from commit a0d112a53023758a28d180ffd12766b4d325bf52) Reviewed-on: https://gerrit.libreoffice.org/20172 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-26assign macro dialog: correct event name "errorOccured"Lionel Elie Mamane1-1/+1
"errorOccured" is an English spelling mistake, but is the name of the event, which cannot / should not be changed for backwards compatibility reasons. Spelling was boguously "corrected" in: commit 60a9b5172bcbd90b5764125b76279c189dd5563c Author: Takeshi Abe <tabe@fixedpoint.jp> Date: Sat Dec 4 12:56:38 2010 +0900 Replace all occured, occurance etc. This was leading to impossibility of assigning a macro to that event, since it was not appearing in this dialog. Change-Id: Ib0373501cba8af8f4abb1c62faddf8d65c926a7e Reviewed-on: https://gerrit.libreoffice.org/20180 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-26tdf#91288 Does not display traditional Chinese variant ofMark Hung1-1/+3
Noto fonts correctly. LanguageTag()::getLanguage() would always return "zh" despite traditional Chinese were choose. hb_language_from_string() requires iso639-3 language tag except for Chinese, so we use use Bcp47() language tag for Chinese to differ zh-CN and the others. Change-Id: I6700a79a9c49a97d840b430def77741912935f72 Reviewed-on: https://gerrit.libreoffice.org/20027 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 4424daa225e73d291a3fd64d369cdda5857f3d51) Reviewed-on: https://gerrit.libreoffice.org/20204
2015-11-26Fix tdf#80224 Custom text color changed to black on .PPTX exportMark Hung7-14/+54
1) Write endParaRPr so that PowerPoint display them properly. 2) Original design forbid properites with default value to be exprted, now fixed. 3) Automatic colors are written as white or black based on whether background is dark. Note that tdf#77881,tdf#80520,tdf#89525 depend on this. Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf Reviewed-on: https://gerrit.libreoffice.org/17472 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/19862 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2015-11-25filter: fix DrMemory/valgrind warnings in PPT paragraph importMichael Stahl1-27/+124
various uninitialized variables in CppunitTest_sd_filters_test hang-8.ppt Change-Id: Id0b9f146a7ab8b5bb2b36a5c2a39d65ee52e122d (cherry picked from commit 78407eea3ddb5717a501d9336e3b3cbef188d010) Reviewed-on: https://gerrit.libreoffice.org/20157 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-24fix c++ snafu with msvcDavid Tardon2-0/+60
(cherry picked from commit b1e5983f04095346bee48dc3b413c0ae28789c27) Change-Id: I493b79e70fb8003ce215e602f9b4ce92afa50150 Reviewed-on: https://gerrit.libreoffice.org/20156 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2015-11-24tdf#94810: fix reverse offset mappingMike Kaganski2-6/+23
With simple transliteration, TextSearch::searchForward used to use whole string to perform the search, then started to create substring to search. But it left the precautions from commit c00601dab0f5533b152cd63cec0a89bfec1ba95f by Eike Rathke: searching for $ may actually return a result set pointing behind the search string which it does with the ICU regex engine. The precaution made it to skip reverse mapping if index was 0. Commit 9aae521b451269007f03527c83645b8b935eb419 by Michael Stahl didn't consider the case when nStop is 0, and startPos > 0. Then it tried to get offset[-1]. Anyway, using value of startPos in those conditions seems illogical. Removed those precautions (and made assertions for that). Fixed handling zero indexes. Reviewed-on: https://gerrit.libreoffice.org/19840 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 4cf1d290bab29e18e1312b63ff862f5102e00387) remove comment that makes no sense, tdf#94810 follow-up nStart should not become <0, not even when searching for $ end. (cherry picked from commit 67ab2ce3c6fed2ceaacaad890a7d8683ce0397a7) similar to searchForward() use the correct offsets, tdf#94810 related (cherry picked from commit ce91f3c1292f3e9b84157acf10b67ad9ca16719d) Change-Id: I2066abc51fff7fb7323bc7f6198bdea06439d4f3 79586471f1a7908372fa3ee044a6f66499b1790f cb5a45acaad9029e0998594de8b3dc2e9211866e Reviewed-on: https://gerrit.libreoffice.org/20136 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
2015-11-23tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by defaultMiklos Vajna3-1/+6
On one hand, neither our binary DOC import, nor Word maps the "TOC Heading" style to something special, and that's how the DOCX import added that property to some paragraphs in the document, moving the as-char picture from the first to the second page. OTOH, the DOCX export filter has a lcl_guessQFormat() function that explicitly assumes that such a style name exists in Writer document models, so again it doesn't make sense to handle this style name with special care. Change-Id: I3af548930f9683695fc3ad56b486e013f107d61a (cherry picked from commit 70f3c595cae858e97616bf1f23adea8a75e42d4b) Reviewed-on: https://gerrit.libreoffice.org/20037 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-23update language-subtag-registry to 2015-08-04Eike Rathke1-2/+2
Change-Id: I479a3083f56631135a7f6d94e2864583a9b30a30 (cherry picked from commit 660e37ad62d1c62a18325cffe6dd601e2df20aaa) Reviewed-on: https://gerrit.libreoffice.org/20101 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-11-23tdf#95677 Force sign to exponent for Excel exportLaurent Balland-Poirier1-0/+5
Change-Id: I7896d1d064cd92fd45a6b32ac64f534f68213169 Reviewed-on: https://gerrit.libreoffice.org/20064 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 96ff6372e15fa17211650ec6f0da13771a572a42) Reviewed-on: https://gerrit.libreoffice.org/20126
2015-11-23Updated coreAdolfo Jayme Barrientos1-0/+0
Project: help ab4c21fa199cdaa11862f49e201af73d67c7850b Revert "tdf#87313 Update instructions to Firefox 42" This reverts commit 1f6ca79f4270e03fe256129147752fd7e6c8ab54.
2015-11-23Updated coreAdolfo Jayme Barrientos1-0/+0
Project: help 1f6ca79f4270e03fe256129147752fd7e6c8ab54 tdf#87313 Update instructions to Firefox 42 And remove references to the dead Mozilla Suite.
2015-11-23Make number recognition work in writer tables againNiklas Johansson2-1/+71
It seems that number recognition in tables are not working properly enter 10-10-10 and it should be converted to a date but it is not. I tracked it down to the fix of bug fdo#32082. It looks like bSetNumFmt was changed to false by mistake. Since then it has changed name to bSetNumFormat. From what I can tell fdo#32082 still works after this patch, but I might have missed some nuance of that bug report. Added two tests, one for the bug mentioned above and one to check that number recognition is working. At least with a simple date. Reviewed-on: https://gerrit.libreoffice.org/19563 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit aa334d55ee34c125f6f4fdfaadbc1ed8fa33f5bc) Change-Id: Id58849a223eb602054c66c7379cd56a68a93dea2 Reviewed-on: https://gerrit.libreoffice.org/20082 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-23tdf#90372: Make VclScrolledWindow candidate for tabstoppingKatarina Behrens1-1/+1
this fixes a11y issue, where widgets inside VclScrolledWindow weren't accessible by keyboard as Tab, Alt-Tab events respectively, never reacheed those Change-Id: Ic73e24f8036b0f6129c3a4f5efb160f9089cb0b8 Reviewed-on: https://gerrit.libreoffice.org/19982 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-23tdf#92527 construct default Segments sequence, when there is noneAndras Timar1-1/+14
ODF export in xmloff does the same Reviewed-on: https://gerrit.libreoffice.org/20051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 11b7a2c89b8e155bf1da79107878f066847b46eb) Change-Id: I78ddbef3ac96f10f334c45a467dafb95bb9e3453 Reviewed-on: https://gerrit.libreoffice.org/20066 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-23libxml2: upgrade to version 2.9.3Michael Stahl6-19/+5
- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same) - drop libxml2-vc15.patch (fixed upstream) Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116 Reviewed-on: https://gerrit.libreoffice.org/20084 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 391bcf348d585b5e246ec808833af522edd371f2) Reviewed-on: https://gerrit.libreoffice.org/20095 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-23libxslt: add patch for CVE-2015-7995Michael Stahl2-0/+30
(cherry picked from commit 45d1abeff9d4041b3e174f0eddd10bfd6ab8a360) Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188 Reviewed-on: https://gerrit.libreoffice.org/20094 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-23tdf#94214 ODFF function FINV incorrectly saved as COM.MICROSOFT.F.INVWinfried Donkers3-3/+3
Reviewed-on: https://gerrit.libreoffice.org/18792 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 5ba0f79e246ea970d16f366640c2ccd87e1d8786) Backported to 5-0 replacing the interim forward compatibility of 4a33435137e4d9fb7a85c527a37edc6780170d9a Change-Id: Ic053342fde436a7053c15e32683e09b9e91f5308 Signed-off-by: Eike Rathke <erack@redhat.com>
2015-11-23Updated coreStanislav Horacek1-0/+0
Project: help 5e1a32e2b6ddf58636216e505d7ec30801364ba6 Insert - Section - Footnotes/Endnotes tab is available in both views Change-Id: If21268f37c254753eac5ae4c52c931ebde73b6e8 Reviewed-on: https://gerrit.libreoffice.org/20120 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 229eff368cdbfd556ed83f051eb2000d2700ff7b) Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-11-21update creditsChristian Lohmaier1-1264/+1320
Change-Id: I411a7e26f536a1e4924f566a2ecba097fc134db2 (cherry picked from commit 24271e34608d75acdbfe762d080cb6059d6add92)
2015-11-20Incredible slowness and crashes with document with vast num of frame dupsCaolán McNamara1-1/+9
it looks like draw:name values are supposed to be unique in ODF, even if it's not spelled out explicitly, since it exists so the frame can be referenced, which sort of implies that it has to be unique, so a document where the values aren't unique can be considered invalid 19.197.10 <draw:frame> The draw:name attribute specifies a name by which a <draw:frame> element can be referenced. So reject duplicate frames but limit this to document generated with 4.4.X which we believe is the version that created these bogus docs (cherry picked from commit de0432a9256188c7b5cd1a83858311e68c890ebf) Change-Id: I83f6d72fd969f667f0a8c2c85d2ffeeed672387a Reviewed-on: https://gerrit.libreoffice.org/20054 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-11-20qadevOOo: fix race in the ScAccessiblePreviewTable event testMichael Stahl1-3/+11
XAccessibleEventBroadcaster::addAccessibleEventListener test calls the fireEvent() and the problem is that the event is triggered not on the print preview itself, but some toolbar button. This then causes an accessible event to be broadcast from the print preview too, but only after doAccessibleAction() returns, some time later from VCL main-loop. If the test checks the flag in the listener before the main thread sends the event, the test fails; try to fix that with XToolkit::processEventsToIdle(). (cherry picked from commit 1d87c2456dab9a0f78ab25d029e82139488e2c57) qadevOOo: sadly XToolkit::processEventsToIdle doesn't fix... ... the ScAccessiblePreviewTable test, somehow the event still doesn't fire in time, let's add an arbitrary sleep too. (cherry picked from commit c94cf0cf5f10edb45a74a58c95c306b0d271645b) Change-Id: Ia52bdf99cdc349ffb0a03536fba271b792caae0f Reviewed-on: https://gerrit.libreoffice.org/20018 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-20tdf#95916 Update Alizarin.otpLaurent Balland-Poirier1-0/+0
Modify styles.xml to not use japanese language specification in style for date Change-Id: I0e418c06d5c8d6b04eeaa3e6f6c33c194ee2ef3f Reviewed-on: https://gerrit.libreoffice.org/20063 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit ec544c4b0512b42a9cb1e32d9e3cd9577f5b1f47) Reviewed-on: https://gerrit.libreoffice.org/20071 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-11-20Resolves: tdf#95670 propagate ForceArray per parameterEike Rathke7-14/+81
Regression of b5cd11b4b02a85a83db77ba9d8d1763f0cd88cb1 It was always wrong to propagate ForceArray already if a function had a ForceArray parameter *somewhere*, we need to do this per parameter instead. (cherry picked from commit 49257e1da7e371fdea0fac080116b0511789cac7) Conflicts: formula/source/core/api/FormulaCompiler.cxx prevent ForceArray propagation on the same token, tdf#95670 follow-up This may happen if the last RPN token is put and the function has a ForceArray parameter but now again would be wrong if not all parameters are ForceArray. (cherry picked from commit b31b17e52b2b2b94999d68c4b2ed5c74ee7eed0a) 890fb6b5b88337033cfcf2e8189371ee39461205 -Werror,-Winconsistent-missing-override (cherry picked from commit 6edc492efd6fe2de15c1ae306b400ca054772ad1) Backported to SAL_OVERRIDE 3bb2764b625d44f6e0cecbdde3363440faef63b5 Change-Id: If188d45366279d9a7bf641edc7e4dd7095d6d035 Reviewed-on: https://gerrit.libreoffice.org/19993 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-11-20Resolves: tdf#89907 do not modify original ScViewData's ScMarkDataEike Rathke1-12/+12
Change-Id: I2ae5a06f9ffe29de0b1cc5875615010da75f4ae9 (cherry picked from commit d1225d60af08ed874ed72066ae0320617d4c8a91) Reviewed-on: https://gerrit.libreoffice.org/20020 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-11-19xmloff: add meta:generator constants LO_43x and LO_44xMichael Stahl2-9/+18
Change-Id: I1d962ad637f19b02855616edebcedbad719689c5 (cherry picked from commit ee655627ad2ba66a8160b4cbdaeb1dd52d047a1d) Reviewed-on: https://gerrit.libreoffice.org/20053 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-18desktop: stop --convert-to from creating some not requested ...Michael Stahl1-60/+66
... file format by default if the requested filter does not exist. Much better to write an error message and do nothing. Change-Id: Ie5404772e7aae5751126bd4c2784b58177804448 (cherry picked from commit c994ce8a1d292b02e4c53f7b4061f3bbb840f874) Reviewed-on: https://gerrit.libreoffice.org/20007 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-18tdf#94008 Crash opening password protected file - CJK UITakeshi Abe1-1/+1
This fixes a buffer overflow writing over the end of pCaretXArray, which can happen e.g. when drawing mnemonics in the password dialog. Based on a similar calculation of nCurrIdx found in GenericSalLayout::GetCaretPositions(). Change-Id: I7d723cf8cfaeb66f340c7d9ea5b3bc728c6d6209 Reviewed-on: https://gerrit.libreoffice.org/19385 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f630b6d5f165c8c507b8904b99594936edfd8da0) Reviewed-on: https://gerrit.libreoffice.org/20031 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-17backport implementation part of 754ade38ddb2e96187d00f3e621203cea34961faNoel Grandin1-0/+12
Change-Id: I7c732d94346be8f37fba1a32655ba224c74e0235 Reviewed-on: https://gerrit.libreoffice.org/20017 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-11-17tdf#95188: enable import of shapes in footnotes in .docxOliver Specht1-0/+2
substreams require a Model and a DrawPage Change-Id: I701cf6e2283f84f18b9a0c06a4ce0aa8be934bf3 Reviewed-on: https://gerrit.libreoffice.org/19951 Reviewed-by: Oliver Specht <oliver.specht@cib.de> Tested-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit f47bd0561cdf4c2b4fbe2c7e396533cf85408cb7) Reviewed-on: https://gerrit.libreoffice.org/19954 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-17Resolves: rhbz#1278885 gtk3 allocated size doesn't match configure-event sizeCaolán McNamara2-88/+164
so LibreOffice thinks its window is smaller than what gtk3 has allocated for it. For gtk3 (like firefox does) split size and position handling, leave position/move handling to the configureEvent, but listen to sizeAllocate and use that for the size handling. Leave gtk2 as it always was (cherry picked from commit 6adfbe62f6bb67d7d78c1561e9af5169d7f5bb9a) Change-Id: Ic52d6971595741ed658247b651e9e16c2ef9ed0b Reviewed-on: https://gerrit.libreoffice.org/19924 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-11-17tdf#76239 extract file version from ttf filesAndras Timar1-0/+20
Change-Id: I59a9401c0bdc2d641ea54498af0eb1e589ab12f3 (cherry picked from commit a322355727368ab087b718d32b70e4a9d9db645d) (cherry picked from commit 38e24f1d059a6123ea15a68b4b24ca984642d66e) Reviewed-on: https://gerrit.libreoffice.org/19942 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-11-16tdf#92256: Don't save CONV_UNSPECIFIED string ref syntax valueKatarina Behrens3-9/+51
The following scenario is how it breaks: 1. user has ExcelA1 as her formula syntax setting, CONV_UNSPECIFIED (that means "same as formula syntax") as her string ref syntax setting 2. she saves the document, it will now contain CONV_UNSPECIFIED value 3. someone else with CalcA1 formula syntax setting opens the document ... since it contains CONV_UNSPECIFIED "same as formula syntax" value, it will use his CalcA1 formula syntax value to evaluate INDIRECT func => #REF! Avoid this by reading formula syntax/grammar value, mapping it to matching string ref syntax and saving that instead of CONV_UNSPECIFIED Change-Id: Ide62d81e6b70c2e9f2ff79648935788107475778 Reviewed-on: https://gerrit.libreoffice.org/19610 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/19983 Tested-by: Jenkins <ci@libreoffice.org>
2015-11-16bump png to 1.5.24 CVE-2015-7981 + CVE-2015-8126Caolán McNamara2-10/+10
Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446 Reviewed-on: https://gerrit.libreoffice.org/19985 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-11-15Resolves: tdf#94069 call setVisible when setDesignMode is calledCaolán McNamara1-0/+2
void UnoControl::setDesignMode calls setVisible on the XWindow so it seems sensible that FmXGridPeer::setDesignMode should also do so. The desirable side effect is that moving the window in design mode then is moving a un-shown window so nothing is invalidated so the paint loop doesn't happen. Change-Id: Ic5a4ba62590372bec15a29b993b73d6dfb94a8a9 (cherry picked from commit a7816853bad55ada597092c16ba9a0a761e067d0) Reviewed-on: https://gerrit.libreoffice.org/19906 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins <ci@libreoffice.org>