AgeCommit message (Collapse)AuthorFilesLines
2014-11-11fdo#82038: senddoc, uri-encode got lost on Maclibreoffice-4-3-4Stephan Bergmann1-2/+2
(cherry picked from commit f3f63f555df87449b2d2a33718589b3afb3d9ddf) Conflicts: scp2/source/ooo/file_ooo.scp Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9 Reviewed-on: Reviewed-by: Tor Lillqvist <> Tested-by: Tor Lillqvist <> Reviewed-by: Michael Stahl <>
2014-11-10bump product version to Lohmaier1-1/+1
Change-Id: I6a6ec7a363d6621a54ac190374e1bcd07d0cdf8e
2014-11-10Branch libreoffice-4-3-4Christian Lohmaier4-1/+1
This is 'libreoffice-4-3-4' - the stable branch for the 4.3.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Iea60ec9a117be625464d7f94287bef0ad59cc99a
2014-11-10Updated coreChristian Lohmaier1-0/+0
Project: translations 27e2234d459ba1d48cdd3560055f7b4559d0b48f
2014-11-10update creditsChristian Lohmaier1-2289/+3722
Change-Id: I8a181b614ae906890478e0b412f55e0c9000e3c6
2014-11-09fdo#54361: Chart background in XLSX is transparent instead of white.Muthu Subramanian1-11/+10
Conflicts: oox/source/drawingml/chart/objectformatter.cxx Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96 Reviewed-on: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2014-11-07fdo#74441 [Accessiblity] Don't expose 0 for empty cells in CalcNiklas Johansson1-1/+1
At the moment non numercial cells in Calc is exposed to AT tools (screen readers etc) as the value 0. It makes more sence to present the string value of the cell which basically is what a sighted user will see. This small patch should be a good start into making Calc more accessible on Windows. Change-Id: Ide76f2dc044c98f32aa78836049f12f2251522eb Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 55eca9dbb34aec8c435da91c0748453e3e097f1e) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-11-07fdo#81264 Accessiblitiy focus not tracked for cells in CalcNiklas Johansson1-2/+14
When the accessibility roles for DOCUMENT_SPREADSHEET etc. was introduced the following places in Windows specific files where not updated to take these new roles into account. This patch should hopefully fix that. As a side effect the initial code for tracking cell movement in Calc works again. Well at least as well as it did before the change, there are still some quirks left to fix. Change-Id: If3cacdc27a73c4cee85b1450c406d490bd741456 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit a1a9f0e5c4f7d7331072854250a7eb9046e4f111) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-11-06Fix cherry-pick mis-mergeStephan Bergmann1-1/+1
82c01116a7df315b78bfd3af6ccd936572b45d78 "bnc#636128 DOC filter: fix handling of FFData.cch" Change-Id: I7d26c5950c3265db10e1611402ab3b63abbe2d4a
2014-11-06sd: fix STL assertion "dereference past-the-end iterator"Michael Stahl1-1/+2
(regression from 967a386bccb15b99915a1e878e42450fbe9a2d0e) Change-Id: I9408170eb155f433922e5b3887059078a141d78a (cherry picked from commit 9632045906baf165076d11a97f45b153d8e2acb7)
2014-11-06fdo#85812: RTF import: fix run type in new groupsMichael Stahl3-0/+114
Apparently the run type resets to LTR in a new group. (regression from fc49c052dbdbb5ab3b0a02a13143705f769b9662) (cherry picked from commit 88d3f9e4cf64e4ef037063b26ddf347fd42d8d84) fdo#85812: RTF import: better fix for run type in new groups Apparently Word treats \ltrch \rtlch differently from \loch \hich \dbch when groups are opened. Change-Id: I257712521e8e77fa66e76857489797ecc675506e (cherry picked from commit a9a9718bb1f64318429562ecdaa3d3763d9e2f4a) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-11-06fdo#85403 broadcast changes after TextToColumnEike Rathke1-0/+1
Regression introduced with 3d869cda8db03820dea8c4ba463eb155d05e933b for fdo#74014 Change-Id: Ie8ca1e7c15609aaf80b4ecbb6ccffc30a3f79f0a (cherry picked from commit 99cfc0f8a321c3fd3ef1a49d669ebc5744dbf606) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-11-06fdo#82430: MSVC build: disable a few more cases of SSE2 in externalsMichael Stahl3-2/+13
(cherry picked from commit c79d2dbe3a75e3376a5997444b6a3a5f947da107) Conflicts: external/icu/ Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-11-06bnc#636128 DOC filter: fix handling of FFData.cchMiklos Vajna5-3/+26
(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f) (cherry picked from commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb) Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-11-05fix bnc#624546 (fdo#83733) slide pane cut/copy/paste in outline viewMarco Cecchetti4-6/+42
Problem: When I'm in outline mode, if I select a slide in the left slide preview pane, ctrl-c, then select another slide I would like it after and hit ctrl-v; it refuses to cut/paste. Analysis: This issue is due to the fact that the outline view always grabs focus when activated and a view is activated whenever is pushed to the sfx shell stack even if it is not the new top-most active view shell (see `ViewShellManager`, `SfxViewShell`, `SfxDispacther`). Solution: Make the `OutlineViewShell` grabs focus only if it is the top-most active view shell. Rationale: When `OutlineViewShell::Activate` is invoked, instead of removing the focus grabbing action completely, we check if the `OutlineViewShell` instance is the the top-most view shell and perform the focus grabbing action only in such a case. This change required to have also the `DrawViewShell` grabbing focus on activation (only when it is the top-most view shell). In order to implement this solution I needed to add a new method (and data member) to the `ViewShellManager` class. I named it `GetTopViewShell`. This method returns a pointer to the top-most active view shell of the internal stack. The returned pointer is updated in the `UpdateShellStack` method, before the sfx shell stack is updated. For more details see : (cherry picked from commit 967a386bccb15b99915a1e878e42450fbe9a2d0e) Signed-off-by: Andras Timar <> Conflicts: sd/source/ui/view/ViewShellManager.cxx Change-Id: I619a406864f50f0e62dee3fcb9ac5d46e3d48272
2014-11-04Resolves: fdo#68347 fix word count with recorded changesCaolán McNamara5-43/+93
also see fdo#46757 a) We need to ignore redline-deleted text, but count redline-added text b) each block of text is denoted by its end position in the model and where that maps to in the view so a hidden portion should record its end point not its starting point, and a non-hidden deleted portion should always record its end point c) when mapping a model position to the view we take the offset of the model pos arg from the block end and use that to offset the mapped block-end view pos to get the final view pos. But for hidden portions that won't make a whole lot of sense, and end up offsetting into prior portions, so map all positions within a hidden portion to the same block-end view pos add regression tests for these cases (cherry picked from commit fa430e6b4e6f5d096bdf59db26e5d7393ca2297b) Conflicts: sw/qa/core/uwriter.cxx Change-Id: I45c76bba47fd430bc3bccb5f919502660d415d9e Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-11-04CppunitTest_sw_rtfexport: fix windows buildMiklos Vajna1-2/+2
Change-Id: I79d4e46abe289b3d9c1f0a2eec2a29045891cae3
2014-11-04fdo#85282: Correct adjustment of range reference on delete & shift.Kohei Yoshida1-6/+61
Change-Id: I6e01c160f77599dfa4a2e55b60e23d256184c822 (cherry picked from commit c3c16d5b74fb5707691283538a969a03c2f918b0) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-11-04fdo#82076 RTF import: handle footnote in table cellMiklos Vajna4-2/+44
(cherry picked from commit 956c3ff3d43e1b181f7c91518edee1c7c4dc2a0a) Change-Id: I69def7936c320e93db5d4504922d52346caaf9cf Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-11-04sw: fix windows buildMichael Stahl1-2/+1
Change-Id: I24aedc513897579b3f3c3bf9884183a67b93cd39
2014-11-03fdo#82858 RTF export: fix "none" line style of TextFramesMiklos Vajna4-0/+10
Regression from commit 9e6a5b94e00f0054b058dbb42c2c0b6c75236c9d (RtfAttributeOutput::FormatBox: export line{Color,Width} shape properties, 2013-04-15), in case lineColor is written, but there is no border style, then an explicit fLine=0 property is needed, otherwise a black border shows up. (cherry picked from commit f824b1b575dbdb2bc515656a66cbb94764031a44) Change-Id: I6d6eedbc8d3ee4bee0f2aadb51a376c7734c6640 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-11-03fdo#85215: Ensure that formula broadcasting works after sort.Kohei Yoshida1-0/+15
When the reference update on sort is turned off. Change-Id: I547dd1525a638dd447fe331e22583af4a7947308 (cherry picked from commit 1eb82c78a223d9a0b2bb5c3f5c129c1ee8bdf303) Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <>
2014-11-02fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLineMichael Stahl8-3/+43
This is enabled by default, to get the new formatting where the first line of a paragraph is shrunk if a proportional line spacing < 100% is applied; existing OOo documents get the previous (before LO 3.3) formatting. Since the formatting in LO releases is broken anyway, it does not matter much which way documents written by old LO get formatted. (cherry picked from commit 9605763e3dc8c85137787c77c31e8639553a35ed) Conflicts: sw/source/filter/ww8/ww8par.cxx Change-Id: I0952f568a933c137bd03070759989cac3517d8b9 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-11-02fdo#79602: sw: fix text formatting of proportional line space < 100%Michael Stahl1-5/+13
SwTxtFormatter::CalcRealHeight(): Apply the special treatment of < 100% line space shrinking the Height() of the line only to the first line in a paragraph; the subsequent ones are shrunk again (to the square of the desired proportion) 30 lines later. Also set the Ascent of the line, as the wrong base-line causes the lower part of the line to be clipped. (regression from 42532d42bfcdb12df86376cda009e8e315a82153) (cherry picked from commit 4e223fab04279c3583689e69fa1342966e81de36) Conflicts: sw/source/core/text/itrform2.cxx Change-Id: I0424396263293deaa318c80eedc2237cdb01b22b Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-11-01fdo#71248 Excel VBA: ActiveDocument is not tracking currently selected DocJustin Luth2-2/+2
Change-Id: I86606646206ec26e2822a6e27888537d44351b7b Reviewed-on: Reviewed-by: Samuel Mehrbrodt <> Tested-by: Samuel Mehrbrodt <> (cherry picked from commit 4108bd9b7a41eaa0f3bf8b8173f27f57e009ee34) Reviewed-on: Reviewed-by: Muthu Subramanian K <>
2014-10-30fdo#82859 RTF import: fillColor is unsignedMiklos Vajna3-1/+32
Otherwise ARGB 0xFFFFFFFF would turn into black. (cherry picked from commit 04ea7b24ec1b5a027efa0b850f2bc3ac7116c52e) Change-Id: I690f34d888ca9a013e8ce1af2c7ef8ed88ee28b0 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-10-30fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrameMiklos Vajna2-1/+26
(cherry picked from commit 6b7239855d8babdc1bcc7742f79ce2df64d1e476) Conflicts: writerfilter/source/rtftok/rtfsdrimport.cxx Change-Id: I687fa609559f0484fe6bb804265243de154c3760 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-10-30Resolves: rhbz#1146169 a11y frames label dies before frameCaolán McNamara2-1/+13
Change-Id: I2bc45dcb92b8e68bf4ae4df72c0fbd4e3b535604 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-30bnc#893791 XLS export: external sheet references on Linux/OSXAndras Timar3-0/+32
The commit solves two problems. 1. Make sure we save absolute paths on Linux/OSX 2. Make sure we don't save invalid XLS (VirtualPath longer than 255 chars) The first problem has always been there, so after a few load/save cycles an XLS with reference to other XLS on a Unix-like file system became invalid, and only LibreOffice could open it, Excel could not. These broken XLS files can be repaired by saving after this patch, however, the original reference will remain broken. (cherry picked from commit 3f5251675eeeeae56ea282fdeb09dbc53ce4aae6) Conflicts: sc/qa/unit/subsequent_export-test.cxx Change-Id: I8f575acb1d560d539c1da61a1afdaac3f0c13977 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-10-30fdo#37960 fix shift+click to select multiple drawingsAndras Timar1-2/+0
I simply didn't get the logic behind calling GotoNextFly(). It caused not only this bug. For example Ctrl+click on a background text frame did not select the text frame, but an image on the previous page. Change-Id: I85ccbbda2f324de55417d6199b4abe79e59bf295 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-27fdo#85215: Don't adjust references wrt cell position when disabled.Kohei Yoshida2-4/+6
Change-Id: Ie1a12cc189bcb66fad59ea9901ac0dc95bb68788 (cherry picked from commit 10fc138307afb4b39baddb0d56eb8e986e5d29ea) Reviewed-on: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2014-10-27fdo#85179 RTF filter: import image borderMiklos Vajna5-10/+68
Also adjust CppunitTest_sw_htmlexport that implicitly tested that there is no color around the image. (cherry picked from commit 01a32b7d074511bed24044dc94e1159aea62722b) Conflicts: writerfilter/source/dmapper/GraphicImport.cxx Change-Id: I8e14dfa7e7be80c4f8c492999071decae6a492e8 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-10-25Resolves fdo#71781: CMIS: Default Alfresco 4 URL not workingJulien Nabet1-1/+1
See Badfully Alfresco server test doesn't follow this (their own?) rule since the url is: and not Cherry-picked from 6e9d99332c241cf20204d9dfb772bc0168bfc460 Change-Id: I3712993db96f8544381065c71a36697207ce66e0 Reviewed-on: Reviewed-by: Bosdonnat Cedric <> Tested-by: Bosdonnat Cedric <> Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-25Resolves: fdo#84729 buffer cache grows to over 9000 unused entriesCaolán McNamara1-0/+5
regression from commit a5351434fbea1126961f5dbaa986e7c9e686c24e Author: tsahi glik <> Date: Thu Jan 16 12:51:44 2014 -0800 fix rendering issues in iOS with aqua because now the cache just fills up because nothing will have a depth of "0" and a new entry is created every time. 0 could be seen to mean "whatever is a good non-1bit depth" or auto or something. (Do the uses of "8" really mean 8) 0 passed to new VirtualDevice under Linux/X ends up using the depth of the outputdev, so here set nBits to that value to start with and the problem goes away Change-Id: I4390d6f7edef9dc7430cc77e3518dc751a5f479d (cherry picked from commit e25a020d59b019893d2e04ac61e4ed25ef0a6e61) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-25Resolves: fdo#83588 Revert "center slide after changing zoom"Caolán McNamara3-29/+0
This reverts commit b179235f702e474b115ca479b603052f422346fd. (cherry picked from commit d1e9aa23a7b74e153479e0e23aac1c02cca48177) Change-Id: Ifb9444e77a28ac17e4dcc17725a4393ea0aa294e Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-25Resolves: fdo#84417 restore focus window after previewCaolán McNamara1-0/+5
regression due to changes of sd/source/ui/slideshow/slideshow.cxx in cc5518ca61b209408a9d5262bbdcc39efccdd72d commit cc5518ca61b209408a9d5262bbdcc39efccdd72d Author: Steve Yin <> Date: Thu Nov 28 12:09:19 2013 +0000 Integrate branch of IAccessible2 Change-Id: I6b399d68c1f3ef32b702135b981100a23760569b (cherry picked from commit 92360e7413daf35d6b3acf2e77cf3c6063c5f11f) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-25Resolves: fdo#84885 chart wizard dialog cut offCaolán McNamara1-27/+35
Change-Id: Ie24687cd1c54b1fed04745c83f507c17a5574175 (cherry picked from commit f9c242674094eba7ac19bd279f611dba0a8e5571) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2014-10-23Resolves: fdo#62682 crash on second export of svgCaolán McNamara6-2/+39
because the first export has left "dangling" CalcFieldValueHdl Links in Outliners that got created based on the Drawing Outliner while it had a temporary CalcFieldValueHdl installed, and didn't get the old CalcFieldValueHdl installed when the old Drawing Outliner one was re-installed. (cherry picked from commit 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff) Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-10-23various untrusted loop boundsCaolán McNamara8-73/+249
coverity#1242704 Untrusted loop bound Change-Id: Ib2e00c0cd269dc7ae55b206713fe07e5326072f2 (cherry picked from commit d615d83381a0830a815fe2879ce761f1b00b04e9) coverity#1242606 Untrusted loop bound Change-Id: Iafa03d4dd65eb343a80996880bc1ed846d1b7491 (cherry picked from commit 1361dfc0aa835dcb134d5de4bac594519aa16efe) coverity#1242582 Untrusted loop bound Change-Id: I72d2c4979b62a025d212ce5ee3b7141c40376fa7 (cherry picked from commit 6118c11a0c5122169979547e8c27136cf58a54a7) coverity#1242778 Untrusted value as argument Change-Id: I34d5a5e7c5f0eef51d941c65ab73d5421d5a36cb (cherry picked from commit be31503ef86d2ad3291ced8fddb9c4da4d324c46) coverity#1242724 Untrusted value as argument Change-Id: I6041d09ef0a4ed4af5f1bf93f31a1eac60be1af7 (cherry picked from commit bbe264a19fb82f50d859fc72a47312db0527640f) coverity#1242717 Untrusted loop bound Change-Id: I983bba075ab9626c90555fa41f9d473ae60fafea (cherry picked from commit cf63ebe0f005513c1e989682459bcd0688eb190b) coverity#1242624 Untrusted loop bound Change-Id: If2ae1982eec100f5602a13d648beec247ced6aa2 (cherry picked from commit 711e74544d70b108e9bc70772b31f386dbf1c2a4) coverity#1222238 Untrusted loop bound Change-Id: I1a4dec8727d0a27f7fd0396fd22d955f61daaee4 (cherry picked from commit 5a89092d5fe43638832ea8f86df34f81869337d9) coverity#1242573 Untrusted loop bound Change-Id: Id2847c55ccab7272919e76542bc0e0570bc9af12 (cherry picked from commit 5e2d089f763963e6ce7d3d183bd1bf7932aeaaaf) coverity#1242573 Untrusted loop bound (cherry picked from commit 11a514e06bf38c70f2364c8535782aa3f33d6206) Conflicts: vcl/source/filter/wmf/winwmf.cxx Change-Id: Ic84e57fbfa2b532409865c4364b91be594d252cf pass sfntLen to DumpSfnts etc so sfntP reads can be checked Change-Id: I5d8092eceb31ba251e75fe2c51b87890b8adcbf2 (cherry picked from commit b4a0104849eeecb7779fda41116c92c362759882) coverity#1242908 Untrusted value as argument Change-Id: If9dd92c361d406c435329d29870dc8bb07a8ba7b (cherry picked from commit d0be09322d127e7d517851db38c764d57fbab2dc) Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2014-10-22error: 'fprintf' was not declared in this scopeMiklos Vajna1-2/+0
Change-Id: Ib7730481bdefdd33fd8354ff6f5bba36fc27c2fd
2014-10-20fdo#82047: Correctly adjust references in range names on row deletion.Kohei Yoshida1-0/+47
Change-Id: Iac924b0b6932863f7f9cc088f996e0b07c340d2c (cherry picked from commit 281847613bd3ae472523822f4be9c21cc353867e) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-10-20fdo#80284: Avoid broadcasting during cell delete & shift.Kohei Yoshida1-5/+2
Broadcasting it here and marking formula cells dirty prevents them from being entered into the formula tree at the end. They get marked "postponed dirty" during reference update, and are supposed to be set dirty at the end. Change-Id: I65977300ee4ee26b6166d170acd2145abcbbf288 (cherry picked from commit 7fef943114b9184e69c8c714bf158116b8d9caf7) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-10-20Fix build breakage.Jan Holesovsky1-3/+3
2014-10-20Resolves: fdo#72587 make template dialog ModalCaolán McNamara3-3/+8
(cherry picked from commit 60126254eba8a6a6b94c60b2101ee90986161e24) Change-Id: Ifb6d7ebbe297d17fc99426b501c92daf8577dd20 Reviewed-on: Reviewed-by: Muthu Subramanian K <> Reviewed-by: Adolfo Jayme Barrientos <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-10-20html export: Fix export of checked checkbox and radiobutton.Marco Cecchetti4-1/+25
Change-Id: Ia77f9840df7508d96292aac63e65714a7892342f Reviewed-on: Reviewed-by: Jan Holesovsky <> Tested-by: Jan Holesovsky <>
2014-10-20fdo#83464 RTF import: \plain should reset \rtlch and \hich as wellMiklos Vajna3-0/+35
Regression from 36246aa9fb57c9fe4e546c91a8274d8828b1424e (RTF import: fix handling of \loch \hich \dbch \ltrch \rtlch, 2014-06-03), now that \f no longer means the ascii font name, \plain should reset a few more parser state members. (cherry picked from commit 69bf37136c1386c7220f38a896aa9865bdae665f) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ia6b0bdf25563dd5300e108b46731751f0886f67d Reviewed-on: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2014-10-18bump openssl to 1.0.1jCaolán McNamara1-1/+2
Reviewed-on: Tested-by: LibreOffice gerrit bot <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 39d4fe7aea6b32a6c17c325b2b1c282c2975c02c) Conflicts: download.lst Change-Id: Id2092489723b3f1f643ee0161cb0d8bcbd04a847 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2014-10-18fdo#75359 - SIFR: Line Spacing 1.5 icon missing (4.3)Yousuf Philips6-0/+0
Change-Id: Id5064943eb430ad9d3b2014ff4482f9bb36cdac3 Reviewed-on: Reviewed-by: Matthew Francis <> Tested-by: Matthew Francis <>
2014-10-17Adapt sorting unit tests for new default.Michael Meeks4-7/+85
Change-Id: I9885e2712753390f0597233c404ab80c0ad2b537 Reviewed-on: Reviewed-by: Muthu Subramanian K <> Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-10-17Back-port Kohei's comprehensive sorting unit tests from master.Michael Meeks4-492/+1485
As of master commit fab88063281761dbdac7ea550072660fe0f8c863. Change-Id: I45ee0021c727281ba5590ceead6d8c5848e25169 Reviewed-on: Reviewed-by: Muthu Subramanian K <> Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>