summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-10Integrate branch of IAccessible2Steve Yin
Change-Id: I95b681a7aa171c321a876e6a38392e30583d7a5b
2014-06-10Integrate branch of IAccessible2Steve Yin
(cherry picked from commit e2f90c93c97f3cf137c348ed302c6470f398aa70) Change-Id: I44ce0d69f3e7364038b00b1ba0f0d27e60132a37 WaE: Prevent uninitialized variable warnings. (cherry picked from commit b989f4074ea70729d527b307bfbe49e01a0d3646)
2014-06-10Integrate branch of IAccessible2Steve Yin
Change-Id: I3b5936bb92bb258f9e9e76402dd2b55f29aa686a
2014-06-10Integrate branch of IAccessible2Steve Yin
Change-Id: I8c2fea0367ebfa53ce5e109ef48fd661cbfb78b3
2014-06-10fdo#79676: Fix the Java UNO API test with regard to chart tests.Kohei Yoshida
The Java tests rely on the "undocumented" behavior that, when loading an empty chart document, the chart automaticallly created a "default chart" which is a column chart with many of its properties filled. Unfortunately this behavior caused ugly side effects when loading documents with charts via flat ODF filter. I believe fixing the test this way is the right fix. Change-Id: If3e6c8979da9d0731346ebeedc23c0d3363e83fd (cherry picked from commit d44b58beed743871df03909e7d9545e488f3d7c8)
2014-06-10fdo#79676: Initialize with a default chart only from the UI.Kohei Yoshida
When creating an embedded chart object during import, we don't want to create a default chart which would only mess up the chart data. With this change, ChartModel::initNew() is a no-op. (cherry picked from commit c5539bb585370f095cb6c09e38a7dd005d237295) Conflicts: chart2/source/model/main/ChartModel_Persistence.cxx sc/source/ui/drawfunc/fuins2.cxx sw/source/uibase/table/tablemgr.cxx Change-Id: Id29659c3885ec1e06bed26d2c851123fb63072cc
2014-06-06Add --enable-macosx-package-signingTor Lillqvist
Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99
2014-06-06bnc#880763: PPTX import: wrong z-order becuause of wrong import orderZolnai Tamás
importExtDrawings() must be called as soon as possible, before parser starts to parse the next shape. Call it when graphicFrame tag is closed. This tag include the reference to the SmartArt. Plus fix up import tests. (cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48) Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae
2014-06-06PackageMaker does not exist any moreTor Lillqvist
Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401
2014-06-06Don't bother mentioning the Tru64 'setld' package formatTor Lillqvist
Change-Id: I2a9707c70637fe5bae5d16fd45e9603318d5d82f
2014-06-06Don't bother mentioning the IRIX 'inst' and 'tardist' package formatsTor Lillqvist
Change-Id: I11c2f7fa72a1bc8a2c621ed928dc33a8410f1eee
2014-06-06Use MACOSX_APP_NAME instead of the build-time app bundle nameTor Lillqvist
Change-Id: I447cf96778e56cbc89c7aa7eb066df0bc52b1755
2014-06-06c++03 vs c++11 enum namespacingCaolán McNamara
Change-Id: I91be0e7d2b013221b1d47a5cd1e4e75eb16c2b67 (cherry picked from commit e990e4d145f16c0c7e4e9e12c4882ddde63a3d5a)
2014-06-06Use MACOSX_APP_NAMETor Lillqvist
Change-Id: Id46f2f83ca01a786b93ecce4aa41dea41c45e718
2014-06-06Add --with-macosx-app-name configure option that propagates to MACOSX_APP_NAMETor Lillqvist
Change-Id: I5997669d9e990c302871e08a336a4d8365d5aa13
2014-06-062nd part of bnc#870233: import font color from color fragment for SmartArtsZolnai Tamás
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) Conflicts: oox/source/drawingml/diagram/diagram.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8
2014-06-061st part of bnc#870233: wrong list style in shapesZolnai Tamás
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) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Iee7a6c0c1f74322fd7b80e41a262849f948e463a
2014-06-06Revert "test-install doesn't work for OS X and seems unnecessary anyway"Tor Lillqvist
After I reverted the misguided Collabora branding hardcoding it does work. This reverts commit faccaa6fd80480d5fcfe25582951a1f97f2a536d.
2014-06-05fdo#76140: Reimplement XIRR OpenCL test.Kohei Yoshida
1) Use ods format and store the expected formula results as numeric cells, to avoid having to load the same file twice (which is slower). 2) Use rtl::math::approxEqual to evaluate two numbers that may be subject to numerical instability especially when the expected values are very small. Change-Id: Ie08e91f797065f4593f996df3541da84019cc53c (cherry picked from commit ca25cdcb398f200ce5d53286eea02d49d8d1c5f4)
2014-06-05Revert "Collabora branding"Tor Lillqvist
Nah, this breaks a --with-package-format=dmg build. Will have to think harder. This reverts commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7. Change-Id: I6b0e1c9a460acfe0304e9bafa5f2114e177bbe50
2014-06-05Revert "This one, too"Tor Lillqvist
Nah, this breaks a --with-package-format=dmg build. Will have to think harder. This reverts commit e20640b9592c873169d25869076982a4d5628116.
2014-06-05This one, tooTor Lillqvist
Change-Id: Ic2c724f39bd71ab181b33532d1ed2f0bcf8f82bd
2014-06-05LibreOffice from Collabora OS XAndras Timar
CPOSX.conf: --with-package-format=dmg CPOSX.conf: re-add 'el' CPOSX.conf: re-add 'sr-Latn' and myspell dicts Multilingual Mac OS X DMG for Collabora Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2
2014-06-04Collabora brandingTor Lillqvist
Change-Id: I6044c9aeba8b7f3a58b0465b2944275bb5aee6bb
2014-06-04Turn eventual spaces in the app bundle name into dashes in its codesigning idTor Lillqvist
Change-Id: Ibf643da61ce7fffb9bc8e704914afb5985be8f6a
2014-06-04unopkg is not signed either, for some reasonTor Lillqvist
Change-Id: I820214f4c248b4f3483a72998ead75aaa1e280ed
2014-06-04test-install doesn't work for OS X and seems unnecessary anywayTor Lillqvist
Change-Id: If0623589ae064f7a038f3761ab7b50528ac521d6
2014-06-02Bump version to 4.2-5cp-4.2-5Andras Timar
Change-Id: Id06410adcb9e0b7d7b4728561a0abfacceca4fa7
2014-06-02fix bad cast in SvxStyleBox_Impl::StateChanged()Michael Stahl
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>
2014-06-02don't limit the 0 → 1 replacement in release to debChristian Lohmaier
since there are rpm-frontends that do their own version comparison that is different from rpm itself. Change-Id: Iddf38c14e7f48eec5d043de57e3404fcd9da24f7 (cherry picked from commit 3d67e273cf8b210f2f80908dfa4f50be6acbcf5c)
2014-06-02fdo#70596 dependency problem with debian packages for master/dev buildsChristian Lohmaier
debian packages don't cope with release number of 0, so use release 1 for debian master/dev-packages Change-Id: Id91926322d13bddad3a39faccfee4e131d8956b0 (cherry picked from commit a95d12b547e2635e10aa074fe42f12a0ea151163)
2014-06-02don't add the changes toolbar to the forms window, fdo#76752Markus Mohrhard
Change-Id: I1a5d62b0995343a73fd8d6941f0fa380bb19e783 Reviewed-on: https://gerrit.libreoffice.org/9605 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2014-06-02resolved fdo#70455 B1:SOMENAME is not a valid singleton referenceEike Rathke
(cherry picked from commit ac8532ce26e79453b3a969b956ebb7823c455131) Conflicts: sc/source/core/tool/address.cxx Change-Id: Iac80d74a9ec6382a232fdc2f4b798e57dc643ad3 Reviewed-on: https://gerrit.libreoffice.org/9515 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-06-02fdo#79174: Use 3D address when the input and output are on different sheets.Kohei Yoshida
Also some cleanup, mostly to avoid storing separate address convention object, which is not really necessary. (cherry picked from commit 0ab538885d818a7b3706df48a625e2523a8ebbdf) Conflicts: sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx sc/source/ui/StatisticsDialogs/FTestDialog.cxx sc/source/ui/StatisticsDialogs/TTestDialog.cxx sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx sc/source/ui/inc/TableFillingAndNavigationTools.hxx Change-Id: Id3e104043f08b6786de2e91d69361557b83890f9 Reviewed-on: https://gerrit.libreoffice.org/9578 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-06-02Access2Base : bugs fixings in LO 4.3 retrofitted to 4.2Jean-Pierre Ledure
1. Typo in OpenForm 2. Find(Record/Next) error when search done in gridcontrol of subform Change-Id: I914c3da021a47ef0410e3b6be038e8e2bad8fa81 Reviewed-on: https://gerrit.libreoffice.org/9598 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2014-06-02fdo#73352 firebird don't claim to support interfaces one doesn'tLionel Elie Mamane
and then throw an exception when the interface is used Change-Id: Id5e2c852323d49f51ab55cf46ab54223cf8ccf03 Reviewed-on: https://gerrit.libreoffice.org/9596 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02fdo#64956: editeng: fix RTF color table exportMichael Stahl
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>
2014-06-02discard more header/footer stuff when discarding headers/footers (bnc#875718)Luboš Luňák
782adba4d436c65cdf85d48f28486321873b15ed discards unneeded headers/footers, but only the text, not e.g. frames or fields. The test document therefore ends up with a frame with a page number inside the body text, because the text in the footer it should be anchored to was discarded. This commit fixes this by discarding more (although probably the whole header/footer shouldn't even be parsed to begin with). The test from b349d2483e1fe64316d87b55d0b3b4c8f2293e2e actually checked for this incorrect frame, so change that (the whole test is suspicious, as the end result is quite far away from what the original doc looks like). (cherry picked from commit 5510f563502168defa4ccfc54214d781a7c92868) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I2e7192e00237db1f030d0524c5667fe92c9e496b
2014-06-02do not replace a General format with a General formatEike Rathke
Found when investigating fdo#79228 which was caused by the ScPatternAttr change due to the number format being applied. Change-Id: Ieada557f5e194401a9ce255f26d71d36e0704f35 (cherry picked from commit f68eed1518fe689fe8a535bebc8d2b6c9f257b9c) Reviewed-on: https://gerrit.libreoffice.org/9511 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2014-06-02Resolves: fdo#79392 don't access after last row, when last row is max last rowCaolán McNamara
Change-Id: I06749af90bed6a43f3fb6b3b5ceb61d5fbbc7c02 (cherry picked from commit a35d92197d850527bd294eb6197b5bf83109d5be) Reviewed-on: https://gerrit.libreoffice.org/9546 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-06-02Resolves: fdo#71616 Elements dock: Better display of scalable bracesThomas Arnhold
Change-Id: I2255be738aa2230b4102030891026f1f9ad2c38f Reviewed-on: https://gerrit.libreoffice.org/9525 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02fdo#79372 fix hyphenation (remove fdo#56392 fix, except hard hyphen part)László Németh
Change-Id: Ia2f482fb7737e61cfc42966dbc7af6e1cdb3b41d Reviewed-on: https://gerrit.libreoffice.org/9544 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02fdo#78801 fdo#52547 Paste preference is image, then html, then text.Andrzej Hunt
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/9533 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02fdo#78737: sw: fix setting tab stops via rulerMichael Stahl
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>
2014-06-02Related fdo#71616: Set correct BaseSizeThomas Arnhold
BaseSize has to be set in 100th mm, otherwise the scalable brackets are far too thin. See starmath/source/cfgitem.cxx: pFormat->SetBaseSize( Size(0, SmPtsTo100th_mm( nTmp16 )) ); nTmp16 is 12pt -> 422 100th mm (at least for me). Let's reuse that. Change-Id: I69571ae002f790199ab423955b1635eda42096eb Reviewed-on: https://gerrit.libreoffice.org/9524 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-02Resolves: fdo#79275 File Properties dialog’s layout is subparCaolán McNamara
Change-Id: I594d93c0630528841a1f243e6b6e9eda67b6138d (cherry picked from commit 9b47595a34c0b687cc02290b0a9cbf8508407082) Reviewed-on: https://gerrit.libreoffice.org/9507 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-02Resolves: fdo#77831 use classic token rules for user-defined char (%foo)Caolán McNamara
Change-Id: Iebae064986ad722d445c8d654e39e338e104f021 (cherry picked from commit 501e5b98ad39156cac465a161709ad38b89e3d63) Reviewed-on: https://gerrit.libreoffice.org/9497 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-02coverity#1078626 Missing break in switchCaolán McNamara
Change-Id: I4b9b846049d9802a319b403e1f45734b7bd604f2 (cherry picked from commit 4e3e1420af51f7776dceb6b2800b761e57ddfe63) Reviewed-on: https://gerrit.libreoffice.org/9529 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2014-06-02fdo#67935 "print on group change" acted as "print in first group instance"Lionel Elie Mamane
The "parent" group changed iff this is the first iteration of *this* group *or* *detail* *section*. The "parent" group's first iteration means that we are in the first value of the parent group (in other words, the *grand*-*parent* group changed). Change-Id: Ia4a798cb37db2f17e7deef1058b25795bfc02648 Reviewed-on: https://gerrit.libreoffice.org/9498 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02fdo#67937 "print on group change" defaults to TRUELionel Elie Mamane
Thus it needs to be saved when it is *false*. Change-Id: I01bae547afe71ede12fb852c1a9040b7e45bf7b9 Reviewed-on: https://gerrit.libreoffice.org/9499 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>