summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-15Version 4.2.4.1, tag libreoffice-4.2.4.1libreoffice-4.2.4.1Christian Lohmaier3-0/+0
Change-Id: I353a0401d28f94e1327e463c2e316db4c2bc85a4
2014-04-15bump product version to 4.2.4.1Christian Lohmaier1-1/+1
Change-Id: I716bbcb402ccbb812132c64074f2058b75df0ee7
2014-04-15Branch libreoffice-4-2-4Christian Lohmaier4-1/+1
This is 'libreoffice-4-2-4' - the stable branch for the 4.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.2.x release, please use the 'libreoffice-4-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ib1d7beedb0f5449c16cc1321cf7a89d07c472a33
2014-04-15Updated coreChristian Lohmaier1-0/+0
Project: translations 0369496336360265d6c29deb2f65b39acf1b1165
2014-04-15fdo#76409: Write output cell string to <text:p> element when saving to ods.Kohei Yoshida5-4/+47
The change was made by accident. Change-Id: Ife2461b0fca6e3ea5a65d72d985d1e0976737b5a (cherry picked from commit a0752fa4246dc71b64907c679657a1af3cb617e1) Reviewed-on: https://gerrit.libreoffice.org/9014 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-04-15fdo#76294: Properly intern string literals in formula on xls import.Kohei Yoshida33-117/+187
(cherry picked from commit b09426b83c12b0cd27cd909602251cb076ffa4ba) (cherry picked from commit 625c595fc30d2e6153735dc2ed2359ff4f8a1e3a) (cherry picked from commit 6bb7fa8df523d3ae7b9945009fb1034f28cb0a0a) Conflicts: formula/source/core/api/token.cxx include/formula/tokenarray.hxx sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform8.cxx sc/source/filter/excel/frmbase.cxx sc/source/filter/inc/XclImpChangeTrack.hxx sc/source/filter/inc/lotform.hxx sc/source/filter/inc/qproform.hxx sc/source/filter/lotus/lotform.cxx sc/source/filter/lotus/lotimpop.cxx sc/source/filter/lotus/op.cxx reportdesign/source/ui/inc/Formula.hxx Change-Id: Icf962a4363887f323da6d2bdf935a027df3319fa Reviewed-on: https://gerrit.libreoffice.org/9008 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-04-15upload libetonyek 0.0.4David Tardon3-32/+2
(cherry picked from commit d24634a6d4046db208428eb999012c03bd9a5c48) Conflicts: external/libetonyek/UnpackedTarball_libetonyek.mk Change-Id: I64a35ca0902ba40a4fba3080181147b4facac2ee Reviewed-on: https://gerrit.libreoffice.org/9009 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-14fdo#77209: Share string pool with clip documents.Kohei Yoshida4-5/+11
We do the same with undo documents, and it will only make sense to do the same with clip documents as well. Also, put the sharing part into a common method (for ease of tracking). (cherry picked from commit 8f403051968298fbabd61de82fbb6a77762c83cc) Conflicts: sc/inc/document.hxx Change-Id: I342b22d95374ee06d16318a66ffea0ac5b42621c Reviewed-on: https://gerrit.libreoffice.org/9005 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-04-14fdo#74087: Inspect if a mis-spelled word is at cursor position...Kohei Yoshida2-37/+145
then decide whether to launch a spell candidate menu or a regular context menu. (cherry picked from commit cd22c3442389f69fc1cc14dd07b17f5a59498e5e) Conflicts: sc/source/ui/view/gridwin.cxx Change-Id: Ib121e9c6729e068c70ff216391f863639aa01951 Reviewed-on: https://gerrit.libreoffice.org/8943 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-04-14handle .doc cropping also inside groups (fdo#38411)Luboš Luňák1-2/+3
Writer does handle cropping on its own, but only for "toplevel" images, not for those inside groups, so there still use the generic code. Change-Id: I805a4cbd2d4cea7008e0322688ccd7f35a6d4a2c (cherry picked from commit af51f3fb5aee469423b154958ccb3fe61284122f) Reviewed-on: https://gerrit.libreoffice.org/8950 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-13fdo#75970: Let's do it in a straightforward fashion.Kohei Yoshida1-2/+2
No idea what the intent of this weird static heap instantiation, but apparently it's not helping us. Change-Id: If6cccf649958b6cf01ede992c286af68eaeb31f6 (cherry picked from commit 0ffe4358c755504bc2754ef88edadde33b5f395a) Reviewed-on: https://gerrit.libreoffice.org/8939 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-04-13fdo#77307: Compare external formula tokens correctly.Kohei Yoshida1-0/+9
To avoid different external (add-in) tokens from being evaluated equal. Change-Id: If78187901bdca7fe0da50442b0bb66e0650dc70f (cherry picked from commit f9cc0daec26016722bf5260e4e2634e6dcfe25a2) Reviewed-on: https://gerrit.libreoffice.org/8942 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-04-12smoketest: remove OpenOffice.org 1.0 XML format export testsMichael Stahl4-54/+1
... which fail since the export filter was disabled in aeeaccf59abbc485d7786486f1accc1cb4d4dbf7. (cherry picked from commit 694a6478c1cfe18579dc9b355bda3db836b0b3a2) This is part of the fix for fdo#74979. Change-Id: I10969a96394d2972376a792af645ff48ccdab7c0 Reviewed-on: https://gerrit.libreoffice.org/8938 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-04-12Remove OOo1.0 file formats from Save As.Bryan Quigley15-15/+15
List discussion: http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html Reviewed-on: https://gerrit.libreoffice.org/7489 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7) (cherry picked from commit c9c4148f00f60a9bb986e9431e76ab7cf8b4c547) This will be used as a "fix" for fdo#74979. Change-Id: Iea7e5d9ed8f0e48ffce4504bfaaf0d41067c7a5d Reviewed-on: https://gerrit.libreoffice.org/8937 Reviewed-by: Bryan Quigley <gquigs@gmail.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-04-11fdo#76961 - Calc link auto-update interval is changed on file saveNiklas Johansson1-1/+1
The commit fa0fe19e89ba68a6b02cbdd5eff6bc161024c53d accidentaly made the external links auto-update interval save seconds as milliseconds. This patch fixes the problem at least on Mac and Windows where I tested it. I also did a successful build on Fedora 20 with this patch that works as expected. Change-Id: Ia10d12fb678004a686a4eaa65e9e12f09378a440 Reviewed-on: https://gerrit.libreoffice.org/8934 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit cf1d4c02c14772824a7149957fa119c6e290640b) Signed-off-by: Kohei Yoshida <kohei.yoshida@collabora.com>
2014-04-11check that stacks are not empty before top()Caolán McNamara1-1/+6
Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc (cherry picked from commit a1ea3838adee634ccf725bc5f2be7805c6294a16) Reviewed-on: https://gerrit.libreoffice.org/8932 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-11include last record in language-subtag-registry.xmlEike Rathke3-1/+60
(cherry picked from commit f854b05013a587a6ea568b32180f5c81de26eeeb) disable test and document why disable build breaker test (cherry picked from commit 73c70f28ba41c7a602d7befde84c5b54187694d7) document why the test fails and is disabled (cherry picked from commit 2803e5c1e7112882003c3e2301f8e28f3dc2b6b7) Change-Id: Iaca0fc9ca12ee672f640be9c639b7b0d0dd3bc10 Reviewed-on: https://gerrit.libreoffice.org/8921 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-11build liblangtag with updated IANA language-subtag-registryEike Rathke4-1/+8
... as downloaded from https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry Reviewed-on: https://gerrit.libreoffice.org/8919 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 39d29be28b92328149430045f1e10e1ebeb6a0eb) Conflicts: download.lst Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396 Reviewed-on: https://gerrit.libreoffice.org/8920 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-04-11fdo#77300: Don't re-compile formulas when the hybrid formula is not there.Kohei Yoshida1-24/+30
Change-Id: I9b0f8d031fec08bb8d92333ff67074fdc739e034 (cherry picked from commit 66c6a3bfc9cd89c562107d3d369b3d82bae94d68) (cherry picked from commit 0e63ca4fde4e446f346e35849c756a30ca294aab) Reviewed-on: https://gerrit.libreoffice.org/8928 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-04-11fdo#73588: fix default alignment in RTL mode.Hannah Lyhne1-1/+4
(cherry picked from commit 036b1fccbfb87a1aab36632843deb29e0a70630f) Change-Id: Icb932ee51dbf32d8baf4382aa00e89a680f5a41d Signed-off-by: Kohei Yoshida <kohei.yoshida@collabora.com>
2014-04-11re-enabled user-defined numeric fields for dBase exportEike Rathke2-59/+165
Since commit f59e350d1733125055f1144f8b3b1b0a46f6d1ca it was impossible to define a numeric field with a precision of less than 2 decimals, even if all values were integers. It was also impossible to define a field width larger than needed for any values in that column. Furthermore, the integer part was shortened if the overall column's values resulted in more precision than defined, but the overall length did not reach the predefined length. This does not change the behavior of the original intention of f59e350d1733125055f1144f8b3b1b0a46f6d1ca to give the precision of number formats precedence over precision defined in the column header, which is debatable though because conflicts may silently change the field definition. (cherry picked from commit e65141e93a540fc9fb4343ee65a5a7da7e3b1769) Plus comment translation. Conflicts: sc/source/ui/docshell/docsh8.cxx Change-Id: I234c4bceaa1a6aadbd259cb8d9b6cb6f16bf91c2 Reviewed-on: https://gerrit.libreoffice.org/8806 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-04-10fdo#75376: configure: disable LTO by default for MSVC tooMichael Stahl1-6/+5
MSVC 2010 LTO triggers some bug in painting Writer documents; unfortunately it's not possible to put a VCVER check in there to enable LTO by default only for MSVC2012 because the compiler detection actually uses the ENABLE_LTO value. Change-Id: I29ecdd552d8a8bbd673a844e6bf0c938a98825c2 (cherry picked from commit 0d8e3a145901ab0124d40d33a50e2de28dc0c8ab) Reviewed-on: https://gerrit.libreoffice.org/8918 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-04-09Related: fdo#73544 change double quotation charactersJoan Montane1-2/+2
Change-Id: I1603dfad68261c917532f88397305eef57356da6 (cherry picked from commit 20fb1bfc72e626251b435bcff2339e1e425c7130) Reviewed-on: https://gerrit.libreoffice.org/8911 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-04-09Updated coreJoan Montane1-0/+0
Project: dictionaries a042ec0063d8f6976de5c28d12dd035b67142ad2
2014-04-09Resolves: fdo#73544 rename acor_ca to acor-ca-ESCaolán McNamara2-2/+2
some more investigation into why bare language autocorrect files are accepted needed but this is a reasonably safe backportable to 4-2 fix Change-Id: Ia294219e3c9d98710c6727238cedc15b040b408d (cherry picked from commit d80d7e52d25dde05c834c9e87dd6a253bf6fcfed) Reviewed-on: https://gerrit.libreoffice.org/8910 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-04-09fdo#71729: Fill the range edit boxes after the table is fully initialized.Kohei Yoshida4-14/+34
Otherwise the range formula expression would not be available yet. (cherry picked from commit ffaaf35206b8f049bb9e9ffd7a85c8ebd758a21c) Conflicts: sc/source/ui/namedlg/namedlg.cxx Change-Id: If9c5040366f9038e8094fd5448ca5e4ee2e73edd Reviewed-on: https://gerrit.libreoffice.org/8896 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-04-09WaE: -Werror=sign-compareCaolán McNamara1-1/+1
Change-Id: I160a760a13c8e5140d6df295a9dffd05cf5e7b81
2014-04-09fdo#70666 avoid only bad Graphite ligature replacementLászló Németh1-3/+5
Change-Id: Ibd42c70edbd8a5ca5eba34bcb92e801c8dc97ba0
2014-04-09fdo#70666 fix Graphite ligature replacement at line breaksLászló Németh1-3/+11
Change-Id: I5b7c149f7f419ba18bd2cc59f4e77a0b61280caa
2014-04-09Resolves: fdo#76930 explictly list common lang-independant template dirCaolán McNamara1-0/+1
(cherry picked from commit 6f48d0bb2d3f3b4e4d3e46d3a5cdeaa552df1933) Change-Id: I50d8efe46fc2eb3dfe615ad1f6eb7ee03cdcd29a Reviewed-on: https://gerrit.libreoffice.org/8909 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-09fdo#69157 Apply object-in front selection on mouseUpLennard Wasserthal1-8/+11
Before, all selection was recklessly replaced when you clicked something else than a scaling handle (or the like). It caused bug 69157. But now, you can still drag the frame by gripping the interior one. Btw, that the timer did not correctly start was because of the return statement in the prior state. Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6 Signed-off-by: Lennard Wasserthal <Wasserthal@nefkom.net> Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-04-09Resolves: fdo#77174 crash with "New style from selection" with ListCaolán McNamara1-9/+13
was coverity#1130423 Dereference null return value (cherry picked from commit a434a8bfdd8b9323c8262edcd591641fe9ea8b19) Change-Id: If6981a9654a114e34dad931381ea071d5169adc2 Reviewed-on: https://gerrit.libreoffice.org/8905 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-09fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude caseMiklos Vajna1-1/+23
This is still not perfect, but at least we now don't do the opposite of what was asked. Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11 (cherry picked from commit c2af50eb6df396c957890a6b912b8f3185893551) Reviewed-on: https://gerrit.libreoffice.org/8904 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-09fdo#77140 embeddedobj: avoid unneeded conversion in ConvertBufferToFormat()Miklos Vajna2-0/+13
The primary reason is not performance: on export currently we loose some EMF+ properties. While it would be good to fix all those problems one by one, this is a small fix to avoid all kind of roundtrip problems in this situation. Change-Id: If5e1c1eabd8290f36b538e374c9707ae17097786 (cherry picked from commit 2a7fdf2a7bb7345c49c988dfd1fcdb41cebb8a1e) Reviewed-on: https://gerrit.libreoffice.org/8903 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-09liblo: We need to provide LibreOffice with fake command line args too.Tomaž Vajngerl1-0/+1
Change-Id: I34f364e63f814921bfe88af7cdf4ff4cdf6745fa Reviewed-on: https://gerrit.libreoffice.org/8894 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-09hidpi: Forgotten rounding.Jan Holesovsky1-1/+1
Change-Id: Ie790b40ac86708768f52084538aa08f99df7def6 Reviewed-on: https://gerrit.libreoffice.org/8895 Reviewed-by: Keith Curtis <keithcu@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-09Updated coreAndras Timar1-0/+0
Project: dictionaries c310e2bd2a6c2f7074dc9ddc02e6bb9ce9239b77 Updated pt_PT dictionary to 14.4.1.1 Change-Id: I08e8377a23a7a2aa7709a0418476d872a476c6ca Reviewed-on: https://gerrit.libreoffice.org/8899 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-08fdo#75741: Re-implement CompileNameFormula for formula groups.Kohei Yoshida22-137/+334
(cherry picked from commit 355baf573425165cbc1c789a6271eb29940e1f76) (cherry picked from commit 615f6aa293a6da90da94e6e78828198ffbc0ca5e) Conflicts: sc/inc/document.hxx sc/source/core/data/column4.cxx sc/source/core/data/document10.cxx sc/source/core/data/table7.cxx sc/source/ui/docshell/docfunc.cxx sc/source/ui/undo/undocell.cxx sc/source/ui/unoobj/nameuno.cxx Change-Id: I57e1e464ac5f7abc10ce5ea5752e036ddb6cf6d7 Reviewed-on: https://gerrit.libreoffice.org/8889 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-04-08fdo#77059, hidpi: Increase the threshold of what DPI we consider hi-dpi.Jan Holesovsky1-11/+19
Conflicts: vcl/source/window/window.cxx Change-Id: I79802df4c11b3543140672419d78b697848b7c36 Reviewed-on: https://gerrit.libreoffice.org/8892 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-04-08coverity#708388 Uninitialized scalar fieldCaolán McNamara1-0/+1
Change-Id: Idaa2ec4863beb6be790022c3c66bc4a72e9bf626 (cherry picked from commit 409ebeb20d1ee4552ac21bd739ae4e25eaeb68d9) Reviewed-on: https://gerrit.libreoffice.org/8891 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-04-08CVE-2014-0160 heartbeatCaolán McNamara2-0/+109
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8 (cherry picked from commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619)
2014-04-07fdo#75772 Correct name of Outline Numbering dialogLaurent Balland-Poirier1-1/+1
Change-Id: I14ffe5a9135f0fc37f839a386f4dc63c5831b9d4 Reviewed-on: https://gerrit.libreoffice.org/8875 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-07fdo#74823 RTF import: work around wrong table column width on invalid inputMiklos Vajna4-7/+96
This scenario is not a valid one, Word doesn't handle it, either -- but the old LO 3.4 parser did. So add minimal support for it to avoid the regression. (cherry picked from commit 0a215b9a980e68f899ad548f780bbe5a1fec8732) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Icc2e8d3bf314e9cadda57956668033aa6d092457 Reviewed-on: https://gerrit.libreoffice.org/8871 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-07fdo#76298: sw: do not start up every OLE object on deletionMichael Stahl1-8/+9
First check if it's actually a Chart embedded object; starting up external processes on Windows for arbitrary OLEs is likely expensive. (regression from 1ba29be90f7141077f2d079d40dffc2efd4f1a2c) (cherry picked from commit 206848294f686a0ccf4c741d7e92a2314a88ea48) Conflicts: sw/source/core/ole/ndole.cxx Change-Id: I3c64444b6cf4d4f791cafc77ec1f9b2b0150ad1b Reviewed-on: https://gerrit.libreoffice.org/8881 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-04WMF import: restore support for the ImplReadDIB(bFileHeader=false) versionMiklos Vajna2-1/+3
Regression from commit f7799c9317cc3187ae8aaedc36f829d478a59e77 (Resolves: #i124467# add check for image data offset..., 2014-03-28). Change-Id: I71e78aefca2ca5b07f763ec798226b9bb39a5254 (cherry picked from commit 9984807f17593b97778fc31824c50706ea2e826c) Reviewed-on: https://gerrit.libreoffice.org/8849 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-04Uploading libcdr-0.0.15: Support for CorelDraw x7Fridrich Štrba3-20/+2
(cherry picked from commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a) Conflicts: download.lst Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520 Reviewed-on: https://gerrit.libreoffice.org/8845 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-04accept proper number style condition != as not equal operator, fdo#76777Eike Rathke1-1/+8
ODF 1.2 specifies '!=' as not equal operator in <number:number-style> <style:map> style:condition attribute. So far '<>' is written, accept the correct operator. Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1 (cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd) Reviewed-on: https://gerrit.libreoffice.org/8834 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-04-04bnc#821208 DOC import: fix unwanted char background in numbering char styleMiklos Vajna3-1/+4
Word supports formatting the paragraph parker itself, and we import that as a formatting at a position after the last character (e.g. "foo" will have that formatting at char pos 3, which is ignored by the layout). In addition to this hack, commit 1c22545edf9085b9f2656ca92781158b6b123db3 (Fix issue #i119405: Numbering text style changed after importing the *.doc, 2012-08-24) added a SwTxtNode::TryCharSetExpandToNum() hack to Writer core, where in case such a paragraph marker attribute is set, and the SwTxtNode has a numbering, then also modify the associated character style as well. As that commit already noticed, there are attributes which should not be propagated to that character style. Extend this blacklist to ignore RES_CHRATR_BACKGROUND as well, as Word does. Change-Id: Idcb40d37d8688c76fbd61f28428f6e3bc995f799 (cherry picked from commit 5a5d948e230dfea61108452579b68da75706cad4) Reviewed-on: https://gerrit.libreoffice.org/8827 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-03fixed display of available dictionaries stringsEike Rathke1-2/+2
Since commit 9dc57be59d1a8dc17e77f21cbce04e2bb7247dca under Tools->Options->LanguageSettings->WritingAids "User-defined dictionaries" the language strings are displayed as " '[' Language (Country) ']'" that before was and instead should be "[Language (Country)]" Change-Id: Id7e7ef6ab86112c46707f1451a072dfc196aec44 (cherry picked from commit cc658066aec0a0f9589e7f9522c4431b3a3d5e96) Reviewed-on: https://gerrit.libreoffice.org/8829 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-03coverity#707971 Uninitialized scalar fieldCaolán McNamara1-2/+11
Change-Id: I5c1045253c082a00397cf0f048baee947232c9b1 (cherry picked from commit 4ab06a576313de973ae96787a19215b208737859) Reviewed-on: https://gerrit.libreoffice.org/8820 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 17:11:06 +0000