summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-18Version 4.3.0.1, tag libreoffice-4.3.0.1-buildfix1libreoffice-4.3.0.1-buildfix1Christian Lohmaier3-0/+0
Change-Id: I55d2a63f276f515436ed818ad2d7a4d8acec20f4
2014-06-17writerfilter: try to make tinderbox happy againMichael Stahl1-1/+1
Change-Id: I445303e52fbfaa58e68c01970e21941537484506 (cherry picked from commit 31376a31d12a22d4870bbe4033dbbce18c13f07d) (cherry picked from commit 5d0552a34dbc34c840aaa7a3e5fb48cb247ac623)
2014-06-17Version 4.3.0.1, tag libreoffice-4.3.0.1libreoffice-4.3.0.1Christian Lohmaier3-0/+0
Change-Id: I43faebd054f66606211fa6e35acc1ec84de45915
2014-06-17bump product version to 4.3.0.1Christian Lohmaier1-1/+1
Change-Id: Iaa62e15c83e12b6d3523ff4e1db496dd157fedb7
2014-06-17n#825305: writerfilter RTF import: override style properties like WordMichael Stahl6-16/+103
It would certainly be immediately obvious to any reader of the RTF spec that \sN will apply the style with index N to the current paragraph. But actually, that is not what Word does when it reads \sN... what it really does is to apply the style with index N, and then for every attribute in that style, apply the same attribute with a default value to the paragraph, effectively overriding what's in the style. If that doesn't make any sense to you, well, have you heard the joke about how many Microsoft engineers it takes to change a light bulb? Also, \pard apparently implies \s0. To implement that, change RTFSprms::deduplicate() to recursively look for style SPRMs that are missing in the properties, and put in default ones, currently just for 2 keywords \sa and \sb. This requires changing deduplicate() to be const and return a new value, since it is no longer idempotent, as the erased SPRMs would get defaulted on the next run. While at it, fix RTFValue::equals() which did not compare m_sValue. This fixes the testParaBottomMargin test that was broken by the fix for fdo#70578. Change-Id: I4ced38628d76f6c41b488d608a804883493ff00b (cherry picked from commit 1be0a3fa9ebb22b607c54b47739d4467acfed259)
2014-06-17fdo#70578: writerfilter RTF import: by default style is para style 0Michael Stahl3-0/+46
quoth the spec: "For <style>, both <styledef> and <stylename> are optional; the default is paragraph style 0." Of course in order to do that we need to add support for at least recognizing the \dsN and \tsN keywords to override the default, so that table styles don't become paragraph styles. Change-Id: Ic100768581f9e8c327063ff776fbd61ac4242483 (cherry picked from commit 6c0e1270889deb513f961f864dfc1c02ee8705f4)
2014-06-17LOK: Split into instance and class.Andrzej Hunt5-28/+61
Change-Id: I2b6f33eaf12343c7da1328a932eb703bb4e4ef6f Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2014-06-17Updated coreChristian Lohmaier1-0/+0
Project: translations 2dabf761181e279d34269cc0c4dd7922e6d93d05
2014-06-17Related: #i125020# fix the calculation of the text-update rectangle...Herbert Dürr1-6/+9
in CoreText by doing the calculation before CTLineDraw() updates the text position. Requesting the update early is possible because that update region is not used until AquaSalInstance::Yield(). (cherry picked from commit ee042661b996fd00d5504caf4f4be60f77bf880f) Conflicts: vcl/aqua/source/gdi/ctlayout.cxx (cherry picked from commit d2bbef3d3d6c7be096175ddbdb788ece5067f5fc) Conflicts: vcl/quartz/ctlayout.cxx Change-Id: I317a2068071a2f6d33f34c81e104e30beedc33db Reviewed-on: https://gerrit.libreoffice.org/9628 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-06-17Resolves: #i125020# fix rounding error in AquaSalGraphics::RefreshRect()Herbert Dürr1-2/+5
Rounding left and width down can accumulate a rounding error of almost two in the calculation of right. The existing code compensates for this by increasing the width by two, but since left has been decremented by one to accommodate for antialiasing artifacts this compensation is one to few by itself and two to few when accounting for antialiasing artifacts on the right. Y-pos and height have the same problems and get the matching fix. (cherry picked from commit 073ec69fb970830d39c8700317ee74dbbdfd1fda) (cherry picked from commit ee9dd6c086f7bda615d5b28d3319a83ce1673607) Change-Id: Ia394859035d59c76c67b6b0d53ddc6cf88582bfe Reviewed-on: https://gerrit.libreoffice.org/9626 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-06-17Resolves: #i125086# correct implementation of css::text::XTextField...Oliver-Rainer Wittmann3-15/+53
in Writer to reflect changes made for the in-place editing of Input Fields (cherry picked from commit 90b633455a6e54300330e68e71e22e729b445f31) Conflicts: sw/source/core/txtnode/atrfld.cxx sw/source/core/unocore/unofield.cxx Change-Id: I39de2b5074c2e7d8671ad2c0a3c01a29ccfc7882 (cherry picked from commit 41d43bc95b64e1907709141fcd8b6ce08b0841c8)
2014-06-17missing SetForbiddenChars callCaolán McNamara1-0/+1
Change-Id: I03a26d49210c3dfe89abd31e5c754fafe2b7acee (cherry picked from commit f219ec6b5e09b55466ce313d73929670cf11a989)
2014-06-17fix sd_import_tests after e42c05c1f96832572e525d85d89590f56f5a29ddMatúš Kukan1-2/+2
Change-Id: Ife852a6c7c360c66a7d7d5b144f18898398505dd (cherry picked from commit 5158f5e9fdffe31f54b6da9e75164a99d10ad617)
2014-06-17bnc#882631: keep line visible if proportional line spacing is < 100%.Matúš Kukan2-2/+11
If line height is smaller than text height, we still want to see whole first line, so add the difference where necessary. This also helps to see paragraphs as separate to each other. Change-Id: I51a87edf0cc03d5b5e130290c90347099a581d4e (cherry picked from commit e42c05c1f96832572e525d85d89590f56f5a29dd) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-06-17bnc#882627: Allow to edit spacing to contents even with no borders visible.Matúš Kukan5-3/+13
SfxItemSet::MergeValue changes some items from SFX_ITEM_DEFAULT state to SFX_ITEM_SET which I think is a bug but this patch avoids the problem too. The issue was: visible changes in some tables, after changing e.g. borders spacing, because the cells had wrong SfxItemSet after the process. Change-Id: I676b211e1a4a1d7341c385d63503aa740718ed5d (cherry picked from commit b1d8df61b47e84bf0de64342556049673dd9c543) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-06-17external/librevenge,libmwaw,libodfgen,libwps: fix self-linked symlinks build ↵Douglas Mencken4-4/+4
problem ...LibreOfficeDev.app/Contents/MacOS/librevenge-0.0.0.dylib: Too many levels of symbolic links (librevenge-0.0.0.dylib --> librevenge-0.0.0.dylib: broken symbolic link to librevenge-0.0.0.dylib) The reason for this is that symlink librevenge-0.0.dylib (UnpackedTarball/librevenge/src/lib/.libs/librevenge-0.0.dylib -> librevenge-0.0.0.dylib) is copied via cp --no-dereference, thus becoming linked to self. Change-Id: I4b918c35c594800fb2d7f84ee0ee9f2ff2a5fe14 Reviewed-on: https://gerrit.libreoffice.org/9783 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9f339a89453808b917177a3ee675a76385758902)
2014-06-17Allow building with more recent glm versionsTomáš Chvátal2-9/+9
Use glm::scale(glm::vec3(x, y, z)) instead of glm::scale(x, y, z) Cherry-pick of: 7da3ce7cdb05bcced9ba61724e33d7a395e44e10 Change-Id: Ib9ad6b57cb6b74c8c43c9f6b48f312bfc499ffbe Reviewed-on: https://gerrit.libreoffice.org/9808 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-06-17GPU Calc:Support nested formulae expansion for simple nestedhaochen4-75/+142
Change-Id: If1ae42a5481cf76942ff1ac5e0ee31a94159badd
2014-06-17GPU Calc:Add more judge for NAN in SingleVector parameterhaochen1-4/+4
Change-Id: I01f2576e9d8f6a2e677d1fb08097bc81f15bfbe0
2014-06-17GPU Calc:Support default 2nd parameter in ROUNDhaochen2-5/+13
Change-Id: I003ba9c945dbc3c6417d0502902610c0eaff2bda
2014-06-17GPU Calc:Support 3rd parameter in FLOORhaochen3-94/+79
Change-Id: Ie3a265f34a5f589d41e802b63df4be6a64989b05
2014-06-17GPU Calc:Support IF formula in GPUInterprethaochen3-0/+63
Change-Id: I9b2cebb99812d28e25c961129f73585d60690846
2014-06-17GPU Calc:Support string arguments in VLookuphaochen5-35/+124
Change-Id: Ic2400a13c07c5b08beccaeffef4899c8f8b43af8
2014-06-17document must be set modified when range name is defined, fdo#79451Markus Mohrhard1-0/+1
Change-Id: I382bef9b95d40a1abac993795e8da540b5aa5d18 (cherry picked from commit 1c8babfdb0808318bbaa94e911c819456a65337e)
2014-06-16Revert "Make glTF support an experimental feature"Zolnai Tamás6-38/+8
There are others who think this will work better before the release. This reverts commit 653bac184f579524bc25a9f40281763a736ae6fd. Conflicts: sd/qa/unit/import-tests.cxx xmloff/source/draw/ximpshap.cxx Change-Id: Ie8747745a9a89ce4d6500a35d15a98e28bda840a
2014-06-16DOCX import: fix additional empty paragraphs around footnote textMiklos Vajna5-1/+18
Regression from commit abe1e852a232e3bdab7b9177d099fe3929f5a4aa (handle properly page breaks even if a page contains only a frame (fdo#55381), 2014-04-21), DomainMapper::lcl_endSectionGroup() inserted an empty paragraph before and after the real footnote text. Disable addition of the dummy paragraph for footnotes. (cherry picked from commit 4d120b6ab181f530d3fedc963b1c6ec777f2608a) Signed-off-by: Luboš Luňák <l.lunak@collabora.com> Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I6e1954c9bd5520ac284d66244ce1c9004e970305
2014-06-16Cache table entry may be null. Let's not assume it's always non-null.Kohei Yoshida1-5/+11
This is done intentionally because we do need correct table index when resolving external reference. This requires we do need to allocate array with the same sheet size as the remote document. But we don't allocate Table instances for remote sheets that we don't reference, to save memory. Change-Id: I27fb6228f0e4558327aa4a04a6bccce8d2f1085f (cherry picked from commit 3dcfb9a892e528a386bb304e4e00d2fa34b1de25)
2014-06-16Resolves: #i125055# follow-up of fix for #i124338#Oliver-Rainer Wittmann1-4/+20
adjust condition to trigger sort of bookmarks in order to avoid serious performance decrease Kudos to Ariel for his analysis (cherry picked from commit 6895a55d74fe6a3b70ba15f77050652d3afee821) Change-Id: Ic72b0a07556ec85a6ee2568f814b8bcfaaabe42e (cherry picked from commit 61df5e69df443dad24acbd8257a83aadb3888099)
2014-06-16Reduce test doc size, use a simpler gltf modelZolnai Tamás2-2/+2
(cherry picked from commit e38acfa15b52353565ad9ddaf3cf96dd13c5b0fb) Change-Id: I5bd78343728f8a4d68610397a7be328826a0334c
2014-06-16glTF import/export: fallback must be the second one inside the frameZolnai Tamás4-25/+79
The previous solution was good because older LO versions import the fallback image without changing their code, but it came out it does not fit to ODF standard so export fallback image as the second object after the glTF model. (cherry picked from commit 4d8c4e7fe3e9b0ec6e14b5475a29d119e2023065) Change-Id: Ib9b2044b1f36b32d980cb79f6dac8dcf94d6209b
2014-06-16glTF export: Use plural folder namesZolnai Tamás4-5/+5
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a (cherry picked from commit 9ee69cbd6f1143160aa96001462b933770cc6b76)
2014-06-16Resolve fdo#79913 by checking index boundsArnaud Versini1-1/+1
Change-Id: I023a625d73724332245d612a61cb786acefc4cf2 Reviewed-on: https://gerrit.libreoffice.org/9791 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7eceffef49c9f498c5758d5e351c0f22126003e5)
2014-06-16Updated coreAndras Timar1-0/+0
Project: translations 14553f16b509dab361f4afcb1185c22b028dd3f2
2014-06-16fix build error "error: NSPrintJobSavingURL was not declared in this scope"Douglas Mencken1-0/+4
see commits: c5c317ed20933c6508b35c34039df31669943f1c Change-Id: I3a886bde11dc3620cffeb3e2e579c7b37285d9c5 Reviewed-on: https://gerrit.libreoffice.org/9759 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e509b9303bd0141143bc6e707f98a72b96d91311)
2014-06-16workaround for kCTForegroundColorFromContextAttributeName unavailabilityDouglas Mencken1-1/+4
fixes "error: ‘kCTForegroundColorFromContextAttributeName’ was not declared in this scope" see commits: 5bc5387669bca8a0b410e295b0992fd2424a1536 Change-Id: Ifdf69ab2f9a6437d18a6d3e3f5d756beeed3ba5c Reviewed-on: https://gerrit.libreoffice.org/9758 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4af1b789545bc3815f79fafed5b1806b3c08b69d)
2014-06-15Resolves: fdo#80025 Crash with Thunderbird/Icedove address bookJulien Nabet2-4/+0
There's no property USEBOOKMARKS for mork/moz (regression from 0fadbdbbdbd55cf60f9a202f1cf7b1d60517078c) Cherry-picked from 488f31200094d7237d45545ab227014831a1f8e6 Change-Id: If81f063fad2d702c9d8b0bb4147757655cb016cf Reviewed-on: https://gerrit.libreoffice.org/9787 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-06-15Fix --disable-gltf buildZolnai Tamás1-0/+3
saveAndReload tests export, which is needed only when gltf support is enabled. Change-Id: I08152c12db77ad2fc623f2699784b968378686db (cherry picked from commit 634530620e6a51c5ea8f1596f6ab51b2a7e2ea9c)
2014-06-13Don't use the CoreUI private framework when sandboxed (i.e., for App Store)Tor Lillqvist1-0/+14
This conditionally reverts 0c7e6080519014f1fb345ed25e2f12c9a043b3ae. Change-Id: I462016cd43c489fced7fb3739aa98c521d52f78e
2014-06-13fdo#77979: Make rtl_TextEncodingToWinCharsetRTF work for non-UnicodeStephan Bergmann1-24/+17
"LC_ALL=C make CppunitTest_sw_rtfexport" was still failing after e47a02b1524061143d8e77a54eb95c77f2e6dae2 "fdo#77979: sw: RTF export: write non- ASCII font names encoded," so for each given eTextEncoding determine a Windows charset that can at least encode the font's name, and not only for Unicode- related eTextEncodings. Change-Id: If547566bb0cffc60411d8f667d76749a904f7a3f (cherry picked from commit 0dc7d6367dcedff8741b64f5b8775ebf26f7f14f) Reviewed-on: https://gerrit.libreoffice.org/9762 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-06-13fdo#76633: writerfilter: RTF import: do not leak the XShape of imageMichael Stahl4-12/+27
RTFSdrImport::resolve() is called for \picprop and creates an XShape that is stored in RTFSdrImport::m_xShape and also DomainMapper_Impl::m_aPendingShapes; later RTFDocumentImpl::resolvePict() completely ignores that XShape and creates a new one, which is also inserted in the document; the first XShape is effectively leaked. Try to avoid that by re-using the exising m_xShape in resolvePict(). Not sure if there are any problems with doing this, it's all a bit confusing. Change-Id: I98456242acb0766f547eb8f7d877f51d53323f3a (cherry picked from commit ba9b63d8101197d3fd8612193b1ca188271dfc1a)
2014-06-13fdo#76633: writerfilter RTF import: disappear the rectangle shapes on imagesMichael Stahl5-6/+62
If the shape properties are inside \picprop destination, don't set shapeType. (regression from 9f1f7199736e2ae07b34849ba66f61a1ef5782e8) Actually this does not fix the root cause, this is just a work-around, the extra shape is still inserted but it's invisible now. Change-Id: I6cf093de2a5657533f393863ed8010ae083bec16 (cherry picked from commit b7857e5cfe9d5d007785ae93e5505620fc8ed475)
2014-06-13resolved fdo#79978 propagate error through DoubleArray of matrixEike Rathke4-8/+24
Regression introduced with 83f77ab0661df992f241e5f9ecb1aa8f8eaeafec. Interpreter errors are transported using NaN coded doubles, using simple setNan()/isNan() to flag and ignore non-numeric values skips all error values. Change-Id: I0d3cb30262bc5ba7ee77e53a2bc45e56569fbc4b (cherry picked from commit a288bebbcec0b16e1ced09a601de5ffbb6b1bbe0)
2014-06-13resolved fdo#79957 propagate ForceArray through jump tokensEike Rathke4-7/+17
ForceArray parameters weren't propagated and enforced to array arguments on svJump tokens (FormulaJumpToken), namely IF, CHOOSE, IFERROR and IFNA. Change-Id: Icf9074f11b826655a52858d778d9a0122d207aa4 (cherry picked from commit c9d037e5e8e5850e9c69372580e7a506b573fc2a)
2014-06-13Rename makefile to StaticLibrary_libreofficekit and clean up.Matúš Kukan2-16/+1
It's static library since d324745fe95c7f0fad56f146e1e33f994a0d5de6. (cherry picked from commits ab6394bd62f2c48ed5f80ac318ca148beb36fa88 and 9d1e6613c4cf40ef66d9775a8c362e63cf3736d0) Change-Id: I726af96d6d9158010d2c2121ab2b43a78ad69698
2014-06-13allow extensions to override Access2BaseLionel Elie Mamane1-1/+2
In particular, this allows users or administrators to upgrade Access2Base by installing the extension version of it. Change-Id: I1650e5beced0fd168afa029dbac2025e2fa16e1f Reviewed-on: https://gerrit.libreoffice.org/9755 Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2014-06-13kmz2gltf: Use LO's ZipFileAccess to unzip kmzZolnai Tamás5-8679/+30
Instead of this hacky collada2gltf patch. Change-Id: I9f15c4ee1c9ea1a1a64116691b12b696c1d63ac5 (cherry picked from commit 3d300f1e86624b989863639626c6220e20a5b3fb)
2014-06-13glTF: Avoid segmentation fault when one of the input files can't be loadedZolnai Tamás3-1/+100
libgltf: Parser releases the glTFHandle, but it was not connected to the corresponding handle by RenderScene::initScene. So when rendering stopped during file loading because of missing file, Parser's handle member was an uninitialized pointer so it crashed by calling release method. (cherry picked from commit 6904c836b203acbe87a85446a0c59bfbed359240) Change-Id: I80099195341766f474143014d5949703d47a6fd8
2014-06-13Extract kmz and collada converter code to a seperate functionZolnai Tamás2-60/+82
Plus fix some problems related to temp files. e.g. kmz converter was creating temp files next to the input file. Change-Id: Ib3f367fe1c4ef3cb25f5ca1c3d06b2dde78c5e45 (cherry picked from commit 573ced4087f46788a8596fb89c657d3427be4bf8)
2014-06-133D model insertion: display extensions in the filter selectorZolnai Tamás1-3/+3
Change-Id: I8c7b7a311cbd38058540d3462b0497ebe3d28a9e (cherry picked from commit ca3a1e1c6bc8ef25d717566a093c73e07fe6461c)
2014-06-13Change glTF mime type: {application -> model}/vnd.gltf+jsonZolnai Tamás6-5/+6
There is no an accepted mime type for glTF models yet, so follow collada's mime type: model/vnd.collada+xml. Change-Id: I1e23a95dbb0caea781dade819f8e08235cb5c1dc (cherry picked from commit e8fcf1153fd93b4f8155da0d571935125367a59b)