summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-10Version 4.1.4.2, tag libreoffice-4.1.4.2libreoffice-4.1.4.2Christian Lohmaier3-0/+0
Change-Id: I4976827c4014d156dcb33e29e1ba80a508c5522d
2013-12-10bump product version to 4.1.4.2Christian Lohmaier1-1/+1
Change-Id: I0541d64f3f375cacc61a6541fd1997729dfc3ce6
2013-12-10fdo#70278: editeng: fix Time fields in ImpressMichael Stahl1-1/+1
Apparenty an uninitialized SvxTimeField is created instead of the SvxExtTimeField that is needed to preserve the value and format. (regression from ee5fc5d25fe102c30daf7d181b8181d40b85a4f3) (cherry picked from commit 1235e694c21f6e3e000e24a176123c386ea91df1) Conflicts: editeng/source/items/flditem.cxx Change-Id: I36b16af0c143e8b5451a1925806756492dc2334e Reviewed-on: https://gerrit.libreoffice.org/7022 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 0f890da1fd6282759c53c998566a809c9353b775) Reviewed-on: https://gerrit.libreoffice.org/7025 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2013-12-10editeng: fix more 32-bit Time breakageMichael Stahl4-13/+13
SfxDateTimeItem and SvxExtTimeField need to use 64-bit integer to store Time as well. These classes also have binary serialization Load()/Save() methods but they are unlikely to be used in a persistent way, just for the clipboard. The problem is easy to reproduce in Impress: Insert->Field->Time(fixed) (regression from 9830fd36dbdb72c79703b0c61efc027fba793c5a) Change-Id: I5946c5b94dd5a509805b6dc40461bbd910caffc4 (cherry picked from commit 7b9c61c7f20a679c5316a288c2ec2ffbf04b4200) Reviewed-on: https://gerrit.libreoffice.org/7021 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5ee9dca1ca655dbe8fa0a8cc98853aacc2d6a7ce) Reviewed-on: https://gerrit.libreoffice.org/7024 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2013-12-10fdo#70198: sw: don't truncate Time values on 32bit platformsMichael Stahl2-3/+5
SwDoc::SetFixFields() uses sal_uLong to store Time.GetTime() which needs 64 bits. Also fix same problem on Time fields in HTML import. (regression from 9830fd36dbdb72c79703b0c61efc027fba793c5a) (cherry picked from commit 17dab5bf8efb3fd676e6854474b199b681d0dc28) Conflicts: sw/source/filter/html/htmlfld.cxx Change-Id: I5d0388cbc364e1f9dfb60ff9e83c7d2f101c69d8 Reviewed-on: https://gerrit.libreoffice.org/7020 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f0d031c19c45d680b3d468c58a912da2a3ce4c78) Reviewed-on: https://gerrit.libreoffice.org/7023 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2013-12-10fdo#72148 if expecting table at begin, explicitly set it soLionel Elie Mamane1-1/+5
Change-Id: Ic876603e5860b987280b73726fd79a071a9c833c Reviewed-on: https://gerrit.libreoffice.org/6865 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-12-10Updated coreChristian Lohmaier1-0/+0
Project: translations e1d77c2ce0cb2a42de3ec1d26a8a75112f822a2f
2013-12-10flat text DB: fix move by bookmarkLionel Elie Mamane1-3/+4
To test whether the range [a,b( is *before* e, compare e to b, not to a. This makes a difference when a==b, which happens for row 0 (header) when there is no header. Conflicts: connectivity/source/drivers/flat/ETable.cxx Change-Id: I629b71936f82a468febe0360909264dd80304437 Reviewed-on: https://gerrit.libreoffice.org/6866 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-12-10be able to read the correct 'sort-ascending' value, fdo#72548Eike Rathke1-0/+6
... for <table:content-validation table:display-list='sort-ascending' ...> but do not write it yet. Change-Id: I05bdf27cee27f7456b660267b95126420474eb99 (cherry picked from commit 8047ae4a8244199717698f2e2f5281551e97912c) Reviewed-on: https://gerrit.libreoffice.org/7017 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-12-10resolved fdo#71589 reimplemented horizontal range lookupEike Rathke4-3/+107
Regression introduced with ebdd9c300718bce454ef56a31d5d8fb699fc1822 (first eaea417bfdf8d06df2b7f2e42c904c32ce77e871) that removed the bMixedComparison member from ScQueryParam under the false assumption that is was only used to emulate a legacy Excel behavior. In fact it was also needed to do the at least horizontal range lookup in sorted mixed data, though didn't evaluate exactly the same conditions as Excel and defined in ODFF. Reimplemented a similar behavior for the new code structures but this time also checking for the additional condtion that a query ByString does not return the last numeric result and vice versa, which previously was missing. (cherry picked from commit f0701470858f57a855ba57c0c2283e52953db327) Conflicts: sc/source/core/data/dociter.cxx Backported. Change-Id: I46061777879ba5301bfcaca2d50cf87a994f93f2 Reviewed-on: https://gerrit.libreoffice.org/6912 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-10resolved fdo#66564 calculate formula cell once if AutoCalc disabledEike Rathke1-0/+18
Was lost with 2ce72093cdc68e60fb06ddd4358e0bc7fc8c63a9 and previous restructuring. (cherry picked from commit 2212051e792cb5f51f4191afe83c85fc3730a087) Backported. Change-Id: Ie4c8bdb287b56448406c873840c26ec4759de375 Reviewed-on: https://gerrit.libreoffice.org/6965 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-10resolved fdo#72537 write <loext:fill-character>Eike Rathke7-3/+15
... instead of <number:fill-character> but read both. (cherry picked from commit 9f87de91cee05656808a98ab1bd65ad9509ef7df) Also needed for this is: xmloff: add a generic LibreOffice ODF extension namespace XML_NAMESPACE_LO_EXT can be used for elements and attributes that are not yet specified by OpenDocument. (Change-Id: Id29392533d46f6592d964ce79c05ffefa4d69ebc) Reviewed-on: https://gerrit.libreoffice.org/5419 Tested-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> (cherry picked from commit de9b067bd13ec6632b49c9683255bd3a1d7ae13e) Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3 Reviewed-on: https://gerrit.libreoffice.org/7014 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-12-09fdo#72156: GraphicObject: Added missing delete of streamUlrich Kitzinger1-0/+3
Change-Id: I1b84941b0e4b17d5819b1e4af0da9ce3f673710f Signed-off-by: Ulrich Kitzinger <ulkitz@hotmail.de> (cherry picked from commit cc36dfc9bf4f327c359d171d8d05f0ede049164e) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 37ed490fd7bfef1863b26d0f791cba1a04811459) Reviewed-on: https://gerrit.libreoffice.org/7010 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-06Partly revert "Resolves: #ii122335# Disabling the old task pane"Rob Snelders2-0/+2
This partly reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872. SideBar is experimental, Impress still needs the TaskPane slot, otherwise once disabled / clicked away the user won't get the TaskPane back. Change-Id: I65b9e4a52ef2f3f1e7240fc01b828d2ff5d1589c Reviewed-on: https://gerrit.libreoffice.org/6943 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit cb4225144f1fff44f9bb972fe06f51524da11b8b) Reviewed-on: https://gerrit.libreoffice.org/6952 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-05resolved fdo#71667 and fdo#72278, fdo#69971 follow-up fixEike Rathke5-1/+24
a9d85d62a889288b17899c8defc020da487d8b36 used ScInputHandler::EnterHandler() to reset all sort of things related to input EditEngine, but that is a handler for Enter and does not enter a handler and actually attempts to finalize input, which lead to various unwanted side effects. Introduced ScInputHandler::InputTurnOffWinEngine() as only the input bar window EditEngine needs to be reset in the window switching case (which EnterHandler also does hence it did prevent that bug). The approach could be polished with further refinement but most importantly fixes the actual problems now. (cherry picked from commit dfd1a47a38dac743f9ed0f1e9507714bac027d35) Conflicts: sc/inc/scmod.hxx sc/source/ui/app/scmod.cxx Change-Id: I9a0bc452b49ba11a3313cafbc1e5972f41dc65c7 Reviewed-on: https://gerrit.libreoffice.org/6936 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2013-12-04Resolves: fdo#70703 guard against FlushImpl inside FlushImplCaolán McNamara2-37/+68
where the inner one deletes Shells that the outer one is still processing. Push the candidates onto a stack and let inner FlushImpl modify them to inform outer FlushImpl's that an entry has been deleted Change-Id: I1db8546d53e24cc96c72f2cd5cbec57b6cecaff5 Reviewed-on: https://gerrit.libreoffice.org/6735 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5d98639ec39f302df3dd38498703630e0556938d) Reviewed-on: https://gerrit.libreoffice.org/6928 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-04fdo#71450 fdo#71698: ODF import: fix frame name corner casesMichael Stahl1-2/+10
Trying to set a name that is already in use will throw an exception (and set a different, generated name); if there is actually no name in the file then there's no point trying to set anything. (regression from b69d152cfa1da868ba960345d72ba78f9f8e1b35) Change-Id: Ie54d4a830cc23e2853a6efeb81f77dcc788192ea (cherry picked from commit 8171e713e74e3d09e86592c28abfe05d0400c071) Reviewed-on: https://gerrit.libreoffice.org/6907 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 0763cf6ed7bdc629e59b5df757b9ef4f5273f393) Reviewed-on: https://gerrit.libreoffice.org/6911 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-04fdo#71749: sw: WW8: don't loop on tables in footnotesMichael Stahl1-1/+1
(regression from ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: Id10b6fb8e9e3697b10a1df605cb48d94a55ad207 (cherry picked from commit 790896d9a557d34ea91d6e5926471de66503be7a) Reviewed-on: https://gerrit.libreoffice.org/6905 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 6dfc6b717b5e625cbc48c856b73573719c511c8a) Reviewed-on: https://gerrit.libreoffice.org/6910 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-03Related bnc#837302: Don't introduce a redlined delete and the end of doc.Jan Holesovsky2-0/+25
Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec Reviewed-on: https://gerrit.libreoffice.org/6898 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-12-03bnc#837302: Allow insertion of redlines with an empty author.Jan Holesovsky3-2/+14
No idea why that was not allowed (since the initial import in 2000), we need it for interoperability. Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/source/core/doc/docredln.cxx Change-Id: I475fa63f9a4a3219a2b898b6f7d81e0603d32c18 Reviewed-on: https://gerrit.libreoffice.org/6897 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-12-03Compiler warning.Kohei Yoshida1-1/+1
Change-Id: I66b16e9767369fd54611f92d66cd1b43f4e8c5a8 (cherry picked from commit 5db19a417952381fc6349b9691c581090d7d2679) Signed-off-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e4056b6b8194d89f617286a52652dd12584eeebc) Signed-off-by: Eike Rathke <erack@redhat.com>
2013-12-03defaultbranch=libreoffice-4-1-4Eike Rathke1-1/+1
Change-Id: Ia9a57309a317567df076b6d78d8920b91071063d
2013-12-02Related: #i123048# Corrected connector layout after reloadArmin Le Grand2-15/+28
(cherry picked from commit c7d96eed93415894c5ca4522bd32ca06acd88233) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: svx/inc/svx/svdoedge.hxx svx/source/svdraw/svdoedge.cxx Change-Id: Id388fa7396751a2e8b5908373ca57eceee1a1af1 Signed-off-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/6862 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-28binaryurp: silently ignore superfluous MUSTREPLY/SYNCHRONOUS flagsStephan Bergmann1-6/+4
...in a non-oneway call. This can happen when a pre LO 4 entity is calling a LO 4 entity post 90eac3e69749a9227c4b6902b1f3cef1e338c6d1 "API CHANGE remove [oneway] method attributes." (See mail thread starting at <http://mail-archives.apache.org/mod_mbox/openoffice-api/201311.mbox/%3Ca4e7f34d-b8cb-4d5a-890f-6894d3410265%40ucimail2.uci.cu%3E> "hi, code in Java.") Change-Id: I9f800a979d84a95cc5cd96f75ee7472e8cf6cf4b (cherry picked from commit 289e54feabc936b8175327355a159073830a326a) Reviewed-on: https://gerrit.libreoffice.org/6835 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-26bump version to 4.1.4.1.0+Christian Lohmaier1-1/+1
Change-Id: I72bafd466cd0457ad409b7fdadba1fb198900ae3
2013-11-26Branch libreoffice-4-1-4Christian Lohmaier3-0/+0
This is 'libreoffice-4-1-4' - the stable branch for the 4.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8b57a18b4c343a66fb61da2b33a90bc4c9aa7c66
2013-11-26Updated coreChristian Lohmaier1-0/+0
Project: translations 1815e3c04d6ee25edf53281df533c019881ea58c
2013-11-26fdo#62442: Move the InfoPlist.strings files into the app from langpacksTor Lillqvist3-11/+38
The digital signature of an app bundle includes an integrity check for the Resources subtree. This is the normal place for Mac apps to have their read-only non-code "resources". In LibreOffice it is currently not much used, though. The signature thus breaks when a lang pack installer is run and plops its InfoPlist.strings file into the "Resources" subtree. This file contains translations of strings in the app's Info.plist file. For LibreOffice, it contains translations only for some of the file type names in Info.plist. (Why only some, I don't know.) Files installed by a lang pack insaller into other locations in the app bundle don't harm the signature. Making the InfoPlist.strings files be distributed as part of the main app bundle instead of in langpacks should keep the signature valid even if a lang pack is installed. The InfoPlist.strings files are small so the size of the main app should not grow significantly. This required introduction of a new functionality in scp2: The possibility to generate a list of several complete File or Directory stanzas, one for each language for which translations are being built. (This is different from the existing functionality, used for files that go into lang packs, where a stanza contains several Name or HostName attributes (or whatever the term is) where the attribute names are qualified with the language code in parens.) Change-Id: I3afd9b08944fe1bccb5f0c881d740d260f589e39 Reviewed-on: https://gerrit.libreoffice.org/6251 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2013-11-26Resolves: fdo#41169 fix MacOSX non-Latin keyboard layout with Latin shortcutsCaolán McNamara1-0/+37
Change-Id: I168de52d6185d5df9c41fd2d7a68c0ff3f733852 (cherry picked from commit 82b5172954261e030a42bd6b3f4acc99807d0ee5) Reviewed-on: https://gerrit.libreoffice.org/6798 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2013-11-26set a 23 enigma timeout at RegexMatcher, fdo#70627Eike Rathke1-2/+24
Change-Id: I390bfec0d36dcc9529785e97994dad2b0704dc80 (cherry picked from commit d838ea200e7d6060d4a759616f9e1fcbf3c36c8e) Reviewed-on: https://gerrit.libreoffice.org/6808 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-11-25Related: fdo#41169 fix GTK non-Latin keyboard layout with Latin shortcutsCaolán McNamara1-22/+45
See also rhbz#958300 Change-Id: I5c3cf9652adb7b1c9ec53a32ed39f231a09ae1d7 (cherry picked from commit 8cef6c7ec67aec88b339ca647e784afbabf190f8) Reviewed-on: https://gerrit.libreoffice.org/6759 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> Tested-by: Khaled Hosny <khaledhosny@eglug.org>
2013-11-25rhbz#1030009 Remove global XModel refStephan Bergmann1-7/+0
...that is apparently effectively unused since 2627bdaddc6f694dc7fc6ba347a305af0f88ee2c "INTEGRATION: CWS fwk02ea: #i28639# always used supplied status indicator" anyway but causes crashes during exit when it holds an SwXTextDocument ref. Change-Id: I542545c793855b41731de72650bf07d5748fcb9f (cherry picked from commit a7464edb0a4368db02b1298b5710cf98b17e282b) Reviewed-on: https://gerrit.libreoffice.org/6804 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-25Resolves: fdo#67263 CRASH when deleting applied bulleted paragraph styleJulien Nabet1-1/+1
Change-Id: I70dc18363480e6c07577a93279ddd083631f6cc3 Reviewed-on: https://gerrit.libreoffice.org/6702 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 899c5ea9dc3c34892edfde642510514779132910) Reviewed-on: https://gerrit.libreoffice.org/6755 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-25fdo#70345 Reuse XStream for Windows platform create a new one for others.matt_511-4/+17
Reviewed-on: https://gerrit.libreoffice.org/6580 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3d12549335229aca1a6a57575292111274709992) Change-Id: I911c24b82b55445c6f95e14be29759e2fe3d9dfd Reviewed-on: https://gerrit.libreoffice.org/6761 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-25fdo#67742 Avoid autocorr of "--" before "-"Laurent Balland-Poirier1-0/+5
LibO 4.1 now uses '-' as word separator for AutoCorrection Then the sequence "---" is detected as word "--" and autocorrect as "–". This avoids autocorrection of "---", as word or as border This commit detects the sequence "---" and report autocorrection. Modified for LibO 4.1 (OUString => String) Change-Id: I1342c2ff83dd42683e683b3bb27280d61179b9a2 Reviewed-on: https://gerrit.libreoffice.org/6747 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-25fdo#67802: Fix PS printing of non-CTL text with ligaturesKhaled Hosny1-7/+5
The GlyphSet::AddGlyphID() was messing with glyphs of characters that can be converted to Windows-1252 encoding, discarding whatever glyph it was asked to use and using a random glyph that is supposed to belong to the converted character. For ligatures this means the ligature glyphs was discarded and the glyphs for its component was used, but this broken for just any glyph substitution. The code makes no sense at all, apart from the fact that it is verbatim copy of GlyphSet::AddCharID() since 9754ad8d979557ea03cbfe04708b62b698d1276c and just happened to work because we did not enable ligatures and other typographic features for non-CTL text before. Change-Id: I764f0b40f8acf61eae38a9038b0666d711c04a9d Reviewed-on: https://gerrit.libreoffice.org/6762 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-25Correctly check getFileURLFromSystemPath() successKhaled Hosny1-1/+1
Change-Id: Iadc34171235fec2d6aafd601f62a0bff8ed5b3ee Reviewed-on: https://gerrit.libreoffice.org/6770 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-25Make TTC fonts work againKhaled Hosny1-10/+4
osl::File::getFileURLFromSystemPath() does not return a boolean. I wonder how this worked before, if it worked at all. Change-Id: Iadc0e06236f43c24cbcd42e4fd79ac9116a58c13 Reviewed-on: https://gerrit.libreoffice.org/6769 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-24cp#1000016 DOCX/RTF import: fix RemoveLastParagraph() on WindowsMiklos Vajna1-0/+4
(cherry picked from commit a56bfe734a7bed40a175e0eeb7e86e7006a83f83) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I3f9d69ddbb2144c60a724e4242128b65ae167455 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-22resolved fdo#38592 do not insert extraneous parameter in importEike Rathke2-8/+9
Importing already a Calc-only number of parameters do not insert extraneous parameters. (cherry picked from commit 4b9304ecdd067307e24e4388fe1addcab9e85bd0) Change-Id: I011e3df24573fce9f2788c9311089af984650220 Reviewed-on: https://gerrit.libreoffice.org/6764 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-11-21fdo#69500: Revert "fix bug #60700 - de-crutify ODF files"Andras Timar1-1/+3
This reverts commit da06166015689eca260c702602bef4cea58afbd3. Change-Id: I8f88b68a9ab7bd8c95aad90984ddca20e3ca9d13 Reviewed-on: https://gerrit.libreoffice.org/6709 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2013-11-20fpicker: cleanup async requests, dung out comments.Michael Meeks2-28/+21
Change-Id: I016145d315ae1c4b5376e43583e2546a2b7f7b07 (cherry picked from commit acc0fcd96c940e42da27bb58ba1c89ae5de5a5b8) Reviewed-on: https://gerrit.libreoffice.org/6736 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2013-11-20Writer : Fix fdo#71694 by clearing old anchor frame before setting newArnaud Versini1-1/+2
Needed as otherwise AnchoredObjects can be in more than one SwLayoutFrm. See also 7eae50f9ff5877ef880be9a85d3f7e52b1fec49f ( Access by AnchoredObject of a deleted SwLayoutFrm ). Change-Id: I54582d6f9fb8b6f853352af27706faabe610874b Reviewed-on: https://gerrit.libreoffice.org/6720 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7726339a648ac94bb7c365950f23dabec5aa52e7) Reviewed-on: https://gerrit.libreoffice.org/6732 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-20fdo#67060 do not package RPM-only install script to DEB packsAndras Timar1-0/+6
Change-Id: I90c74f0d00804b80daeca2c69d1f12e094243a81 Reviewed-on: https://gerrit.libreoffice.org/6734 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-20fdo#66854 keep shadow distance of non-supported MSO shadow typeAndras Timar1-1/+4
this is a slight improvement of d7367b709dc4e97714fb2084b872a96389e768fb the rendering of star from #i119634# bugdoc was kept the rendering of the yellow circle shadows from fdo#66854 bugdoc was improved Change-Id: Ife53328ef665131fb954eb33c2e8269ad10da0fe Reviewed-on: https://gerrit.libreoffice.org/6719 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20n#828390: Export subscript text.Muthu Subramanian1-0/+13
Signed-off-by: Andras Timar <andras.timar@collabora.com>
2013-11-20added date acceptance patterns to Canadian locales, fdo#71664Eike Rathke3-0/+9
Complete set is now Y-M-D;M-D;M/D/Y;M/D Change-Id: I42ed59fb325b391943608a10ded7ce74c80656e1 (cherry picked from commit 2d8cac51c6d5205a27d90bd9237c8ed1e4b8deea) Reviewed-on: https://gerrit.libreoffice.org/6726 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20rhbz#1031989 Accept --pt in addition to deprecated -ptStephan Bergmann1-1/+1
Change-Id: I3593b3fc7e0ad405612216fb07e8632050b75cee (cherry picked from commit 5cb10c4c99e46c97984e4e1c1bca5915f83f0a1d) Reviewed-on: https://gerrit.libreoffice.org/6723 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-20resolved fdo#70750 reverted inappropriate implementation of fdo#63546Eike Rathke1-59/+0
This is a combination of 2 commits. Revert "fdo#63546: set appropriate alignment when wrt direction of cells is changed." This reverts commit 706e3b8e43df94310b2fe8458da67875073a046c. Related previous commits that commit depends on will also be reverted. Triggered by fdo#70750 inspecting the code it turned out that the changes for fdo#63546 did several things wrong: * looping over individual cells of a large selected range results in slicing and merging ScAttrArray for each row in each column which is utterly slow (the reason for fdo#70750) * instead of executing the changes in ScFormatShell calls should had been forwarded through ScTabViewShell to be passed down to ScViewFunc, ScDocFunc, ScDocument, ... * setting hard attributes on all cells (except if already centered or block justified) is not wanted * value cells for example should stay automatically right justified if no justification is given yet * overwriting already existing left or right justification may not be what the user expects * applied styles' justification is overridden this way (cherry picked from commit 2f29e544932633a01162ecb80e50872eabdd2bc1) Revert "fix fdo#63546 : set appropriate alignment when writing direction is changed." This reverts commit 16f508686c29bfa244ca6f81b5ab3bbaf5fef2a7. (cherry picked from commit 955281e50e2728932edc3b688ce3cf235bdfd0c9) Conflicts: sc/source/ui/view/formatsh.cxx Change-Id: I53fc56a09f2b396577fff3ec679b39837fc2f649 Reviewed-on: https://gerrit.libreoffice.org/6691 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-19Fix some wrong copy pasteJulien Nabet1-3/+3
Change-Id: I3ad6f62393cb22b350d6b50086963ebc7d2a8f5e Reviewed-on: https://gerrit.libreoffice.org/6715 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>