summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-08Version 4.2.3.3, tag libreoffice-4.2.3.3-hotfix1libreoffice-4.2.3.3-hotfix1Christian Lohmaier3-0/+0
Change-Id: I069a0531ecda322597c1f4aa56493a53877aa134
2014-04-08CVE-2014-0160 heartbeatCaolán McNamara2-0/+109
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8 (cherry picked from commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619) (cherry picked from commit cd121ab497c22470f5e99f9d3032edaccbbc00b1) (cherry picked from commit 32680faf1f0f5bbc1f1235ba724a8cd6230c3d15)
2014-04-03Version 4.2.3.3, tag libreoffice-4.2.3.3libreoffice-4.2.3.3Christian Lohmaier3-0/+0
Change-Id: Idc05c6e7297870feabd1f81c5bc65ea2bfe3bcb8
2014-04-03bump product version to 4.2.3.3Christian Lohmaier1-1/+1
Change-Id: I8373cda1970807732f958da8405bad5416ac79fd
2014-04-03Updated coreChristian Lohmaier1-0/+0
Project: translations 7f1af62e0f88bff0f8c967aa41b5d322e06d5819
2014-04-03Support SmartTagRecognizers againStephan Bergmann1-1/+1
The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 "fdo#46808, Use BreakIterator ::create method." Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d (cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de) Reviewed-on: https://gerrit.libreoffice.org/8825 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-04-03fdo#76697: Remove this duplicate and use the UNO constant values instead.Kohei Yoshida1-34/+17
(cherry picked from commit 72b2fafebfc44fa90f08cc198e2fa5fc26154c5b) Conflicts: xmloff/source/style/bordrhdl.cxx This fixes the bug because in XMLBorderHdl::importXML() the value "none" was rejected as invalid because API_LINE_NONE pointlessly had a different value than BorderLineStyle::NONE. Change-Id: Id81aacc6c594ad25d97f6f6dc578ed9ca16549ab Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 7f3105323f1db11bc0a3ff5c5c71e1dc62338cc4) Reviewed-on: https://gerrit.libreoffice.org/8816 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-04-03resolved fdo#76949 correct grammar is GRAM_OOXMLEike Rathke1-1/+1
Regression introduced with ca8ca8c28742879220f3ff88ae0d71c8d69b11cd that used GRAM_ENGLISH_XL_OOX instead, which is English UI function names with OOXML reference syntax. Change-Id: If6b73e85a45e57f6ef281d1edf8e34dec7cb9bb8 (cherry picked from commit 31e4419ac7581aa7864905bcd4ce42e14df6c9bb) Reviewed-on: https://gerrit.libreoffice.org/8818 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-31fdo#75109 librelogo: fix localized proceduresLászló Németh1-1/+6
Change-Id: Ia6edb02b871a41828758ba5fd5376c811c4084cc
2014-03-26Hopefully fix Windows HiDPI toolbar layout bugKeith Curtis1-2/+2
On Windows HiDPI, toolbar buttons are cut off. This may fix the problem. Here is a screenshot: http://i.imgur.com/NADAvYi.png I can't prove this fixes anything on Windows because I can't see this on Linux and don't really understand the surrounding code. On the other hand, it is easy to prove this is reasonable code. Change-Id: I69c19ad46844bead942ce63883d163cb9d0690c9 Reviewed-on: https://gerrit.libreoffice.org/8637 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 509441038ab95dd3a60efd1b6c302bf22bfbc631) Reviewed-on: https://gerrit.libreoffice.org/8749 Reviewed-by: Keith Curtis <keithcu@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-25bump version to 4.2.3.2.0+Christian Lohmaier1-1/+1
Change-Id: Ia5f0fabce4a2d0fd5e3c2d772e96f8eb51029231
2014-03-25update creditsChristian Lohmaier1-8230/+9516
(cherry picked from commit 85dad9793a15183d7b52847a49d75fe392e1d0a9) Change-Id: I82275cda7f262da58688bb273403d6b31eee294b
2014-03-25Updated coreChristian Lohmaier1-0/+0
Project: translations 21e558dcc192c8c337a72297356102efdf99910e
2014-03-25fdo#51819: autorecovery: fix saving password in protected documents.Matúš Kukan1-3/+5
Thanks to sayt@mailinator.com for the idea. Change-Id: Ib79abafe3d4d3ba21f7914aeb284d86ce662824c (cherry picked from commit ef87ff6680f79362a431db6e7ef2f40cfc576219) Reviewed-on: https://gerrit.libreoffice.org/8676 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-25fdo#74155 mailmerge output path fixAndras Timar1-1/+1
regression from dd7acb3d76cd89b3f05dbdafe88eb50e60fd9d10 Change-Id: Ia79ed67df1f0e2803bd3e729951dee3a7438096d Reviewed-on: https://gerrit.libreoffice.org/8729 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6181b3fe2c11d55f46eaaf657877aa9396c16374)
2014-03-21fdo#68779: RTF import: set borders without explicit widthMichael Stahl3-1/+90
Word reportedly uses 0.75pt as a default if \brdrw is missing. Change-Id: I263c56f756c65ff6bb30870aa70806564d5826a6 (cherry picked from commit 84f4de3b65cd0f861e80c69b773004f28f9f8d9f) Reviewed-on: https://gerrit.libreoffice.org/8594 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 93f8e87dc7f488bbbfd8a748e47ce53936824391) Reviewed-on: https://gerrit.libreoffice.org/8598 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-21the type in the Any is a util::Date and not a DateTime, fdo#74549Markus Mohrhard1-3/+3
Either that was always broken or it is a recent regression that operator>>= does not convert from Date to DateTime. Change-Id: Ic948224c139ed84b3fe006385fcafd6ce16c30f1 (cherry picked from commit 22c7da0ca5438b69165609db2a1ef219aa167dc2) Reviewed-on: https://gerrit.libreoffice.org/8652 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d5580b252ad4cfea10422c044366c3c6c1ebed83) Reviewed-on: https://gerrit.libreoffice.org/8666 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2014-03-19make "rest" param in endsWithIgnoreAsciiCase default to zeroNoel Grandin1-1/+1
so it matches all of the other endsWith* methods Change-Id: If6a37056b1225675848434bfb3520e6c496f22e5 (cherry picked from commit e80b9f344aeb88bdbb42d846c0a094d86ee327dc) Reviewed-on: https://gerrit.libreoffice.org/8655 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-03-19fdo#75460: sw: fix AutoScrollMichael Stahl1-10/+5
This reverts commit 5141201fba2d080841b81e02be92f4b47aae2684. which fixed a crash but unfortunately also prevents the m_pEditWin->HandleScrollCommand from being called, thus disabling AutoScroll. Fix the crash in the ugly way by another pWData check. (regression from 8880c773e779710dc0a08760e92afd709a73ca31) Change-Id: I958f1403ad23d0c0631eca5dbbef977a9ca1210d (cherry picked from commit 6795b251e2011cae945c6bb903de8053953b5e30) Reviewed-on: https://gerrit.libreoffice.org/8596 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 6857a266c5e8037f097ed7e727671f7da543f178) Reviewed-on: https://gerrit.libreoffice.org/8622 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-18fdo#75642: Check the high position block correctly.Kohei Yoshida1-1/+3
Change-Id: I25deabf69e78c6e0354e8a528ab88891a30f9aec (cherry picked from commit c078d5fef98ba77751b7a9593691d88dfc1c9ba1) Reviewed-on: https://gerrit.libreoffice.org/8573 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/8576 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2014-03-17fdo#75872: ODF import: fix up graphics defaults stroke/fill colorsMichael Stahl6-3/+108
These have changed a few times, notably in LO 4.0 with commit 895890563cb0cc5fa872bdfd06918a46cdda172d and AOO 4.0 with commit c0eb5e7772c848806db8ab461f77f9549c1d8b2b; unfortunately historic OOo and current AOO do not write the values into ODF files, whereas LO 4.x does (probably by accident, since 45d3577bc5726eee44f491fd30a7f11dc428431a by design). Try to set the defaults depending on the generator; since the defaults are not specified by ODF they are implementation defined anyway so this should be OK. Change-Id: I1270d6e0cdeea5cb493724a0998f661a0cf644f1 (cherry picked from commit 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52) Reviewed-on: https://gerrit.libreoffice.org/8563 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 0fc0d2579f6f3e26cd8b56da730184d6933cc8fe) Reviewed-on: https://gerrit.libreoffice.org/8570 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2014-03-17fdo#75040 fix application of help's stylesheetAndras Timar1-1/+1
it was regression from 73e3aafa990168aa532fa7b81fc4de8f455b10e1 Change-Id: I059f08b12bb7847472946f3b2a669015ec437be5 (cherry picked from commit 2e3969cb8bb235fed483ce49ddee5ea731376893) Reviewed-on: https://gerrit.libreoffice.org/8609 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-03-17fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.Kohei Yoshida2-4/+4
Change-Id: I098d300532bef164bef0d40ebf62a6848bc19cb8 (cherry picked from commit ff56553e34dfed01b9226ce7a516dbeb6da32124) Reviewed-on: https://gerrit.libreoffice.org/8577 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/8578 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-03-14fdo#75110 SwEditShell::DeleteSel fix start of selection when bSelAll == trueMiklos Vajna3-2/+22
(cherry picked from commit f9b62506b22c3eb885ffd5a4ec8025c33df7b2d4) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I3e8ce585b29619061b18ab1ab8f0cf6c7d421074 Reviewed-on: https://gerrit.libreoffice.org/8559 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit fea99d32aec1c24b7cbc7a4063b21a471072509b) Reviewed-on: https://gerrit.libreoffice.org/8571 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-12bump version to 4.2.3.1.0+Christian Lohmaier1-1/+1
Change-Id: Ibe16d1d9d2374017c3ce9fff10ecfdbadf641716
2014-03-12Branch libreoffice-4-2-3Christian Lohmaier4-1/+1
This is 'libreoffice-4-2-3' - the stable branch for the 4.2.3 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: I8ecfbce345f373e1a4fe8f58ebfe321ca485414e
2014-03-12Updated coreChristian Lohmaier1-0/+0
Project: translations eab38ba5adf1d1318d19dde70264ece49b3eb26a
2014-03-12Resolves: fdo#50855 Nimbus Sans L missing stylesCaolán McNamara1-1/+6
Change-Id: Ie8cdcf4ad0ffe52024fd5cfe33073abfc6aadca8 (cherry picked from commit 1e539dbf0fe3894bbf6bf1a0851163b56e37f090) Reviewed-on: https://gerrit.libreoffice.org/8556 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12force DPIScaleFactor to 1 on MacNorbert Thiebaud1-1/+9
Conflicts: vcl/source/window/window.cxx Change-Id: I37629e1ef18f9843fcbdd643d8aaee0b3c8baa73 Reviewed-on: https://gerrit.libreoffice.org/8560 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12Related: fdo#73051 make font size drop down of optimal widthCaolán McNamara1-5/+17
presumably keithcu felt the font size was too wide, so lets try and implement the desired effect of an optimal width. Change-Id: Idc1741de04b3559fa415ebcf2289f96ba240ca8f Reviewed-on: https://gerrit.libreoffice.org/8520 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12hidpi: Sidebar, fontwork, autoformat and other improvements.Keith Curtis13-26/+109
This is a second batch of HiDPI changes. It fixes the following areas: Sidebar * Impress Master pages preview * deck title height * tab (icon) bar * valueset dropdown control * wider maximum width * Draw and other misc. buttons which didn't get fixed by earlier change to Toolbar.SetItemImage There are several more sidebar issues, but it is much improved. Other changes * Writer and Calc auto-format dialog text * file-properties document image * fontwork gallery preview size * Calc table border control Change-Id: I95a0169a3b011836b1c75b3dcacb2733c9567ef3 Reviewed-on: https://gerrit.libreoffice.org/8519 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12hidpi: Nicer painting of the waved lines.Jan Holesovsky1-7/+22
Change-Id: I8773b47967bc1aa8cf33b9a1edc4f826291d3554 Reviewed-on: https://gerrit.libreoffice.org/8518 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12hidpi: Make many places Hi-DPI aware.Jan Holesovsky21-101/+291
This also introduces a getter for the mnDPIScaleFactor variable. Change-Id: I02ba6858fb1842f911d62976f4c54afc3bfa337f Reviewed-on: https://gerrit.libreoffice.org/8517 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12Introduce DPI scale factor for Hi-DPI displays.Jan Holesovsky4-0/+12
This is supposed to stay 1 (no scale) for printers and default virtual devices, but should be set accordingly (2 or 3) for windows and virtual devices derived from windows. Various VCL widgets or paint operations should incrementally become aware of this, and changed so that they draw nicely on the Hi-DPI displays. This patch only introduces the behavior for waved lines. The default is currently being set depending on the DPI setting only; could be changed to a more clever way if necessary. Change-Id: I71118f9ab6b64028d1eeee76e860e999d5cd9d19 Reviewed-on: https://gerrit.libreoffice.org/8516 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12Let's not leak here.Kohei Yoshida1-0/+1
Change-Id: I12a50d0028164c37d06ff846bfbeff56a4591d12 (cherry picked from commit 9cfa665706cbced0fa71c43bb9425f28a0145f67) Reviewed-on: https://gerrit.libreoffice.org/8558 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-12fdo#71622 compress svg files in ODFAndras Timar1-1/+1
Change-Id: I7d3bcff12a8f24d4d63851f578f9703bfaa25278 Reviewed-on: https://gerrit.libreoffice.org/8551 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-12ignore large twips values like MSO does (cp#1000043)Luboš Luňák1-2/+5
(cherry picked from commit 10b4da63e3143108ba75891e9e98fdaa2f7953ab) Reviewed on: https://gerrit.libreoffice.org/8550 Change-Id: Ib304245b6ae64c15cfb6c999580f73e5e228c440
2014-03-12Resolves: fdo#74985 forward/back buttons too largeCaolán McNamara1-84/+107
Change-Id: Ibed2216d2ca0a6dce48c0a6ef276f4a4f4d53219 (cherry picked from commit 7d68f0fa201ce1b29f62ecbaea25890148591da7) Reviewed-on: https://gerrit.libreoffice.org/8543 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2014-03-12n#862516: Remember slides sorter view setting.Muthu Subramanian1-0/+2
Keep the number of slides per row when moving across tabs. Change-Id: I316dac87c9dc8c88149b510f93be88940d91d98c Reviewed-on: https://gerrit.libreoffice.org/8545 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-12rhbz#1075124: writerfilter: fix tables with negative left marginMichael Stahl4-14/+30
SvxBoxItem::nLeftDist is unsigned; the bugdoc sets a very large value due to wrap-around which causes the table content not to be displayed. DomainMapperTableHandler::endTableGetTableStyle() tweaks the rInfo.nLeftBorderDistance by adding half the border line width to it, which makes it positive; at that point the value has already been used to init table::TableBorderDistances, so move that downward so it gets the positive value too. Change-Id: Ied2331b93f2e95845d7e8b2cc06e89e1ab24296e (cherry picked from commit 76aa23c59b4c81ea7b9d974a1a0a9e39c6bf8741) Reviewed-on: https://gerrit.libreoffice.org/8537 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-12fdo#76030: Use the table boundaries view option to toggle border drawing.Kohei Yoshida1-12/+9
Unless I'm missing something, fixing the problem reported in fdo#75118 this way is more reliable, and certainly avoids the problem reported in fdo#76030. Change-Id: Ife524d9db12e9fa4528c2232e619bfacde367659 (cherry picked from commit 2b9e7a0cb2492f19745f61a4829ff3802b25291f) Reviewed-on: https://gerrit.libreoffice.org/8533 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-12Don't delete the kernel when pre-compiled.Kohei Yoshida1-3/+3
Because we'll be re-using that same kernel instance for subsequent runs. (cherry picked from commit 80842a50b1580b9a6da3a2c39a88a72b5b98d278) Conflicts: sc/source/core/opencl/formulagroupcl.cxx Change-Id: I08b6df65550cecfa48f937b163fb1c5b20ed8ac9 Reviewed-on: https://gerrit.libreoffice.org/8538 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-11fdo#74747: Correctly inspect formula result value for xlsx export.Kohei Yoshida1-29/+11
Change-Id: I757a8eb371b432970885e2fbd6aea9dd965ab5c0 (cherry picked from commit c1dc7576c18cc534e1934459f5fb210091a5b484) Reviewed-on: https://gerrit.libreoffice.org/8527 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-11fdo#74747: Make use of cached string formula results.Kohei Yoshida5-20/+54
Just like we do with cached numeric formula results. Change-Id: Ib8b311b540caeb47d8c2162a456f7490c5882ad5 (cherry picked from commit aa5ad7b8096cd15a55c467b1a23d03849aeb870d) Reviewed-on: https://gerrit.libreoffice.org/8526 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-11fdo#75815: Adjust external references here too.Kohei Yoshida1-0/+19
Adjusting external references are much simpler than adjusting internal ones since we don't need to worry about deleted references etc. Change-Id: I82111e383e1fc6976ef08c1438c3dd916a249af6 (cherry picked from commit dd7787ed75e33b65ebee2a6c0aa152efded6f1b8) Reviewed-on: https://gerrit.libreoffice.org/8529 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-11fix negative error bar range export, fdo#75510Markus Mohrhard1-1/+1
Change-Id: Icca2f9fc26b15b968a940e5c73f7ad3781f75e94 (cherry picked from commit 7470b3ef17570581fe590a4853de59cac1be6ea5) Reviewed-on: https://gerrit.libreoffice.org/8535 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-03-11writerfilter: initial strict DOCX supportMiklos Vajna12-7/+122
The generate-id() code is just necessary avoid duplicated elements in the for-each loop. http://mahahegde.com/xslt-distinct-values/ has a detailed description of the technique used here. (cherry picked from commit f9bf15e19ec823a58ee32bf94da81f3bb1a147bc) writerfilter: introduce ooxml::OOXMLUniversalMeasureValue In transitional DOCX, ST_UniversalMeasure is in practice a simple integer, which means twips. But in case of strict, ST_UniversalMeasure is in points in practice -- which is perfectly valid, but we didn't handle it so far. Add a separate Value class that is used only for handling ST_UniversalMeasure, then there we can handle the various additional suffixes. (cherry picked from commit d5d7c7d3b281e1a9060d60bc4ac7738ae616f167) DOCX import: handle points in ST_TwipsMeasure and ST_SignedTwipsMeasure This fixes page size and margins in case of strict DOCX. (cherry picked from commit 37cc7e7471ba3b11cefcb0218c27e2c745886a6d) DOCX strict import: fix headers Now that the document has a header, better to just test the bottom margin, as in case there is a header, the top margin has different semantics in Word and Writer. (cherry picked from commit 195b8491d0299038fb64d19463e3ce90905bf346) DOCX strict import: fix pictures as well (cherry picked from commit aaef39de32442203d631a65aecf23eeb27dfbb12) DOCX strict import: handle charts (cherry picked from commit 49c3aff8d8d3030b2acbffb6ff000b5d44445cc9) DOCX strict import: handle SmartArt (cherry picked from commit f5985685ddc519f760a7324fa60fd662f25404c1) DOCX strict import: handle lockedCanvas (cherry picked from commit d795fb224e52c66c4585ed1e079a2b7601a07eda) DOCX strict import: handle math (cherry picked from commit c98d649117dc776ac51807be3376924d1fce2035) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I647efe9d4a0834d3756fe9fa6d706ba6ba4e00f1 Reviewed-on: https://gerrit.libreoffice.org/8532 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-03-11handle OOXML strict namespacesMarkus Mohrhard30-54/+348
Change-Id: I198862388426161e3f054a5f128639c59f3c9d24 support OOXML strict documents in Calc Conflicts: oox/source/core/relations.cxx Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d import date cells from OOXML Change-Id: Id0b9ec034d559d489ca4ee2d1d6aca1bdf1beb9d no need to add another layer of macros Change-Id: I49992559a7d10127d55dbf0c7e257c86619fd8d6 fix one more relation type for OOXML strict Change-Id: Ia63309271ac225883540ca0453fc5da21844d3ad make more places aware of OOXML strict relations Change-Id: I292217537eb592cbad9af11f87402baa9f4cc442 fix strict namespace list generation The two perl scripts were apparently only generating the same order by luck. It did not work on all systems. Change-Id: Ib83ee5c6572d3bae2e2ac1846850bd65303e7d43 allow OOXML strict relationships in writer Conflicts: writerfilter/source/ooxml/OOXMLDocumentImpl.cxx writerfilter/source/ooxml/OOXMLStreamImpl.cxx Change-Id: I1c09280f68467748faedee19c4a66be3bc7d7aa3 make sure the two namespace lists are sorted the same way Change-Id: I90b3182e10dbbfc8993010dd885509537d2fe537 fix OOXML strict chart import Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f add the xml strict namespaces to misc/namespaces.txt Change-Id: Ie83b5c94f1f002851bff3b39b1d9b676a3e44aa1 Reviewed-on: https://gerrit.libreoffice.org/8515 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-11coverity#708535 Uninitialized scalar fieldCaolán McNamara1-0/+1
Change-Id: Ife2acd5dd5193edd0ca34d85370885ee6865fadd (cherry picked from commit ecc6239f5b7decfc61b68e745175982fdeee931e) Reviewed-on: https://gerrit.libreoffice.org/8512 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-03-11fix odf validation errors around new chart regression curvesMarkus Mohrhard1-8/+19
Change-Id: If67207abb204b5aca8365737088437b12ac6eaf1 Reviewed-on: https://gerrit.libreoffice.org/8523 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>