summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-23bump product version to 4.3.3.2.0+libreoffice-4-3-3Christian Lohmaier1-1/+1
Change-Id: Iac79707e5b2fb68a2214918e8d9e9b034872442d
2014-10-23Resolves: fdo#83588 Revert "center slide after changing zoom"Caolán McNamara3-29/+0
This reverts commit b179235f702e474b115ca479b603052f422346fd. (cherry picked from commit d1e9aa23a7b74e153479e0e23aac1c02cca48177) Change-Id: Ifb9444e77a28ac17e4dcc17725a4393ea0aa294e Reviewed-on: https://gerrit.libreoffice.org/12065 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-10-23Updated coreChristian Lohmaier1-0/+0
Project: translations 8c7d35d68b5c2c86fd27425d4722ccae9996583b
2014-10-15Resolves: fdo#85032 max len property of -1 -> crashCaolán McNamara1-1/+1
Change-Id: Ief903c619204f01784e93fd5e2d582632cef032e (cherry picked from commit e45136f1ff9d817dfec27a6a20ba29fffc6c54bf) Reviewed-on: https://gerrit.libreoffice.org/11987 Reviewed-by: Matthew Francis <mjay.francis@gmail.com> Tested-by: Matthew Francis <mjay.francis@gmail.com> Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-10-15Resolves: fdo#84809 crash when button is too short for textCaolán McNamara1-1/+1
regression from 4c539fac018dfd44cd8db52161a8cb930c627da7 commit 4c539fac018dfd44cd8db52161a8cb930c627da7 Date: Tue Dec 17 05:18:35 2013 -0600 vcl get rid of xub_StrLen and STRING_LEN in outdev3 before this there was a dubious cast which hid the problem Change-Id: I7c01c0f0ac211196a62acaf02297f29ae829403d (cherry picked from commit 3144b8deaf8397d719b7ad7a56b309655a53d90a) Reviewed-on: https://gerrit.libreoffice.org/11871 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b3e96abc32623891a7147c9f8fa6477ffcddd643) Reviewed-on: https://gerrit.libreoffice.org/11943 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-11bump nss from 3.15.3 to 3.16.5Caolán McNamara7-172/+195
Reviewed-on: https://gerrit.libreoffice.org/11700 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: external/nss/ExternalProject_nss.mk external/nss/nspr-build-config.patch external/nss/nss_macosx.patch Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e (cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1) Reviewed-on: https://gerrit.libreoffice.org/11898 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-10-10fdo#84810 Avoid calc crash when using Paste Special - LinkMatthew J. Francis1-2/+2
Change-Id: I52c072578ccc0b9f75a850613056e74d400eb532 Reviewed-on: https://gerrit.libreoffice.org/11867 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 2b6619c597a791775e2d41a68f7e85ef75d1aaa2) Reviewed-on: https://gerrit.libreoffice.org/11875 (cherry picked from commit b2707c0545d7cc762a9ccfbb8a3b3cea495195e2) Reviewed-on: https://gerrit.libreoffice.org/11879 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-09sfx2: missing semicolonMiklos Vajna1-1/+1
Change-Id: Id1c6357c84e03c71136eb92434002e5e0a4b71d7 (cherry picked from commit 86c4762790823c338f018fb2f06c4a5fa4497916) Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-10-09Revert "dos2unix on SSE2 patch files"Christian Lohmaier2-14/+14
content need to be dos, otherwise patch fails to apply This reverts commit 089b243c8b48aecfd25c79a70b4209a2399dbafa. (cherry picked from commit d592b453cdb420bf7fabfc4e9722e3e0440807cd)
2014-10-09bump product version to 4.3.3.1.0+Christian Lohmaier1-1/+1
Change-Id: I8d99eb615bd74dde88d8dc679b304eaad7021914
2014-10-09Branch libreoffice-4-3-3Christian Lohmaier4-1/+1
This is 'libreoffice-4-3-3' - the stable branch for the 4.3.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.3.x release, please use the 'libreoffice-4-3' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I2b2fff74d3a2c478d4f5d27fe24e2316db446690
2014-10-09Updated coreChristian Lohmaier1-0/+0
Project: translations 68c8a26642c7e59474b4f1d3e13564a9c1503d05
2014-10-08Resolves: fdo#84757 1~ instead of ~1 and 10~ instead of 1~0Caolán McNamara1-3/+4
regression from 3351ebde48a31173c2fea9f7270224017e1f4412 Date: Sat Mar 29 22:22:42 2014 +0100 OUString: remove temporaries and repeated expressions but understandable as it was unreadable goo originally (cherry picked from commit 4289c346de432cc94f05aab78a9464350334b11f) Change-Id: I3ce161bd2628f3a49b14df886ee8d684b248db1c Reviewed-on: https://gerrit.libreoffice.org/11847 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-08fdo#81750 MM: correctly convert inline-edit fieldsJan-Marek Glogowski1-11/+38
The new inline-editable input fields contain real content in the node, therefore a single SwPaM::Move isn't sufficient to select the field or move after the field. For the input fields we can directly go to the end of the field. Reviewed-on: https://gerrit.libreoffice.org/10834 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2579adb13188d276701b1504b4a10bed4d8d4b6f) Conflicts: sw/source/core/doc/doc.cxx Change-Id: Ic1bce415ce45e49456121b6db003ded0733e195c Reviewed-on: https://gerrit.libreoffice.org/11782 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08Fix input field tab handlingJan-Marek Glogowski1-4/+30
When searching for the current field in the field list to find the previous or next one, we check the field start and compare it with the cursor position. But with the new input fields, the cursor can actually be anywhere in the field, so we actually have to search for the start position of the input field at the cursor position. Change-Id: I26526524eccfdbea41c6bf69a460fa64248f50ca Reviewed-on: https://gerrit.libreoffice.org/10837 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d33db207e27198df7af9fc007d7532ec76c80991) Reviewed-on: https://gerrit.libreoffice.org/11781
2014-10-08fdo#76565 Allow pasting into input fieldsJan-Marek Glogowski1-4/+2
Reviewed-on: https://gerrit.libreoffice.org/10835 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3f26ab24e0bfd27645c97ff7915fba2db409930a) Conflicts: sw/source/uibase/shells/basesh.cxx Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0 Reviewed-on: https://gerrit.libreoffice.org/11780 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08Revert "fdo#80927 - quickstart causing trouble on windows, disable it"Andras Timar1-0/+1
This reverts commit e10e1b06cbbf337e8277063651b6e48011df5fd4. The real solution to fdo#80927 is available now. Change-Id: I25166a348cb0a76cccfa49c82190aad88deb3c47 Reviewed-on: https://gerrit.libreoffice.org/11853 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08fdo#84536 RTF import: don't try to rotate TextFramesMiklos Vajna2-1/+20
Regression from 818d80eb0cee65d1bcc4fdb74b32a7c42cc1336e (RTF import: support shapes inside tables, 2013-06-28). (cherry picked from commit 53b9a9bc7c84738545b5c7b791cea1e3d6a16c72) Change-Id: I05eb2f4f2e3467e35f96b280e3a79f69906a56de Reviewed-on: https://gerrit.libreoffice.org/11746 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08fdo#79604: sw: fix clicking on hyper-links in Draw objectsMichael Stahl1-17/+21
The URL is dispatched in MouseButtonUp(), but this relies on MouseButtonDown() not selecting the drawing object when the cursor is over an URL field. (probably regression from commit 7e2f98d0a0c4a0f36a94353a256e7cc5caa3113b and commit 5ed14025645200c77249da364870f5772c01df17) Change-Id: Ib1504baff5d1fffd6ce53b41d3ff726d8e4d5c9d (cherry picked from commit 5284e44ed0594a79b0cc22090a9a82b19962f6c2) Reviewed-on: https://gerrit.libreoffice.org/11834 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08fdo#82144 fix unpacking of additional tarballsDavid Tardon1-3/+7
Change-Id: I74a61005fa9534b3f96cd392c6e38c54c5fd35e1 (cherry picked from commit 0ad5604c91cdd593739b4af5dd3168d9b23b016b) Reviewed-on: https://gerrit.libreoffice.org/11783 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08oox: fix spurious rebuilds of namespacemap.cxxMichael Stahl1-0/+1
There is a missing dependency on one of the generated header files. Change-Id: Id3fa2ccf2c2a31527b795861afdf557882f56972 (cherry picked from commit 63e6cbc3180047000787a9071513152fdd9ce942) Reviewed-on: https://gerrit.libreoffice.org/11844 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08add missing legacyOnly currency, fdo#84260Eike Rathke1-0/+7
aa33dd16b0e3075f28c56656678c0f5cb7642222 changed the currency symbol from ¢ to ₡ but changed only the symbol. Actually changing the number format codes wasn't necessary at all, but changing only the symbol is wrong, see also the ATTLIST Currency legacyOnly description in i18npool/source/localedata/data/locale.dtd Hopefully nothing relies on the actual symbol used in the number format codes ... Change-Id: I92e79403fbb80f18c44dc3ecf5a3830a52fd2ff8 (cherry picked from commit aa1c549e65d103910904a75d19672240da10cc54) Reviewed-on: https://gerrit.libreoffice.org/11849 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08dos2unix on SSE2 patch filesAndras Timar2-14/+14
Change-Id: I3e71333647f3cec3a7c014cd4d245d2b8fdc4fc8 Reviewed-on: https://gerrit.libreoffice.org/11856 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08Resolves: fdo#80101 inserting non-chart as chart -> unhandled exceptionCaolán McNamara1-0/+5
Change-Id: I4d5438292d9a5c49f1336304ebd3dc4e155dd212 (cherry picked from commit 76d4db3181dfd1524620377bb12a8e0332ae8ab0) Reviewed-on: https://gerrit.libreoffice.org/11833 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-10-08avoid use of ref. to possibly deleted objectDavid Tardon1-1/+1
Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69 (cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c) Reviewed-on: https://gerrit.libreoffice.org/11831 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-10-08Do not terminate desktop from a TimerStephan Bergmann1-18/+1
<sberg> kendy, as you recently changed Timer handling on Windows: debugging why quickstarter no longer works on Windows, I run into the phenomenon that IdleTerminate::Timeout (sfx2/source/appl/shutdownicon.cxx) executes on the main thread, and from within the m_xDesktop->terminate() call Timer::ImplDeInitTimer is called which deletes the pTimerData corresponding to our IldeTerminate, so that Timer::ImplTimerCallbackProc, after the return from IdleTerminate::Timeout, will operate on a stale pTimerData and crash; could that be related to those recent changes? <kendy> sberg: I think mst told that we were previously never deleting the timer, and that he did some changes there [...] <mst__> sberg, IdleTerminate needs a different implementation <mst__> sberg, does it work to do this via PostUserEvent, as "Application::Quit()" does? <sberg> mst__, do you think calling terminate from a Timer did work in the past? [...] <mst__> sberg, perhaps it did before [a recent] commit but i would guess it would be more by accident than by design Change-Id: I23b14ba59a963cc2209a261a1459d532a88acdc0 (cherry picked from commit d8a0ecc94bfbfc1d9c8403f0e894d3b7e40384f2) Reviewed-on: https://gerrit.libreoffice.org/11852 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-08Don't even attempt to unload libqstart_gtklo.so againStephan Bergmann3-109/+54
...for no apparent gain. IdleUnloader introduced in a8b42ddd66bba4b6f26a4d2d793051752989938e "Fix i#101245#" was probably a misguided reaction to osl::Module's dtor starting to call dlclose back then. (cherry picked from commit 73aaa3cf5e18d008268f4b67bbb60070b2cafc6a) Conflicts: sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdowniconunx.cxx Change-Id: I9a5e99d8cfba13e3750331597d64f58135537e9b Reviewed-on: https://gerrit.libreoffice.org/11851 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-08fdo#80927: css.office.Quickstart should be single-instance service.Matúš Kukan3-2/+23
Incorrectly converted in a384b21cc40818bf3c918951a086a30b5d9d8022 where SFX_IMPL_ONEINSTANCEFACTORY was used. AFAICS it's the first converted single-instance service which implements css::lang::XInitialization. That's kind of strange but can do its job. sbergman@redhat.com: Three things were necessary in order to not call the ~ShutdownIcon code too late during exit now: * Move the relevant code from ~ShutdownIcon to ShutdownIcon::disposing. * Add a dummy <singleton name="com.sun.star.office.theQuickstart"/> so the service manager will eventually dispose the (single) instance. * In cppuhelper::ServiceManager::Data::Implementation::createInstanceWithArguments do not shortcut updateDisposeSingleton in that odd case of calling createInstanceWithArguments on an implementation that (effectively) is a singleton (as otherwise the service manager would still not dispose it). It looks to me like that "return inst;" was an inadvertent leftover in 874c481801434d4fac3c50f076bff0fe3a3988b6 "Simplify service manager's tracking of singletons" and wasn't intended to serve some subtle purpose. Change-Id: Icd4d3168ec0bbb820b17ac321fe897ac9f9ce7fc (cherry picked from commit 98bb53a5609f8651b0841e8326d7aa53fd56ab3b) Reviewed-on: https://gerrit.libreoffice.org/11850 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-07fdo#83292 add stub locale data for Catalan (Valencian)Andras Timar3-0/+45
Change-Id: I569d203178668a2d63f4a53baca51ac16bf2361a Reviewed-on: https://gerrit.libreoffice.org/11776 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 99fa3b7df7c97b7adc97092baf3f147e165d8576)
2014-10-07Avoid accessing 1 character after a stringMatthew J. Francis1-2/+2
Found while trying to reproduce fdo#83141, but not related to that - it just happened to trigger the relevant assert on a dbgutil build. The change to TextSearch::NSrchFrwrd() fixes the crash triggered by reproducing the above bug. The change to TextSearch::NSrchBkwrd() is by analogy but seems an equally good idea. Change-Id: I68c2c87b632dd53453f92394519a06f62e41bbad Reviewed-on: https://gerrit.libreoffice.org/11830 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 555a7a601b33c18472be7e99b0f9c8acb05a82d7) Reviewed-on: https://gerrit.libreoffice.org/11846
2014-10-07fdo#84315: quick fix for sw tooMatúš Kukan2-1/+2
Similar to 08f33ca66559dfafd29ab0c6073232cf05a6d4e5 (cherry picked from commit 3c6f3290955cfaeaff4d1e38cb1b9d125eac4d61 and commit 37c00bff114fe39e553ea6f1b8e68d6c6ff93eba) Change-Id: I04f11a3821cb3793e5f993995b0c10fc7a62420b Reviewed-on: https://gerrit.libreoffice.org/11765 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-07Upgrade libgltf to 0.0.2Zolnai Tamás1-2/+2
News in this version: - Better positioning of the models (fdo#81181) - Increased robustness (some additional check and coverity scan) Reviewed-on: https://gerrit.libreoffice.org/11749 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> (cherry picked from commit 8ff9b1c2ca65f1e5ac41f3ccf15d9ddadda4c240) Conflicts: download.lst Change-Id: I5be6a99eb925881ed84c8791ef39390e29cbb88b Reviewed-on: https://gerrit.libreoffice.org/11757 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-07bnc#584721: invisible text because of wrong color (white)Zolnai Tamás3-10/+61
Color::getColor() method uses some caching mechanism which works wrong when the result depend on one of the input parameters. So avoid caching in these cases. (cherry picked from commit cfe658c289de030dc3a8fecd3bac0a0004a18061) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Ifa9221e21e685715454de86d5cec09ff6c266307 Reviewed-on: https://gerrit.libreoffice.org/11724 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-07fdo#84008: kill c++11 code from collada2gltfZolnai Tamás5-23/+5829
... so older compliers can deal with it. Change-Id: I7ecfa37601cae2979a5285436596175d2ebe1fe4 Reviewed-on: https://gerrit.libreoffice.org/11706 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-07fdo#82430: MSVC build: avoid using SSE2 instructions in some externalsMichael Stahl17-5/+89
Hopefully this should fix up the most important external libraries. (cherry picked from commit cd42e5f3e2eb9540b16e568559e6e95ffd7cc2a7) Conflicts: external/coinmp/UnpackedTarball_coinmp.mk external/icu/ExternalProject_icu.mk external/lcms2/UnpackedTarball_lcms2.mk external/python3/UnpackedTarball_python3.mk Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400 Reviewed-on: https://gerrit.libreoffice.org/11769 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-10-07Disable sdremote by default, and improve flow control.Michael Meeks2-2/+6
It was intended to disable sdremote by default when it exited experimental mode. This reverts commit 576943b9bf7506829de97d2194c4bee35a485436. Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5 Reviewed-on: https://gerrit.libreoffice.org/11838 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-10-06Input fields are always editable...Jan-Marek Glogowski1-2/+1
if the document isn't read-only. So backspace should always work in input fields. Regression from 961315f0838197e71e9bd49169afe673466e5eb8. Reviewed-on: https://gerrit.libreoffice.org/10833 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 428c45fc779223371818bd11b2b846e1c13ebe47) Conflicts: sw/source/uibase/docvw/edtwin.cxx Change-Id: I06648ab075b198ee7914e7ae60bef87e7ff94f0a Reviewed-on: https://gerrit.libreoffice.org/11779 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-06Resolves: fdo#84588 loop in TableInfo::getNextNodeCaolán McNamara1-1/+7
Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f (cherry picked from commit f0859c4eae0f567393811c308074723329f1faab) Reviewed-on: https://gerrit.libreoffice.org/11828 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-06Update mdds to 0.11.1.Kohei Yoshida1-1/+1
(cherry picked from commit 8030c21def37f965a35b534038659fd0b513887c) Conflicts: download.lst Change-Id: Ie1c80029a762fcf92dc20ffe74260ea54c61da28 Reviewed-on: https://gerrit.libreoffice.org/11791 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-03bnc#657899: Paragraph vertical spacing differs from PowerPointTor Lillqvist1-0/+22
We need to set the "paragraph summation" flag also for .pptx import. (As is already done for .ppt import.) This is what in the Options (Preferences) UI is called "Add spacing between paragraphs and tables (in current document)", on the LibreOffice Impress:General page. This is a setting that when set becomes local to the document. I actually don't really understand why this needs to be a user-visible option, wouldn't it be enough for it to be an internal flag that is set for documents imported from .ppt and .pptx, and is clear otherwise? Change-Id: I525178957276e7d587b6ac4be8ae7919fc245a27 (cherry picked from commit 96d210bf9ca0a99fc8256d6e0a4952207cce69e0) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Don't assign NULL to boost::shared_ptrJan-Marek Glogowski1-1/+2
This is already done by the constructor. Fixes the libreoffic-4-3 build on Ubuntu 12.04. Change-Id: I7bbec905c0d1efb5670c61c975f36f2e37a74cac Reviewed-on: https://gerrit.libreoffice.org/11778 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-03error C2216: 'override' cannot be used with 'inline'Andras Timar1-2/+2
libreoffice-4-3 is supposed to be buildable vith VS2010... Change-Id: Id980c709ee167133e2d8ba41902e43d0abe1034f Reviewed-on: https://gerrit.libreoffice.org/11777 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-02fix Windows build againAndras Timar1-2/+2
Change-Id: I7f671af4f4841bf68496f99ef8ae14adf801713d
2014-10-02Related: fdo#37691 \shptxt ... \jpegblipCaolán McNamara1-2/+7
text shape with jpeg data, should we throw away the text shape here or keep it ? Change-Id: I9e4463b5863bf68cdcd18ea5d1f6c831a0de8ec9 (cherry picked from commit cfbcce701cd6dc3af6086428399136efef33ff59) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-10-02sd: fix up e5222cf76a94c4ec20664b3e6f5a48e00ee9669fMichael Stahl1-1/+2
Change-Id: Ib12f889e65f348b0313a64e8f3b7449d4708244a
2014-10-02coverity#1242906 Unused valueCaolán McNamara1-1/+1
Change-Id: I7a282e5adc60e4b123469f46fb480805377626b4 (cherry picked from commit a165aa38d9009bf46e203bbdfbac3b7cd8f71b4c) Reviewed-on: https://gerrit.libreoffice.org/11764 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-02fdo#63483: support for modify passwd in Impress and DrawKatarina Behrens6-6/+29
iow, allow opening Impress and Draw ODF documents read-only Change-Id: I379b9f92b9bfb20e99998177d9a5fae80069d98f Reviewed-on: https://gerrit.libreoffice.org/11758 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-02fdo#84315 quick fixLionel Elie Mamane2-2/+2
In mergedlib case, load ourselves (that is, mergedlib). Fixes bug symptoms, while waiting for fully clean solution, which is killing svx/dbtoolsclient completely. Change-Id: Ib8ad34ee4697f89bdc6bbe64d406053f9e7f7521 Reviewed-on: https://gerrit.libreoffice.org/11739 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-01error C2782: template parameter '_Ty' is ambiguousMiklos Vajna1-1/+1
Change-Id: Ieb8f91a629b9e14480c0372e747fea326c549833 (cherry picked from commit 02e0bac73be8d11abf539130f3d3541fa72af93a) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-10-01fdo#78907 fdo#82895 : File crashed while saving.PriyankaGaikwad3-1/+14
- There is pagebreak in file and footer has nested table. - While exporting LO write section break instead of PAGE_BREAK. - Due to this it was writing two sections in file and same footer for both sections. - This was causing wrong table depth values due to this it was crashing while writing table. - So in MSWordExportBase::OutputSectionBreaks if next node has RES_BREAK(page break) then bNewPageDesc value should be false. Reviewed-on: https://gerrit.libreoffice.org/9568 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2df0d9d32d05f08ccf673fd0f61f650438511acb) Change-Id: I2ccc4e48a26253716253a7280a244f06e172770a