summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Version 4.2.5.2, tag libreoffice-4.2.5.2libreoffice-4.2.5.2Christian Lohmaier2014-06-123-0/+0
| | | | Change-Id: I4c1c9d967ef441ffd581f1521a9ac14a313789b4
* bump product version to 4.2.5.2Christian Lohmaier2014-06-121-1/+1
| | | | Change-Id: I50a477f6b483f5ff2f68ee35f88443150cb2065c
* resolved fdo#70455 B1:SOMENAME is not a valid singleton referenceEike Rathke2014-06-121-6/+15
| | | | | | | | | | (cherry picked from commit ac8532ce26e79453b3a969b956ebb7823c455131) Conflicts: sc/source/core/tool/address.cxx Change-Id: Iac80d74a9ec6382a232fdc2f4b798e57dc643ad3 (cherry picked from commit e5931aa5aa2180e0587b93cb94ba1405cfe96f83)
* 2nd part of bnc#870233: import font color from color fragment for SmartArtsZolnai Tamás2014-06-127-41/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SmartArt import ignores some fragments during import if drawing fragment exists, which seems to be not complete. In this case font style is blank (white) in data (and drawing) fragment and the real value is defined in the ignored color fragment. So first make color fragment parsing work, then apply font color of "node0" style on nodes of the SmartArt. Actually, it's a workaround, because "node0" style label is hardcoded, for a proper solution layout fragment should be parsed too to get the right style label, but it interferes with the drawing fragment by now. (cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: oox/source/drawingml/diagram/diagram.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8 Reviewed-on: https://gerrit.libreoffice.org/9662 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit bef657e6e2a545eea54d3288a2cd7df9c1a126fa) Signed-off-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit e5a0ca1e12674a6da47a93ea29ea2d764eade5e3)
* 1st part of bnc#870233: wrong list style in shapesZolnai Tamás2014-06-124-0/+107
| | | | | | | | | | | | | | | | | | | | Text list styles were copied, without proper copy constructor and operator. It lad to mix up list styles and so text font. (cherry picked from commit 31650d5b4255c484faec11d570cb98a80f0120cc) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Iee7a6c0c1f74322fd7b80e41a262849f948e463a Reviewed-on: https://gerrit.libreoffice.org/9661 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 0d2ff84ef183262ad826a7d4a161aa317ccfa847) Signed-off-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 544198cb82e036f5b2eadfb36023c652cbd4fa1a)
* update creditsChristian Lohmaier2014-06-111-8229/+10240
| | | | Change-Id: I96c0c0a442c0fcc8a71a74229c98f8b9daa882df
* bnc#870237: wrong text position in grouped listZolnai Tamás2014-06-115-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | In grouped list text area does not cover the whole shape but just a part of it at the top. To get the same visual effect modify text distance attribute. (cherry picked from commit 53c376d35b7223d53e8c9403390afe53d1f69089) Conflicts: sd/qa/unit/import-tests.cxx Reviewed-on: https://gerrit.libreoffice.org/9569 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1f29a3435b11bd6bfc60343953d8b072c7470746) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I32f30d0afbc1975f940c4562ec65f46596e97060 Reviewed-on: https://gerrit.libreoffice.org/9576 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#76953: cannot start show at selected slideZolnai Tamás2014-06-112-0/+10
| | | | | | | | | | | | | | | | It was worked only in slide sorter view properly. It seems it leads undefined behaviour when a menu item is in the menubar.xml but has no definition in *.sdi file. I experienced that on windows menu item was disabled on linux it was enabled. Change-Id: Iba4dd1cbac60a3b3350604d64d60d10d050a4e2b (cherry picked from commit e20876b37d203642b5aa81a2d6c93979600376ed) Reviewed-on: https://gerrit.libreoffice.org/9577 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* various recent openssl CVEsCaolán McNamara2014-06-1110-0/+464
| | | | | | | | | | | Change-Id: Ib8989682690a73e5d09fb06617ad9d0938d76ccc Reviewed-on: https://gerrit.libreoffice.org/9666 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 25b34416cb1d5aa5b3bea66cfdab2a5addb43789) Reviewed-on: https://gerrit.libreoffice.org/9713 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
* Updated coreChristian Lohmaier2014-06-101-0/+0
| | | | | Project: translations 1bda7282ad445ea158421ffeb43776ea8fb1b779
* resolved fdo#79719 recognize ##-MMM-## as date even if ambiguousEike Rathke2014-06-101-8/+3
| | | | | | | | | | | | | | | | Force ##-MMM-## to be ##-MMM-#### if the first number is a day value. Note that the previous implementation of (bDay1 && bDay2 && ((bYear1 && !bYear2) || (!bYear1 && bYear2))) never matched anyway as the detection of bDay1 and bDay2 were changed to only yield true if bYear1==false or bYear2==false. Change-Id: If6bb6d3e1757015552eaa81c1f58d53c0794846e (cherry picked from commit a6992cd0d7c085ba05877e6f68ac0650dd09010f) Reviewed-on: https://gerrit.libreoffice.org/9667 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fix fdo#40073 : look for translated frame stylesElie Roux2014-06-101-0/+1
| | | | | | | | | | | | | | | | | | LO was looking for untranslated frame styles, while at this step, the style list contains only the translated ones. Change-Id: I36173fc871582f974184fc95bb4d1a82cd3de783 Reviewed-on: https://gerrit.libreoffice.org/9683 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 6f6673c5d1b4e6ea4982621f2817eb5d5dc10377) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit dc59f010248fbb95d7a67ccb914e86c457dcea3a) Reviewed-on: https://gerrit.libreoffice.org/9692 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Resolves: rhbz#1096747 crash/hang on format-page on html documentCaolán McNamara2014-06-091-0/+7
| | | | | | | | | | | | Change-Id: I9a989620375eb210e553b84b7a642a0360c8f03f (cherry picked from commit 655377e90c57bb68e5000f06f76531baf9eeaa37) (cherry picked from commit 829aa9e03ae570e15af1f754b292709f38f643ea) Reviewed-on: https://gerrit.libreoffice.org/9651 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
* fdo#77454: sw: ww8 import: add heuristic to ignore mangled crop valuesMichael Stahl2014-06-071-2/+8
| | | | | | | | | | | | | | | | | Older versions of OOo/LO would mangle negative crop values on round-trip of WW8, which now (since the drawing-layer does not ignore them) causes the images to be rendered invisible; probably large factors don't make sense anyway, so ignore the crop if it's 50x the image size, which happens to work for the bugdoc. Change-Id: I9f36d37e3be27234554bc91e80bfe719b1ce86af (cherry picked from commit 7e91dd0a3885ac561aee9cf7907632677b9886c1) Reviewed-on: https://gerrit.libreoffice.org/9508 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a1f385b74a542ab3caaa8abbefc39f14bf27ca72) Reviewed-on: https://gerrit.libreoffice.org/9531 Reviewed-by: Eike Rathke <erack@redhat.com>
* fdo#78737: sw: fix setting tab stops via rulerMichael Stahl2014-06-071-1/+3
| | | | | | | | | | | | | | | | | | | | | The SvxRuler binds the SID_ATTR_PARA_LRSPACE, and its indents and the positions of tab stops depend on the values it gets from there; in LO 4.0 the value came from the SwView::StateTabWin() but now it comes from SwTextShell::GetAttrState(), and the difference is that the former does a special request to get the NumRule indents as LR-space. (regression from d02f75a8c36705924ddd6a5921fe3012fafce812) Change-Id: I548ce188655555f2473cb3973ce7aeb927d1a404 (cherry picked from commit 7c8b2f10310f0f64b111afb3012e82e9c4a690ac) Reviewed-on: https://gerrit.libreoffice.org/9538 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f9d5d1a7dabb73b16b6528217a26924feb08c1b7) Reviewed-on: https://gerrit.libreoffice.org/9562 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
* fdo79368 Don't process overflow menu items twice.Andrzej Hunt2014-06-062-3/+21
| | | | | | | | | | | | | | | | | | | | | We reuse the toolbox overflow menu for toolbarmanagers context menu -- toolbarmanager previously added its menu listener to the toolboxes menu permanently, meaning that it would try to handle overflow menu items (in addition to the context menu items which it should handle), instead we should only add the listener when we are actually using the menu as a context menu. Perhaps it would be better in the long run to actually use fully separate menus instead, and ask toolbox to specifically add its items to that rather than trying to hack the context menu on top of the overflow menu? Change-Id: Iecface2c6eae9ab79dbcdb25ffdbaf446e2885ea (cherry picked from commit 1ae89d189200c1e351a396a3f02612b84a69985f) Reviewed-on: https://gerrit.libreoffice.org/9603 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* fdo#78976: Correct way to determine the end position for matrix check.Kohei Yoshida2014-06-041-1/+1
| | | | | | | | | | | | Change-Id: Ifd6acd85a9bf33742cb62327a3b8a4320f35d0f3 (cherry picked from commit 054213e86b8f3b1084474b0447cc7ffaf82178c5) Reviewed-on: https://gerrit.libreoffice.org/9512 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 20857b5d7536b3fcafa16ca6527ba459032933d7) Reviewed-on: https://gerrit.libreoffice.org/9528 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* fdo#78332: sw: fix separators in SwDDEFieldType::PutValue()Michael Stahl2014-06-031-1/+2
| | | | | | | | | | | | | | | Setting 3 separators instead of 2 does not work. (regression from 263153842741d7ce21cc0bf1c5296a55a1138024) Change-Id: Id0b4649404b8a49a7f89a237c46106bce4e146ff (cherry picked from commit 747bcdc14386978f2a98a452e52c8dcc2459d319) Reviewed-on: https://gerrit.libreoffice.org/9513 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 090c66b2c91378a83e294e872d6c8cb2a497eb80) Reviewed-on: https://gerrit.libreoffice.org/9530 Reviewed-by: Eike Rathke <erack@redhat.com>
* resolved rhbz#1101224 do not attempt to obtain names for NULL tabsEike Rathke2014-06-031-2/+7
| | | | | | | | | | | | | This happened when the HTML export via clipboard tried to resolve conditional formats, where we have a temporary instance of a document containing only the sheet to be exported. Change-Id: Ic7498a1cab3eabede74773868287a2cc3edef052 (cherry picked from commit 17979abf4fde202cae231be19a218be3fe27d04c) Reviewed-on: https://gerrit.libreoffice.org/9510 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* fdo#64956: editeng: fix RTF color table exportMichael Stahl2014-06-034-70/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | The editengine RTF export produces this: {\colortbl\red255\green255\blue255;;} ... and then it proceeds to map COL_AUTO to \cf0 i.e. the "white" entry that is the result of erroneously writing out the 0th entry regardless of whether it is COL_AUTO or not. Fix the color table export to always put COL_AUTO first (as the Writer RTF export already does), and simplify the code a bit. (cherry picked from commit 55070972b32e719e4855855797263d6342a3625f) Conflicts: editeng/source/editeng/editdoc.cxx editeng/source/editeng/editdoc.hxx editeng/source/editeng/impedit4.cxx Change-Id: Ia8ce19f387e3627a1b4a26bcc723edcf5b1ffdf8 Reviewed-on: https://gerrit.libreoffice.org/9585 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit edfd206f65afb9afb5b0e9842453ba0cc085a0b5) Reviewed-on: https://gerrit.libreoffice.org/9618 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
* don't add the changes toolbar to the forms window, fdo#76752Markus Mohrhard2014-06-031-17/+0
| | | | | | | | Change-Id: I1a5d62b0995343a73fd8d6941f0fa380bb19e783 Reviewed-on: https://gerrit.libreoffice.org/9606 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#78927: Use different XML attribute names for asian and complex fonts.Kohei Yoshida2014-06-031-14/+26
| | | | | | | | | | | | | | Change-Id: I96a26bd495d6a78fffd0854b5084f69b5db84ee6 (cherry picked from commit 1b35c7ea4f7fe1473dbe08ab93b7259403b290ff) Reviewed-on: https://gerrit.libreoffice.org/9588 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 282227a81df90dfe11f0b57a4d7558d7faa56836) Reviewed-on: https://gerrit.libreoffice.org/9623 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fix bad cast in SvxStyleBox_Impl::StateChanged()Michael Stahl2014-06-031-2/+5
| | | | | | | | | | | | | | | This causes various JunitTest crashes on Windows, regression from 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec. Change-Id: Iab24e0d39375ac1e5ac63d32470dca1e54d518c5 Reviewed-on: https://gerrit.libreoffice.org/9621 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 3b41dc58dc3689d4506dec0825834fbec0d1ed60) Reviewed-on: https://gerrit.libreoffice.org/9622 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#79372 fix hyphenation (remove fdo#56392 fix, except hard hyphen part)László Németh2014-05-301-19/+3
| | | | | | | | Change-Id: Ia2f482fb7737e61cfc42966dbc7af6e1cdb3b41d Reviewed-on: https://gerrit.libreoffice.org/9543 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* fdo#78801 fdo#52547 Paste preference is image, then html, then text.Andrzej Hunt2014-05-301-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | c47db038f98aaf7aec3cbe57c4e5683591afa23e was an attempt to fix fdo#52547, i.e. to make sure that the actual image data was stored if an image was being pasted from a browser (where the clipboard contains both image data, but also an html construct which would instead embed the image from the web). However the new ordering inadvertently meant that strings would be preferred to html -- i.e. copying a mixture of text+image from a webpage would result in only the text being stored. The new ordering causes images copied from the browser to still have the actual image data stored (rather than a link in the case of the html being stored), but html is still preferred to plaint text. (This is primarily as a result of Firefox (and possibly other browsers) changing their clipboard to contain an html construct which links to the original image, in addition to the raw image data-- and html previously being preferred to images in the paste ordering meant that the linked version would be pasted by default, which is not the expected result when copying an image.) Change-Id: Ice9b37cf3dd25d8cdb0e04f19a6b2f3661018564 (cherry picked from commit 538c13f3d1756f2d105115f64ab1bc0b7426eebc) Reviewed-on: https://gerrit.libreoffice.org/9535 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* Resolves: fdo#79392 don't access after last row, when last row is max last rowCaolán McNamara2014-05-291-10/+13
| | | | | | | | Change-Id: I06749af90bed6a43f3fb6b3b5ceb61d5fbbc7c02 (cherry picked from commit a35d92197d850527bd294eb6197b5bf83109d5be) Reviewed-on: https://gerrit.libreoffice.org/9547 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
* bump product version to 4.2.5.1.0+Christian Lohmaier2014-05-271-1/+1
| | | | Change-Id: I4cdd9d9692df9ea6bfa35bda3fb1ad074928271a
* Branch libreoffice-4-2-5Christian Lohmaier2014-05-274-1/+1
| | | | | | | | | | | | This is 'libreoffice-4-2-5' - the stable branch for the 4.2.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4c7de4535d77eb454c1156c8924605eb61092d5a
* Updated coreChristian Lohmaier2014-05-271-0/+0
| | | | | Project: translations 939713e6d30880089c0399c267fd998fa1954419
* update dictionariesChristian Lohmaier2014-05-271-0/+0
| | | | | | | manual push of 0a68bdc3b29237ab76bce445f3cdc535b1482307 didn't trigger an automatic update.. Change-Id: I5dd94c32208d88ccf3069d55fe21428a98fd3211
* fix build-break on windowsChristian Lohmaier2014-05-271-1/+2
| | | | | | | ae95cdd2a1708a8e9e114dd9bcf577f57f1f5af3 introduced a check, and did put it outside of a #if !defined(WNT) block... Change-Id: Id200c6f3161d0c6c611e0b1c293adbd060579cd7
* fdo#79078 restore transparency in SVG exportLászló Németh2014-05-271-2/+2
| | | | | | | Change-Id: I5bdf6c3b313a73126cb692e5101836f424a2fc08 Reviewed-on: https://gerrit.libreoffice.org/9442 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* Resolves: fdo#79181 drop hidden shape and drop negative clip rectCaolán McNamara2014-05-271-42/+43
| | | | | | | | | | | | | and just resize bg to the desired size. The negative clip is getting applied against an assumed 0,0 origin and so we're missing the bottom of the unclipped image. Change-Id: I9d7c5d17de15176d103690898281c6b875b560ca (cherry picked from commit f5251d35043cab1117e12677f0c40f3e849f3e1c) (cherry picked from commit e71fccd0729340c666e2b32dc09cdc9eff246568) Reviewed-on: https://gerrit.libreoffice.org/9486 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* various situations where graphic go missing on saveOliver-Rainer Wittmann2014-05-276-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves: #i114361# provide and accept changed URL... of embedded graphic file during save (ODF export) (cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/core/unocore/unoframe.cxx sw/source/filter/xml/xmltexte.cxx xmloff/source/draw/shapeexport2.cxx (cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d) Conflicts: sw/inc/ndgrf.hxx Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986 Resolves: #i124946# only apply new embedded stream name... for a graphic, if is already has one. - needed correction for the fix made for issue #i114361# (cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/xml/xmltexte.cxx (cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8 Resolves: #i124966# keep picture format information - <GfxLink> instance - also for the reading of preview picture data in order to avoid trouble on save in case that the preview data equals the picture data (cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366) Conflicts: svx/source/svdraw/svdograf.cxx (cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d Reviewed-on: https://gerrit.libreoffice.org/9456 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* bnc#863018 WW8 import: fix upper margin of multi-page floating tableMiklos Vajna2014-05-266-9/+46
| | | | | | | | | | | | | | | | | | | A vert orient position was already handled in case a floating table was imported as a TextFrame, but in case we didn't do that, the vert orient position was simply lost. Fix this by importing it as the upper margin of the table (assuming that the position is relative from the anchor position). (cherry picked from commit 3755c87d0426a499d4755e82d8fbc77caa240764) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I3e96f3068605fd6313dfb3e55483e1bce6c063a5 Reviewed-on: https://gerrit.libreoffice.org/9487 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
* fdo#78900 RTF import: allow \dpxsize inside \dptxbxtextMiklos Vajna2014-05-262-0/+22
| | | | | | | | | | Previously we assumed that they always appear under \do directly. Change-Id: Ie3a978da856986f604a3815d6127abb4191323c0 (cherry picked from commit 21c11ffe254612ac46aa891addacb0024d5b93f0) Reviewed-on: https://gerrit.libreoffice.org/9488 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#79008 Crash: File getting crash while saving in LODinesh Patil2014-05-263-2/+11
| | | | | | | | | | | | | | | | File is getting crashed while saving in LO, as it tries to access the value of vector after erasing that value. Code changed to access the vector value first and then erase that value from vector. Change-Id: I29369b7582fdbd7363d0e6fdae091a30c79a747d Reviewed-on: https://gerrit.libreoffice.org/9433 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ed3fd76b65b2a281effea55b8a55101a8b740aec) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx
* Resolves: fdo#79139 Crash in SwDropCapCache::CalcFontSizeJulien Nabet2014-05-261-1/+1
| | | | | | | | | | | Minimum of nMaxFontHeight must be at least 1 Cherry-picked from 06afd4067f7bc321d7dd0a4e8c235b0b21e3d49a Change-Id: I35462fc069c7026958e597c2e0605345ed009c91 Reviewed-on: https://gerrit.libreoffice.org/9458 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#64047: n#863021: Add set-all language menu.Muthu Subramanian2014-05-255-5/+134
| | | | | | | | | | | | | | | Problems: * Doesn't reset the spell error markers * Modifies only at object level * Currently has only setting for 'all text' * Maybe provide a current slide only option? Change-Id: I4695423fed3ed9422185b23803eedd12ef434bea (cherry picked from commit 0833f4046a1afa77aeed97a131c5325c44be1bb3) Signed-off-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/9314 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#77454: fix WW8 import/export of negative image cropMichael Stahl2014-05-254-16/+57
| | | | | | | | | | | | | | | | The negative crop values were imported as large positive values, which caused the image to be rendered with 1 pixel width after commit 2e5167528f7566dd9b000e50fc1610b7bf99132a. (cherry picked from commit 6d431ffb682d0e64b75b6267f369822ff0b0617e) Conflicts: sw/qa/extras/ww8export/ww8export.cxx Change-Id: I0e01b9d9a05d90e868699832085a06ba5aab7e54 Reviewed-on: https://gerrit.libreoffice.org/9470 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* CustomAnimationCreateDialog: select previously set misc animationZolnai Tamás2014-05-251-1/+1
| | | | | | | | | | Regression from 9695f38ca4ab26b40524f2eade98c45f0360131d. Change-Id: I8777fd8fa3e31c67b6645044d262fd4c5f645634 (cherry picked from commit dd1f8ac3575a929e71b39d5f7043be057ebaa727) Reviewed-on: https://gerrit.libreoffice.org/9480 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Resolves: fdo#79137 Crash in oox::vml::InputStream::updateBufferJulien Nabet2014-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | | bt shows: Program received signal SIGSEGV, Segmentation fault. 0x00002aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) at /home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339 339 while( (mnBufferPos >= maBuffer.getLength()) && !mxTextStrm->isEOF() ) (gdb) bt 0x00002aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) at /home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339 0x00002aaadba21048 in oox::vml::InputStream::available (this=0x8d7fd80) at /home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:326 0x00002aaacf5a0249 in sax_fastparser::FastSaxParserImpl::parseStream (this=0x89aea30, maStructSource=...) at /home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:810 Indeed, mxTextStrm is invalid, so let's test its validity in InputStream constructor Cherry-picked from 372d5d74ad8cfb9b69dc20557359c4a2c1597b57 Change-Id: Ifed79603e33b64d11eb07656df17824b7f98058f Reviewed-on: https://gerrit.libreoffice.org/9466 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* do not store invalid date acceptance patterns in configurationEike Rathke2014-05-232-1/+7
| | | | | | | | | | | | (cherry picked from commit e0480c81a956751e48f8ef36a41c3062c1bed345) Conflicts: cui/source/options/optgdlg.cxx Change-Id: I78cd8b304db2243fd105d4b13421b6ea0347e042 Reviewed-on: https://gerrit.libreoffice.org/9453 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#76824: Proper way to parse cell address strings.Kohei Yoshida2014-05-231-13/+27
| | | | | | | | | | Be aware of the variable address convention. Change-Id: I37ca38758f055e7799cadefafda61174ea3cbf9c (cherry picked from commit 653e4adddfc80aeb91c1d21c18e95b3986c85c54) Reviewed-on: https://gerrit.libreoffice.org/9454 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
* fdo#79011: Properly implement the search results dialog as modeless.Kohei Yoshida2014-05-239-19/+144
| | | | | | | | | | | | | | | | | | | | It's unfortunate that adding a modeless dialog is such a pain. But we still need to implemenet this properly else we'll leak at best, or end up with tons of weird bugs at worst. (cherry picked from commit 81c492ef18b04cc283561018d69818cbca7f83ef) Conflicts: sc/inc/sc.hrc sc/sdi/cellsh.sdi sc/sdi/scalc.sdi sc/source/ui/view/cellsh1.cxx sc/source/ui/view/tabvwsh.cxx Change-Id: Ie03260f288fad76f994d0ca6a8b1feeade299ffd Reviewed-on: https://gerrit.libreoffice.org/9451 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
* fdo#78903: Don't broadcast prematurely during cell deletion.Kohei Yoshida2014-05-231-22/+0
| | | | | | | | | | | We need to wait until all the affected cells get marked dirty at the end of the deletion process. Change-Id: I49618fcc386ec2209f5f0267d50257ecb8dd21d1 (cherry picked from commit cb167ac784f9b16944da4494b65e56b2a5b66bb7) Reviewed-on: https://gerrit.libreoffice.org/9443 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
* MSWord uses \xb for linebreaks in DB fields (bnc#878854)Luboš Luňák2014-05-231-0/+2
| | | | | | Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441 (cherry picked from commit d4a19c4098f4556f05666ed92a85c6138b4f769a) Signed-off-by: Andras Timar <andras.timar@collabora.com>
* fdo#78742: SfxFilterMatcher: respect requested document service if setMichael Stahl2014-05-221-1/+3
| | | | | | | | | | | | | | sfx2::DocumentInserter::CreateMediumList() creates a SfxFilterMatcher that should match Writer filters only, but actually Calc filters may be returned; check that the document service matches. (regression from 3da8f3680556e0163f660a0a159930337c8c32ff) Change-Id: I6208d38c1110355105aa5d1ffa1b57142193a4d7 (cherry picked from commit 805fd1ca343d6295b8114a24cc29bdac332f266d) Reviewed-on: https://gerrit.libreoffice.org/9404 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
* Fix order of function pointersStephan Bergmann2014-05-221-2/+2
| | | | | | | | Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3 (cherry picked from commit c8945b3fb850985794efcb8afbbdc2f5985d7088) Reviewed-on: https://gerrit.libreoffice.org/9440 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* Use varying aElement nameStephan Bergmann2014-05-221-1/+1
| | | | Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4
generated by cgit (git 2.34.1) at 2024-05-18 22:15:05 +0000