summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bump product version to 4.2.6.3.0+libreoffice-4-2-6Christian Lohmaier2014-08-221-1/+1
| | | | Change-Id: I6e3127ba77eb9e10fcdcfbb87aa9c07fa275566c
* Related: #i125226# expect DDE servers to be already upHerbert Dürr2014-08-221-61/+11
| | | | | | | | | | | | | | | | | | | | "soffice" is always up anyway and other DDE apps should be started manually (cherry picked from commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0) Conflicts: sfx2/source/appl/impldde.cxx (cherry picked from commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759) Conflicts: sfx2/source/appl/impldde.cxx Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790 Reviewed-on: https://gerrit.libreoffice.org/10297 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1e7502f3c8b8d751dd851c3f146debf2678781ec)
* Resolves: #i125386# secured user request and changed some bools to bitfieldArmin Le Grand2014-08-224-18/+62
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3) Conflicts: comphelper/inc/comphelper/embeddedobjectcontainer.hxx comphelper/source/container/embeddedobjectcontainer.cxx sfx2/source/appl/linkmgr2.cxx svtools/source/misc/embedhlp.cxx (cherry picked from commit d005acae3aa315921f2c331612131626c470bd22) Conflicts: include/comphelper/embeddedobjectcontainer.hxx Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9 Reviewed-on: https://gerrit.libreoffice.org/10882 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 070f5923eac7a93b64d2f168d91a3983b80a22c0)
* bump product version to 4.2.6.2.0+Christian Lohmaier2014-07-231-1/+1
| | | | Change-Id: I065bc439def341fda193ab5cd195b513e6f7f95b
* update creditsChristian Lohmaier2014-07-231-8230/+10528
| | | | Change-Id: I2792642f21a75b7d8b3d66e9157f439ff7124b12
* fdo#80363 backport of the fix for Cyrillic spell. dictionary pathLászló Németh2014-07-234-4/+22
| | | | | | | | | | | (cherry picked from commit e77a9785ca76d7350bbcbe8a107a80f89bc72831) Change-Id: I1b9c016e8d04f1cf14dad2a421c7eeb513a7b2ff Reviewed-on: https://gerrit.libreoffice.org/10472 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* fdo#81276: sw: HTML import: fix inverted test in CSS importMichael Stahl2014-07-233-1/+35
| | | | | | | | | | | | | | | | | | | (regression from 5089bdb234a93bcb62b597c18b8ab66048246b13) (cherry picked from commit 7dff37c65e08985b80ac79e13f5571819a8e739d) Conflicts: sw/qa/extras/htmlexport/htmlexport.cxx Change-Id: I5b45c4c47ba66385b2b528b5a3039bda37b060d6 Reviewed-on: https://gerrit.libreoffice.org/10476 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a6a423148d66a9bf68cdd6475ea792263ab80df8) Reviewed-on: https://gerrit.libreoffice.org/10484 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* fdo#80498: vcl: Revert "fdo#74124: Scale the pictures before calling ...Michael Stahl2014-07-231-26/+1
| | | | | | | | | | | | | | | | | | | | | | | ... ImplDrawAlpha()." This reverts commit 3cf3700b7a903e88f5296076c40ae854bce91cdc. It may look nicer but is unusably slow when scrolling in Writer. (same as master commit ee36fc7add892690c95a969530ecdcfc1bc9decc) Conflicts: vcl/source/gdi/outdev2.cxx Change-Id: Ieb3d0b9dedeb3f1688eb30668e59750f3b569d9b Reviewed-on: https://gerrit.libreoffice.org/10205 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 1c269727b470c03f0ea538cad7e1331fd569a579) Reviewed-on: https://gerrit.libreoffice.org/10341 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#79221: Wrong rendering of bottom and right character borderZolnai Tamás2014-07-221-2/+4
| | | | | | | | | | | | | | | | Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0. SetMirrorWidths() works only when there are two lines (double border), but breaks one line borders. Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9 (cherry picked from commit bdbf6cee5a3a012412699dba103b9f6430084722) Reviewed-on: https://gerrit.libreoffice.org/10460 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* fdo#80462: Don't always increment the start row position.Kohei Yoshida2014-07-221-1/+3
| | | | | | | | | | | | | | Sometimes someone might attempt to sort only a single row. Change-Id: Ie29d4cf7ec0bd3a5c945997083368b6ef6074268 (cherry picked from commit 5902dcf0995cdd0a6c1dbd1f9c21b0b2b3f5609f) Reviewed-on: https://gerrit.libreoffice.org/10260 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit f97d25b66e88742e4cb4011cc4cc0bc682c1ee1c) Reviewed-on: https://gerrit.libreoffice.org/10278 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
* resolved fdo#79441 keep 3D references intact during sortEike Rathke2014-07-223-4/+5
| | | | | | | | | | Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888 (cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1) Reviewed-on: https://gerrit.libreoffice.org/10241 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* resolved fdo#77018 keep external references intact during sortEike Rathke2014-07-221-0/+17
| | | | | | | | | | | | | | Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to work. Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60 (cherry picked from commit db0a4c2575ffba1c170d74882b0f5a6229ec072f) Reviewed-on: https://gerrit.libreoffice.org/10246 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* use SvXMLExport::GetRelativeReference(), fdo#79305Eike Rathke2014-07-221-1/+1
| | | | | | | | | Change-Id: I1e92a87034cf31470a9d8809f3b543b154c65126 Reviewed-on: https://gerrit.libreoffice.org/10446 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#81336 bison priority increase with bigger numberLionel Elie Mamane2014-07-221-4/+4
| | | | | | | | | Change-Id: Ib99f08c52379fd9df90c30b61cc246ee53022506 Reviewed-on: https://gerrit.libreoffice.org/10404 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
* resolved fdo#81294 store correct sheet number during range names updateEike Rathke2014-07-211-6/+12
| | | | | | | | | | Change-Id: Ic4c858efa6e7c1a65357ac79f01e6c08f464ae3f (cherry picked from commit 4011b74eb7650a0eeb99d3acebb9ef60b0fcaab9) Reviewed-on: https://gerrit.libreoffice.org/10377 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#81173 abi#3623 RTF import: missing null pointer checkMiklos Vajna2014-07-172-1/+8
| | | | | | | | | | | | (cherry picked from commit 08fb25ab7941c52d4eed0435a45a38b03aff588c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I5861e5fec0d822f42dfeb994500a818a968e69fb (cherry picked from commit 50df6263ccde24874191812950dcccd8f839754b) Reviewed-on: https://gerrit.libreoffice.org/10358 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
* fdo#81214 - tolerate exceptions thrown inside XFastParser callbacks.Michael Meeks2014-07-151-6/+5
| | | | | | | | | | | | | | | | Not an ideal solution; ideally we should not throw the exceptions, and stop the parser as soon as something bad like this happens; but hopefully exception throwing is reasonable exceptional. Change-Id: If619592533b2929c671e2b03eb8a83480bd92c54 Reviewed-on: https://gerrit.libreoffice.org/10289 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b8d8ec78c3e242d94963beef5aff6335f047ef59) Reviewed-on: https://gerrit.libreoffice.org/10290 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* resolved fdo#80195 act on implicitly propagated error, if anyEike Rathke2014-07-141-0/+5
| | | | | | | | | | Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e (cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085) Reviewed-on: https://gerrit.libreoffice.org/10199 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
* fdo#80333: .doc has large black rectangles between paragraphsZolnai Tamás2014-07-143-10/+23
| | | | | | | | | | | | | | | | | | These black rectangles are character border shadows, because checking whether there is a border at all was missing. In Word there is no shadow without a border. Regression from aa2faee4b3954b57a613963b501ecf611b3a14ca (cherry picked from commit c2e708d61746a259888c0e5fb1d3e9a43e3ca696) Change-Id: Ib3cb4e904fdd33f215c81d7c02762a196f484b1b Reviewed-on: https://gerrit.libreoffice.org/10251 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Related: #i125226# don't try to access known-bad DDE serversHerbert Dürr2014-07-111-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132) Conflicts: sfx2/source/appl/impldde.cxx Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4 (cherry picked from commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2) Related: #i125226# some macro preferences are directly... applicable to DDE servers (cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1) Conflicts: sfx2/source/appl/impldde.cxx Change-Id: Ic16b3df34ac1b003a8a5cabab15ea655d05bdd18 Related: #i125226# typo fix (cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd) Conflicts: sfx2/source/appl/impldde.cxx Change-Id: I8db53b7e8529d05e660a2d69e669b44c9045712c (cherry picked from commit 13b68e24db26374ca17572de9abb429edeac32e9) Related: #i125226# disallow absolute and relative paths for DDE servers (cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4) Conflicts: sfx2/source/appl/impldde.cxx Change-Id: I127add375a127dbbd0eaf12a10884e2636f1a332 (cherry picked from commit d1fc47793c1efbe9ff5271656283211647dd0b33) Reviewed-on: https://gerrit.libreoffice.org/10203 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* fdo#80201: msfilter: fix infinite loop during exportMarkus Mohrhard2014-07-111-0/+2
| | | | | | | | | | | | | | (regression from 6c5557c60f97778fd732c01f054553356ce7f258) (cherry picked from commit 86b9f03c3f754f7b753893ff2772f6b17bf3de3c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I75bfafbc7343aaddbbc5c7433e28b5d4154177dc (cherry picked from commit 11d6ae6df8dfff1db182ac455d4abcaf7c18ded1) Reviewed-on: https://gerrit.libreoffice.org/10209 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* bump product version to 4.2.6.1.0+Christian Lohmaier2014-07-091-1/+1
| | | | Change-Id: I1184bc48787bfe63d144b2c7631940a314488a4f
* Branch libreoffice-4-2-6Christian Lohmaier2014-07-094-1/+1
| | | | | | | | | | | | This is 'libreoffice-4-2-6' - the stable branch for the 4.2.6 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: I9ab3c759892c827ef8b26e83712c526facccebe5
* bnc#882383: Do not ignore themeOverride for charts in .pptxMatúš Kukan2014-07-095-1/+109
| | | | | | | | | | | | | | Otherwise wrong colors are displayed. (cherry picked from commit 08818d8a45e034ad825c7fafbb76766f106f1d1d) Conflicts: oox/source/drawingml/shape.cxx Change-Id: I5d7444100355fdbc5fcd2aaa1c01202ace54312d Reviewed-on: https://gerrit.libreoffice.org/10164 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* fix fdo#77844: header wrongly enabled from .docLuke Deller2014-07-093-2/+60
| | | | | | | | | | | | | | | | | The LO page style needs page headers to be turned on if the corresponding .doc file section has a left (=even) page header or a first page header. However this should not be triggered in the case where a first page header is present but hidden due to the "different first page" header option being disabled. This case is fixed by this commit. Change-Id: If3de0df45378587fdbdecc6a091d2f4b60940b43 Reviewed-on: https://gerrit.libreoffice.org/10100 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f312ef98de57a5926be67421395544bb9d41b809) Signed-off-by: Michael Stahl <mstahl@redhat.com>
* sw: do more input validation in SwWW8ImplReader::Read_AndMichael Stahl2014-07-091-1/+3
| | | | | | | | | | (to fix up f2945255df273404ee2457dcf761cb8f334b732b) Change-Id: Ie20fb9db4515b9737322ec7224ecd7e411d31c03 (cherry picked from commit ae2e7ad276acb9394691a9d4a702ed7a6b07b508) Reviewed-on: https://gerrit.libreoffice.org/10141 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Updated coreChristian Lohmaier2014-07-081-0/+0
| | | | | Project: translations ade9b0b52531db428b25b36dc3e3bfcfe880a06d
* fix crash loading ooo100546-1.xlsCaolán McNamara2014-07-082-4/+8
| | | | | | | | | | | | | | | | regressions around inserted extra enum values into ShapePropertyId (cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d) Conflicts: include/oox/drawingml/shapepropertymap.hxx oox/source/drawingml/chart/objectformatter.cxx Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3 Reviewed-on: https://gerrit.libreoffice.org/10136 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
* fix crash loading ooo#93570-3.docCaolán McNamara2014-07-081-13/+26
| | | | | | | | | | | | | | | | | | regression from f2945255df273404ee2457dcf761cb8f334b732b cp#2013101510000026: doc import of comments affecting more text nodes use Move(fnMoveBackward, fnGoNode) to at least ensure we stop going backwards when we run out of valid places to go backwards to. This still isn't great because the distance between two msword character indexes only equates to the same distance between our characters in the very simple cases Change-Id: I248fd12c067577d2f1fd64f48583321eb6d453e4 (cherry picked from commit b1cd83c625a2afeb9da43cc9745d79c01963c797) Reviewed-on: https://gerrit.libreoffice.org/10140 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* DOC import: fix nested commentsMiklos Vajna2014-07-082-1/+15
| | | | | | | | | | | | | | See 2.9.70 (FBKF) in the spec, the ibkl field should be used to find the position in PlcfBkf. Previously we assumed that PlcfBkl and PlcfBkf is parallel for annotations, as but that's not true for nested comments. Change-Id: I76a6a757b41d2f9b7fe7fe9c9e01a92c251f7b32 (cherry picked from commit 5cfda4f4de8da82485e27b1f0f0d94211d3b4d95) Reviewed-on: https://gerrit.libreoffice.org/10138 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* coverity#1158240 Dereference before null checkCaolán McNamara2014-07-081-2/+2
| | | | | | | | Change-Id: I5ce6d5514c6bb2298dd00c43d21a43dba55268c3 (cherry picked from commit 6c7b64bad403fb6eeac6e79d356f456f741a00d4) Reviewed-on: https://gerrit.libreoffice.org/10139 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* Fix some OUString construction error with VS2013Tor Lillqvist2014-07-081-1/+1
| | | | | | | | | | | | | | | | | | A bit unclear to me whether the code really did what was intended with earlier VS versions either. VS2013 said: error C2664: 'rtl::OUString::OUString(const sal_uInt32 *,sal_Int32)' : cannot convert argument 1 from 'const char *' to 'const rtl::OUString &' Reason: cannot convert from 'const char *' to 'const rtl::OUString' No constructor could take the source type, or constructor overload resolution was ambiguous Change-Id: Ie23d8382515064062a3ed46418d9d4a977b35d28 (cherry picked from commit eee44c951c104da342d55fd4de634efd51ae59ae) Signed-off-by: Michael Stahl <mstahl@redhat.com>
* Resolves fdo#43277 Send Legacy Report "E-Mail as ..."=>error messageJulien Nabet2014-07-071-1/+1
| | | | | | | | | Cherry-picked from 501ebd0f7c867c4df5ba84fd8b6b1a197aeeea92 Change-Id: Iaaadd4fd3015214c007a86d1a83f837aa0d2bdb6 Reviewed-on: https://gerrit.libreoffice.org/9998 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLrMiklos Vajna2014-07-066-0/+35
| | | | | | | | Change-Id: I102c70429457515b34e74cb8e82e1417e6276d1d (cherry picked from commit 3325e0f206ce864730468c3556ce06760042c157) Reviewed-on: https://gerrit.libreoffice.org/10049 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
* bnc#884615 VML import: import OLE objects in header with background wrappingMiklos Vajna2014-07-065-4/+18
| | | | | | | | | | | | | | | | | We already do this for drawingML shapes since commit 500343105707a9905f5198a4af6ad58fe307b7c2 (DOCX drawingML shape import: always set Opaque, 2013-12-04), make the VML / OLE case behave the same as well. (cherry picked from commit 15c3a08b8b1e8060f9659c7bc98480a39d1802c5) Conflicts: sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx Change-Id: Ic22f1f3cfd325ccbbb9bd6fe9814553683e4de55 Reviewed-on: https://gerrit.libreoffice.org/10090 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
* fdo#73241 RTF import: ignore page break in tablesMiklos Vajna2014-07-063-0/+18
| | | | | | | | | | | | | (cherry picked from commit fdc235126d6d73f47a5b56d453e1d3db8ba3e816) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ibee9fec0f421b4c2ff3d45c861bc3fcfc97cbf15 Reviewed-on: https://gerrit.libreoffice.org/10093 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
* fdo#80813 - avoid FMR by re-fetch pattern after a potential re-calculation.Michael Meeks2014-07-051-2/+6
| | | | | | | Change-Id: Ib197f4cd74cd2c444a5f7c207fe2e5be14eea65d Reviewed-on: https://gerrit.libreoffice.org/10095 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* fdo#76803: writerfilter: fix image wrap polygon import againMichael Stahl2014-07-051-2/+4
| | | | | | | | | | | | | The division in Fraction::init() should be a signed one, to prevent a change in sign, e.g., -220869/9 = +477194047. (regression from f8307e5ae11e8235fa1fb88ed52625bf9c650dc2) Change-Id: Icbbd1721144ff42c53ae71312641bd601ba60762 (cherry picked from commit dcbac37efebb9877a72f7c9914b63d60f46a5656) Reviewed-on: https://gerrit.libreoffice.org/10079 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* Resolves fdo#79276 Add fallback system for autocorrection of French variantsJulien Nabet2014-07-055-11/+24
| | | | | | | | | | | | | | | | | | | 1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no specific for variants of fr 2) Add a fallback system to use it Reviewed-on: https://gerrit.libreoffice.org/9825 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Conflicts: editeng/source/misc/svxacorr.cxx include/editeng/svxacorr.hxx sw/source/core/edit/acorrect.cxx Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50 Reviewed-on: https://gerrit.libreoffice.org/10065 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* error: no matching function for call to 'assertEquals'Matúš Kukan2014-07-041-1/+1
| | | | | | Change-Id: I0b87c2abeec30e9e4eab3ce488a5828b8a5b475d (cherry picked from commit 4a3b0e544dbc45a3972006a2ead75492d6876f95) Signed-off-by: Michael Stahl <mstahl@redhat.com>
* add Carlito/Caladea fonts to install scriptAndras Timar2014-07-042-3/+9
| | | | | | | | | | | They were added in libreoffice-4-1 branch but not anywhere else. See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534 (cherry picked from commit 97f63c17f7bc069a12e3afc3975f09897731a693) Reviewed-on: https://gerrit.libreoffice.org/10083 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* JOINs are left-associativeLionel Elie Mamane2014-07-041-1/+2
| | | | | | | Change-Id: I24fdd2ce9bb87cc52a7c84ec8cd300bc13b11461 Reviewed-on: https://gerrit.libreoffice.org/10059 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
* fdo#39944: Fix mapping for some a11y roles to ATKJacobo Aragunde Pérez2014-07-041-5/+5
| | | | | | | | | | | | | | | In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being mapped to custom roles when specific roles exist; fixed passing the proper name to registerRole. Besides, moved two roles that were in the section 'don't exist in ATK yet' because that's not the case now. Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65 (cherry picked from commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22) Reviewed-on: https://gerrit.libreoffice.org/10068 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* fdo#77057 quick fix: do not touch KindMap for alien file typesAndras Timar2014-07-031-4/+0
| | | | | | | | | | | | (cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215) Conflicts: scp2/inc/macros.inc Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1 Reviewed-on: https://gerrit.libreoffice.org/10051 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
* coverity#1222240 Untrusted value as argumentCaolán McNamara2014-07-031-0/+10
| | | | | | | | | | | | | and coverity#1222239 Untrusted value as argument (cherry picked from commit 5e043613266113a873c55ad45ab0fb1ae14286e8) Change-Id: I48bacfd988a34d67ffa542edba7cba1bb9b0b3cc Reviewed-on: https://gerrit.libreoffice.org/10052 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* More fine-grained check of data series labels in the unit test.Kohei Yoshida2014-07-032-8/+111
| | | | | | | (cherry picked from commit bdad8d9051c207b2eff0d5a7842da83e6119a600) Change-Id: I6b23126816bb114407f2b75545094bc297ee7cc3 Signed-off-by: Andras Timar <andras.timar@collabora.com>
* bnc#812796: Correctly handle static value array for OOXML charts.Kohei Yoshida2014-07-0315-69/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | We need to pass the role of the data sequence in order to avoid unreliable guess work when importing static value array. Also, not all Excel's scatter plots have real numeric X values; some have textural X values in which case Excel switch to generating 1, 2, 3, ... as X values. When importing to our chart implementation, using "categories" role in such cases instead of "values-x" results in a more faithful chart rendering. (cherry picked from commit 6c4e21a234f12e1310ba06f9859e08b424acf8bf) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: chart2/source/inc/InternalDataProvider.hxx chart2/source/tools/InternalDataProvider.cxx Conflicts: chart2/source/inc/InternalDataProvider.hxx dbaccess/source/core/inc/DatabaseDataProvider.hxx dbaccess/source/core/misc/DatabaseDataProvider.cxx sc/source/filter/inc/excelchartconverter.hxx Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78 Signed-off-by: Andras Timar <andras.timar@collabora.com>
* bnc#812796: Don't create data series when the series has no values.Kohei Yoshida2014-07-031-0/+4
| | | | | | Change-Id: I92e2d7a3fab0948aea0557cf3cb65d57d48f3f59 (cherry picked from commit 5e2b7e37a29edf45f829ccee2302a942b54568a1) Signed-off-by: Andras Timar <andras.timar@collabora.com>
* allow build with icu 4.2Caolán McNamara2014-07-031-0/+5
| | | | | | | Change-Id: I4bbcff7963520426d4c04e15d2239431aff65b56 Reviewed-on: https://gerrit.libreoffice.org/10042 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
* resolved fdo#80166 check input against date acceptance pattern plausibilityEike Rathke2014-07-031-1/+37
| | | | | | | | | | | | | | | | | | | ... to prevent confusion of #.### input with D.M that then later is discarded as invalid date input instead of accepted as valid numeric input. (cherry picked from commit 836e504c859a5b67f7ab7ba842785951d41058cd) work around nonsense -Werror=maybe-uninitialized, fdo#80166 follow-up (cherry picked from commit 397362d8532d7b0abe38f2024dd2cefe2482d6a3) 0f9cf74550e43d174bf6ac75e70c51ab7f51ccf8 Change-Id: I178e28b7ef3b26d04eecc73e5e5c61ee41f89e32 Reviewed-on: https://gerrit.libreoffice.org/10037 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
generated by cgit (git 2.34.1) at 2024-05-06 06:34:00 +0000