summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-25Version 4.3.0.4, tag libreoffice-4.3.0.4libreoffice-4.3.0.4Christian Lohmaier3-0/+0
Change-Id: Ia54182b4f14916550bff82d28281f2bcf2e805cb
2014-07-25bump product version to 4.3.0.4Christian Lohmaier1-1/+1
Change-Id: I111cf2d8113ce193a462bf2f30ffe9694ec5c642
2014-07-25fdo#80363 add _wfullpath to expand ".." in dictionary pathsLászló Németh3-8/+22
Change-Id: I6c9edd0b4d2c63f7735d090e5d2d72d5fb81b921 Reviewed-on: https://gerrit.libreoffice.org/10400 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 7efd83bb29ef8be8c78c4da5452fe3293ed15ea4) Reviewed-on: https://gerrit.libreoffice.org/10405 (cherry picked from commit 24e9950f68ca57c454dbb35cf8562d82e76a42e7) combined with fdo#80363 _wfullpath in MyThes and Hyphen (cherry picked from commit 0ad283adb51b3a1bb777e6341e61541d4bffaa44)
2014-07-16Version 4.3.0.3, tag libreoffice-4.3.0.3-buildfix1libreoffice-4.3.0.3-buildfix1Christian Lohmaier3-0/+0
Change-Id: I8fc187e59c3bfdb3927741d4f76a365bf02a3592
2014-07-16Version 4.3.0.3, tag libreoffice-4.3.0.3libreoffice-4.3.0.3Christian Lohmaier3-0/+0
Change-Id: Ib4bb29753218bb3b49d233a339c1a8374aafb41f
2014-07-16bump product version to 4.3.0.3Christian Lohmaier1-1/+1
Change-Id: I8aa381a1e1386830336ae348ff6651a414b9a036
2014-07-15Related: #i125226# expect DDE servers to be already upHerbert Dürr1-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 Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790 (cherry picked from commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759) Reviewed-on: https://gerrit.libreoffice.org/10287 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-07-15fdo#80363 always use WIN32 long path prefix with Hunspell, MyThes, HyphenLászló Németh5-5/+26
Change-Id: I738401babffd38c241ef16e23d1b246444fd8d55 Reviewed-on: https://gerrit.libreoffice.org/10333 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-07-16update creditsChristian Lohmaier1-4055/+5043
Change-Id: I11a52ecdd25cb70713e0ad7347bb56cdbec45332
2014-07-15Updated coreChristian Lohmaier1-0/+0
Project: translations a537ab6fd91e8259f4b36349a18a514039c926d6
2014-07-15fdo#81302: Revert "sw: adapt object/picturedialog.ui to FillAttributes"Michael Stahl2-34/+6
This reverts commit 270fabec85f37b513d29e74cb66b38d5eae7cf80. Required by commit dc17dad5fd7509f191718df8690e5847ab87669a, which reverted the FillAttributes. Change-Id: I525636d1e99b9fd639ad52aa69380a9896c7752b (cherry picked from commit f899e508c35b6170bc11fc2eb4a74ec58d895625) Reviewed-on: https://gerrit.libreoffice.org/10339 Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-07-15Optimize media rendering during slideshow: save one grabFrame() callZolnai Tamás1-5/+3
'FallbackGraphic' property introduced in: b862a216f769d10e726ad759762b5e6a412acdaf contains the previously called grabFrame's result, so we can use that instead of render the media frame again (it affects glTF models too). In case of huge glTF models it can avoid run out of memory problem. (cherry picked from commit 358d6006f1d9652aaf01661ea8dba4d7ec46d508) Change-Id: Ia93e771e92cc7630480c665dea66fbf571dfa2a0 Reviewed-on: https://gerrit.libreoffice.org/10338 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-07-15fdo#80462: Don't always increment the start row position.Kohei Yoshida1-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/10259 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit ee5895488c43954b25b26076ec9241e7c741cffd) Reviewed-on: https://gerrit.libreoffice.org/10273 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-15resolved fdo#79441 keep 3D references intact during sortEike Rathke3-4/+5
Change-Id: I9e96d8e7cb99a3c280dd24495eefb9efd6d10888 (cherry picked from commit e463de2a56453a0d2cb0b5b58e96f7639f37cdd1) Reviewed-on: https://gerrit.libreoffice.org/10239 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-15fdo#81148: Fix transparency gradients.Matúš Kukan1-1/+1
regression from a5351434fbea1126961f5dbaa986e7c9e686c24e. Revert one line from that commit without too much understanding :-/ Change-Id: I126c25e2ad945ef1ec20a5677406434931d0790d (cherry picked from commit 4cb52136220b417f09eb2156e11436ee0a06729f) Reviewed-on: https://gerrit.libreoffice.org/10236 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7707f1cf74115e659794ffe6214529c24aee0340) Reviewed-on: https://gerrit.libreoffice.org/10270 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-15fdo#80054 change color for NPC to "solarized blue"Tomaž Vajngerl1-1/+1
Change-Id: I4ee3d2422982d37be3638b9647096e0b38314d56 Reviewed-on: https://gerrit.libreoffice.org/10327 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/10340 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-15remove the OpenGLWindow from chartsMarkus Mohrhard2-3/+4
It is not necessary after disabling the 3D OpenGL charts. Change-Id: I40fd398f2bcc5fc0d774e116ea243572cc36844d Reviewed-on: https://gerrit.libreoffice.org/10325 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2014-07-15fdo#79673 revert to old NPC for MacOSX onlyTomaž Vajngerl5-2/+63
Change-Id: I83cfa2f11e76e03b919216e8dd04d1121ea6afd8 Reviewed-on: https://gerrit.libreoffice.org/10316 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-07-15fdo#80020 Fix regression for style sheet inheritanceTobias Lippert1-1/+1
The inheritance relationship of styles in Draw was lost when writing files. Change-Id: I81588a031bf4c649338fad9b7342fbbe11df9aef Reviewed-on: https://gerrit.libreoffice.org/10309 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 61cf536f0400284a5ff85d1a84c9dee72ead3fbf) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 980b3fc921b6c22634ea63cd7aa264b520da0ce4) Reviewed-on: https://gerrit.libreoffice.org/10319 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-07-15Resolves: fdo#52226 swap in graphics on .docx and .rtf exportCaolán McNamara3-11/+37
Change-Id: Ie818b382c0b17760c720ff2f2c73a3697989f97e (cherry picked from commit 9dd5caac62083f7162d83319284df68ee83e3777) Reviewed-on: https://gerrit.libreoffice.org/10282 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com> Tested-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
2014-07-15fdo#81004 this looks like a mis-merge to meDavid Tardon1-8/+0
Change-Id: I2d30774a8a89002b6c2d8487bfce15eb13c82e0d (cherry picked from commit 8817e5e3a0d92a4febae955ced7a35c52cb08910) Reviewed-on: https://gerrit.libreoffice.org/10170 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 90939f2b5dfc8a7aafc255322f0fcb66f670241e) Reviewed-on: https://gerrit.libreoffice.org/10271 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-15resolved fdo#77018 keep external references intact during sortEike Rathke1-0/+17
Needs e463de2a56453a0d2cb0b5b58e96f7639f37cdd1 fix for fdo#79441 to work. Change-Id: Ide1cbeb4b25b17b5102977ccbdf8e6dbfcadfc60 (cherry picked from commit db0a4c2575ffba1c170d74882b0f5a6229ec072f) Reviewed-on: https://gerrit.libreoffice.org/10244 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-14Update libgltf: various fixes, memory usage optimization (second try)Zolnai Tamás19-501/+3
Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com> (cherry picked from commit 11b328103f9184b98a822577aaac18d1cdbc5868) Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 Reviewed-on: https://gerrit.libreoffice.org/10293 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-07-14glTF: More rendering related error handlingZolnai Tamás2-2/+12
If any error occurs related to glTF rendering, a question mark is displayed at the place of the OpenGL window (Question mark is a general concept of media objects). Change-Id: Id7df5a47a4dd6832e640b3a7cb3c7712ebfb4408 (cherry picked from commit 58fd5a6dd6d5d599df88c9fd4ed5257577562bd9) Reviewed-on: https://gerrit.libreoffice.org/10276 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-14fdo#80333: .doc has large black rectangles between paragraphsZolnai Tamás3-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) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: Ib3cb4e904fdd33f215c81d7c02762a196f484b1b Reviewed-on: https://gerrit.libreoffice.org/10268 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>
2014-07-14disable 3D OpenGL chartMarkus Mohrhard1-1/+1
feature is not ready for the release Change-Id: Ibca7d1db4f8eb4e7130e2b05fb86706135a41b1c Reviewed-on: https://gerrit.libreoffice.org/10280 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-14glTF: crash after starting a model without an OpenGL windowZolnai Tamás1-0/+3
Change-Id: I726f4d62ab062fbd41376183f60c26d8e6cfe33e (cherry picked from commit 6174152cfffd8e31b9eda238990a161c8c2b9a71) Reviewed-on: https://gerrit.libreoffice.org/10220 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-14glTF: Removing one model breaks an other modelZolnai Tamás1-0/+1
Reproduce: - Insert two models - Play first model - Delete second model Result: crash (windows) or first model disappear from the opengl window (linux). Change-Id: I940960754f42a2e4faf5b9f37c0d4a3c155e4650 (cherry picked from commit 30fcee6ce56ec4e50ee86c308ca5621746d817d5) Reviewed-on: https://gerrit.libreoffice.org/10219 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-14Introduce osl_areCommandArgsSet.Andrzej Hunt4-0/+17
We cannot call osl_setCommandArgs twice, however there is currently no way to determine whether or not this has already been done. This is necessary e.g. for LibreOfficeKit where we may also be using UNO separately (and also for unit tests where LO is already set-up prior to the unit test running, and therefore we can't set up osl again from within LOK). Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/10225 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-14resolved fdo#80195 act on implicitly propagated error, if anyEike Rathke1-0/+5
Change-Id: I1d5a55a14fc3e25edc2cddec5b53ed2afa96bd3e (cherry picked from commit 1093b900b43d819c9a730ef6435fed0f3687a085) Reviewed-on: https://gerrit.libreoffice.org/10195 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-13sw: do more input validation in SwWW8ImplReader::Read_AndMichael Stahl1-1/+3
(to fix up f2945255df273404ee2457dcf761cb8f334b732b) Change-Id: Ie20fb9db4515b9737322ec7224ecd7e411d31c03 (cherry picked from commit ae2e7ad276acb9394691a9d4a702ed7a6b07b508) Reviewed-on: https://gerrit.libreoffice.org/10137 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f61ea10dde1b7e3173a96d40c2725e76765cfbc4) Reviewed-on: https://gerrit.libreoffice.org/10230 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-07-11Updated coreAndras Timar1-0/+0
Project: translations c89c33a215f26d0e4e03f75268ef07a31e166f01
2014-07-11Related: #i125226# don't try to access known-bad DDE serversHerbert Dürr1-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/10201 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>
2014-07-11fdo#75937 - package galaxy theme in a form we like; cf. fdo#81103.Michael Meeks1-1/+1
Change-Id: If920257f141a2dc4208d1fd322b875fdc8315cee Reviewed-on: https://gerrit.libreoffice.org/10172 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-11Fix ignoring large twips values like MSO does (cp#1000087)Matúš Kukan1-5/+5
which was introduced in 10b4da63e3143108ba75891e9e98fdaa2f7953ab. Since 1e47614cdb84b018a22a334dad0cdd9f0f53892c, only convertTwipToMM100Unsigned() ignores large values, which presumably was not the intention. At least commit message suggests so. So, move the check back to convertTwipToMM100(). Change-Id: I17040f1987e24789b9de39a837d9f7ecaed520fb (cherry picked from commit 4d1621136c464b462a598571ecdcfe2ae119d8c7) Reviewed-on: https://gerrit.libreoffice.org/10177 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6d21e5425690732a3254722add7023ace4d3c537) Reviewed-on: https://gerrit.libreoffice.org/10215 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-11fdo#79358: ODF export: fix index boolean property exportMichael Stahl3-1/+23
Due to inverted conditional, only the default values were exported, not the non-default ones... (regression from 8a81f542a6ca566661305c53899b7e422cbaa432) Change-Id: I0b1fc828230695709db49e1643801842d947403c (cherry picked from commit d18308cf3b25ee30815bcaae73d49b5f5b8e734e) Reviewed-on: https://gerrit.libreoffice.org/10194 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit eb1ffce113e9110f87de25891f82b0a5752bd59c) Reviewed-on: https://gerrit.libreoffice.org/10197 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-10we need to make sure the context is currentMarkus Mohrhard1-0/+1
Change-Id: Ia3d9df493899949f8de096f1cb0a3b63bffac0eb Reviewed-on: https://gerrit.libreoffice.org/10184 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 606af1462d81ac5188e0a6a3a1c270a327a68fd4) Reviewed-on: https://gerrit.libreoffice.org/10188 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2014-07-10fdo#78908 Revert "Merge back branch alg_writerframes to trunk"Miklos Vajna125-4849/+1327
This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not to have this on libreoffice-4-3 without 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of DrawingLayer FillAttributes..., 2014-06-02). Conflicts: cui/source/inc/backgrnd.hxx cui/source/inc/cuitabarea.hxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/tparea.cxx include/basegfx/numeric/ftools.hxx include/svx/svxids.hrc include/svx/unoshprp.hxx sc/source/ui/drawfunc/drawsh.cxx sd/source/ui/func/fuarea.cxx sfx2/source/dialog/tabdlg.cxx sw/inc/fillattributes.hxx sw/inc/format.hxx sw/inc/frmatr.hxx sw/inc/swatrset.hxx sw/inc/unobrushitemhelper.hxx sw/qa/extras/rtfexport/rtfexport.cxx sw/source/core/attr/format.cxx sw/source/core/attr/swatrset.cxx sw/source/core/doc/docfly.cxx sw/source/core/doc/notxtfrm.cxx sw/source/core/inc/frame.hxx sw/source/core/inc/frmtool.hxx sw/source/core/layout/fillattributes.cxx sw/source/core/layout/paintfrm.cxx sw/source/core/txtnode/fntcache.cxx sw/source/core/uibase/shells/frmsh.cxx sw/source/core/unocore/unobrushitemhelper.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unostyle.cxx xmloff/source/text/txtexppr.cxx xmloff/source/text/txtprhdl.cxx Also: Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types" This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93. Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'" This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3. Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..." This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c. Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID" This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90. Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32" This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b. Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property" This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea. Revert "SwXTextFrame: restore semi-lost BackColor property" This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60. Revert "DocxAttributeOutput: port to FillAttributes" This reverts commit ec221b7339f8fe5520926ef85b450daa94392780. Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones" This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14. Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public" This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d. Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color" This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06. Revert "sw: still use SvxBrushItem for page style background" This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505. Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl" This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6. Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl" This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21. Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl" This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3. Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()" This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4. Revert "svx: fix Writer's insert -> frame crash" This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3. Revert "sw: adapt frame/templatedialog4.ui to FillAttributes" This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc. Revert "-Werror,-Wunused-variable" This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97. Revert "loplugin:implicitboolconversion,literaltoboolconversion" This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76. Revert "loplugin:saloverride" This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5. Revert "loplugin:literaltoboolconversion" This reverts commit 355b31fe347479f63906e41300042ec5cb38837c. Revert "-Werror,-Wunused-private-field" This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1. Revert "-Werror,-Wunused-const-variable" This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46. Revert "unused XFillStyleItem ctor" This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38. Revert "unused XGradient::VclGradient" This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d. Revert "fix "transparency" of floating tables in docx import (fdo#77723)" This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e. Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6 Reviewed-on: https://gerrit.libreoffice.org/10077 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit dc17dad5fd7509f191718df8690e5847ab87669a) Reviewed-on: https://gerrit.libreoffice.org/10086 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-07-10fix fdo#77844: header wrongly enabled from .docLuke Deller3-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> (cherry picked from commit 025a9cf3a8ceba61d8424d7dcb029ab9607a0d73) Reviewed-on: https://gerrit.libreoffice.org/10168 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-10fdo#80555: Set position of GraphicObjectShape objects correctlyJacobo Aragunde Pérez3-1/+11
Added a unit test for this issue. (cherry picked from commit 816542b2bdd23423625ad4c2f0e706d5558b8ba9) (cherry picked from commit c38be106ff1c1ff5e1b279e4ea2c710b524d23f1) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I13656f82c97e5bb8458cdc1cb47ddcc5f6d60330 Reviewed-on: https://gerrit.libreoffice.org/10060 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-10don't forget glewInitMarkus Mohrhard2-0/+5
Change-Id: Ifc1c995f50fe34dbb072345aab37190d3a57e074 Reviewed-on: https://gerrit.libreoffice.org/10094 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit b1d4fbb69491bcf211fb4c8cb5c2dd4d9efb4edb) Reviewed-on: https://gerrit.libreoffice.org/10185 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-07-10glTF: constraine camera move in orbit modeZolnai Tamás2-0/+20
Not to get too close to / too far from the model. Too close means move into the model. Change-Id: Ie25d87c88093d4baaf98f13ab8239263b5e1bf66 (cherry picked from commit 9a670eb493f3760eb398c3f9d2296d979b608f95) glTF: improve camera movement constraint Stop moving only on the wrong direction. Change-Id: Ic9e7f2e7814d9adcbcf707e7fb786bf17fac3125 (cherry picked from commit 09fe9db46615265c6c7119f2524d19335d0e0283) glTF: camera movement constraint: use distance from the boundary box ... instead of distance from model center position. Change-Id: I379ab5e32cc5009d0eb751c4808fecf0109d1e5a (cherry picked from commit 2946c7c62718cb74feab554b5939ec340e6c4280) Reviewed-on: https://gerrit.libreoffice.org/10084 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-07-09resolved fdo#62250 absent value cell values are not NaN, set to 0.0Eike Rathke1-0/+6
Change-Id: I41459d72adbaa8f6c0c7c22447f6eba5eb8be3e1 (cherry picked from commit fea6f83df8d2183b108695217bc4ff7a93e942c9) Reviewed-on: https://gerrit.libreoffice.org/10175 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-07-08fix crash loading ooo100546-1.xlsCaolán McNamara2-6/+7
regressions around inserted extra enum values into ShapePropertyId (cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d) Conflicts: oox/source/drawingml/chart/objectformatter.cxx Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3 Reviewed-on: https://gerrit.libreoffice.org/10108 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com> (cherry picked from commit 9afdc6c3b4eb077b3e4279c5eec1e3dd9a4a8512) Reviewed-on: https://gerrit.libreoffice.org/10111 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-08fix crash loading ooo#93570-3.docCaolán McNamara1-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/10099 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2aa92af90a50896aa4f5d2a2287eb5db12e6c621) Reviewed-on: https://gerrit.libreoffice.org/10110 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-07svx: the openglprimitive2d.hxx has been removedMichael Stahl2-2/+0
Change-Id: Icfb4772fd13db381739e178b70886139705aca84 Reviewed-on: https://gerrit.libreoffice.org/10091 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-07Make OpenGL 2D rendering working again.Markus Mohrhard25-245/+29
Change-Id: I29101aee77ac37f5a8e1b929793d7554bc425b26 Reviewed-on: https://gerrit.libreoffice.org/10075 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit d72d80aa8393c9416423602779cb63b22141033a) Reviewed-on: https://gerrit.libreoffice.org/10089 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-07-07fdo#39944: Fix mapping for some a11y roles to ATKJacobo Aragunde Pérez1-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/10067 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-07fdo#80535 add missing .ui localizations to install scriptAndras Timar2-0/+8
(cherry picked from commit e09931ce4d413929b9cbdbbf1f71ac5941ec25ba) (cherry picked from commit 1f90cae1debed4b45bb51ced21a03aacd7973cff) (cherry picked from commit e52b3a2be08b8811f76e1f2bbb1e2438dcfbb3b3) Change-Id: I5dc2b353b7b44b0b3e89e17f9e48b56d997352db Reviewed-on: https://gerrit.libreoffice.org/10070 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-04fdo#77057 quick fix: do not touch KindMap for alien file typesAndras Timar1-4/+0
Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1 (cherry picked from commit 57bf88d21cacb025e7bea40da78616bb4d165215) Reviewed-on: https://gerrit.libreoffice.org/10055 Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>