summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-29Collabora EULA integration to 4.1 build systemAndras Timar
Change-Id: I0c5bf15762a67dc629b35c7d07a90c87e722a20d
2013-10-29Collabora versioningAndras Timar
Change-Id: I4cb50e83084ecf5a8322260dd64650510bd286c4 major: 4, minor: 1, obviously micro: 10, higher than any TDF builds, so we rule patch: 1, it will be bumped for PTF releases
2013-10-29add Collabora EULAAndras Timar
Change-Id: I38f0a87398fba79e03b3e4e85b3c89aff95218bb
2013-10-29fix transparency of Collabora branded start screenAndras Timar
Change-Id: I893d50316e51e4f8dd6f050071f44e4f0d5ab038
2013-10-28Collabora brandingAndras Timar
Change-Id: I4afa3377314a73de28c32737df09e9dd89789e4a
2013-10-28fix for bnc#819865 itemstate in parent style incorrectly reported as setNoel Power
Problem occurs because attrs set with default values are reported as set when queried Change-Id: I89d6c3b09312fb78052d87ff20aa12c6fbe7bc98 (cherry picked from commit bf8e9b29aaebcbdd8f2f06b42ac97b8d9f8f4503)
2013-10-28fix another instance where the index is broken for pagebreaksNoel Power
Conflicts: sc/source/ui/vba/vbapagebreaks.cxx Change-Id: I5c3215373c0a63c2831d7be5005f1b04a0645e99
2013-10-28Unfortunately mstahl's fix for the webdav-neon deadlock was not sufficientTor Lillqvist
Even if stopTicker() now by itself is OK, it is called from removeLock(), which already has acquired the same mutex that stopTicker() now carefully makes sure to not hold when calling join() on the ticker thread. (Remember, our mutexes are recursive.) So we still easily get a deadlock. So for now, just don't bother with the micro-optimisation of stopping the ticker thread if there are no WebDAV locks to refresh.
2013-10-28bnc#805901: Lock WebDAV document that is opened for potential modificationTor Lillqvist
Really horrible fix, breaking all rules of proper abstraction etc. Basically, two parts: 1) When opening a document over WebDAV, in Content::execute(), lock it too. This is simple. With just this change, the WebDAV resource gets locked but it stays locked for the rest of the soffice.bin lifetime, even if the document is closed much earlier. This also means you can't re-open it without re-starting LibreOffice... The NeonLockStore (which is effectively a singleton, as the only object of this type that exists is the static NeonSession::m_aNeonLockStore field) destructor takes care of blowing awway the locks when the process exists. So obviously that is not good enough. Thus a second part is needed: 2) Then closing a document, over in SfxObjectShell::Close(), do a horrible trick: look up the ucpdav1 module, and if it is loaded, look up the NeonSessionUnlockByUri() function in it, and call it, passing the document's URI. That function, in NeonSession.cxx, looks up the NeonLock for the URI, and if it exists, unlocks it, and removs the lock from the NeonLockStore. Conflicts: ucb/source/ucp/webdav-neon/NeonLockStore.cxx ucb/source/ucp/webdav-neon/webdavcontent.cxx Change-Id: If9af1f8b5d3a89cdea34ccd0b751d5f671ccccba
2013-10-28ucb: NeonLockStore::stopTicker(): avoid deadlockMichael Stahl
Tor reports that NeonLockStore::stopTicker() m_pTickerThread->join() can deadlock with TickerThread running NeonLockStore::refreshLocks(). This can be avoided by copying m_pTickerThread to the stack, and releasing the m_aMutex before calling join(). Change-Id: I387f83a530c5b893f79fa677b1092e0902c8af65 (cherry picked from commit 68ba2785c55eaa1ea70ce135bdad5322b0e04ed7)
2013-10-28follow fix for bnc#813528Noel Power
Conflicts: sc/source/ui/vba/vbapagesetup.cxx Change-Id: Id6c9cd01bc68e13b87c845d9272c7b85756987c5
2013-10-28write display attr of hyperlink only if value is different from stringtableNoel Power
Conflicts: sc/source/filter/inc/xecontent.hxx Change-Id: Iff6f16d6cdb539ad80ef01e91db51613e95053d1
2013-10-28fdo#68903 Import .tsv and .xls plain text files in Calc by defaultMaxim Monastirsky
Change-Id: I14115542d7f0401f4fa8face9f255b4512fc0ac3 Reviewed-on: https://gerrit.libreoffice.org/6448 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 8a201be240b6d408d15166be7ffc576b9e123634) Reviewed-on: https://gerrit.libreoffice.org/6465
2013-10-28fdo#70100 Detect single stream excel files with BOF ID 5Maxim Monastirsky
Change-Id: I321b7a08e0436a9c33878acd1ce2f98c497040b5 Reviewed-on: https://gerrit.libreoffice.org/6447 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 71882916f617528a6d6fcc54450674dc3f630319) Reviewed-on: https://gerrit.libreoffice.org/6464 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2013-10-28bnc#825891 fdo#69893 fix SwWrtShell::SelAll() to work with empty table at ↵Miklos Vajna
doc start In theory, it was a problem to have the table cursor around when having the selection outside the table; but it didn't cause a problem so far. However, when the table has one or more empty cells, we really need to leave table mode, otherwise only the table gets selected. (cherry picked from commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41
2013-10-25fdo#65102 respect user's choice not to install desktop iconAndras Timar
Using advertised shortcuts -- inspired by Intel AppUp Centre's requirement -- was not a good idea after all. I revert this, and I also revert the commit that actually disabled it in default Windows builds. This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e. This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6. Change-Id: I5b465574f7a178fadcdca03a0fe0d68d76621341
2013-10-25librelogo: fix division with measurementsLászló Németh
Change-Id: I2204002533bbb3e7c801b3228b0310a42b19a882 (cherry picked from commit 7744c4a0016be338c6c14b14f620d8af7d76111e)
2013-10-25valgrind: on success aHDFData is out of scopeCaolán McNamara
and pData points to data belonging to it (cherry picked from commit b7efab3a9841a9f01c5da07db870a22866b65b04) Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Change-Id: I2a3c1f73e4cdcb07d21ef14cb410d351f39cdba8
2013-10-25pEmpty is completely insane to useCaolán McNamara
DbtToStringConverter protects against a NULL pointer, but not a pointer to the too short data that pEmpty provides Change-Id: I5d21e852ce0373eff7d3627e266b9cbc77f5dd09 (cherry picked from commit d94f3a68f77de906abd576c7e2f31e0a8586d154) Reviewed-on: https://gerrit.libreoffice.org/6421 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-10-25bnc#835985: When printing handouts using the default, 'Order' did not count.Jan Holesovsky
"Left to right, then down" was the same as "Top to bottom, then right" when printing handout; set the 6 pages explicitly as the default. Change-Id: I4a5f58c8fcf2efdc85ad7bb23bde791c5fb87584
2013-10-24bnc#759197: adjust chart layout distanceFelix Zhang
Change-Id: Ifae4faeb234630dcce79851a0ad8bb0c6960f9f7
2013-10-24fdo#67534: try to avoid file locking in Explorer shell extensionsTor Lillqvist
Change-Id: I287395f6c25b1bfb9b9482166ae6f34d9af8f455
2013-10-24some Worksheet.Change supportNoel Power
Change-Id: I91203e74d54adba17a20ef7b7d835d9ac49855be (cherry picked from commit 20d792d6379600df8b56a2735f9dd1cb63967e4d)
2013-10-24i106278 - Window.ActiveSheet,Window.FreezePanes,Window.Split, Window.ViewPedro Giffuni
not working correctly. Patch by: lihuiibm Reviewed by: Chen Peng
2013-10-24do not invalidate existing java setting just because license (bnc#820196)Petr Mladek
The date of the last modification was updated when the license text was added to the list of acceptable java vendors. Unfortuantely, this invalidates the existing user java configuration. It is not necessary becary because the list of valid vendors is the same. The easiest solution and puts bac the original modification date. We should also fix LO to automatically detect the java when the automatic detection is enabled. Sigh, I have fixed many years ago it is broken again. Let's fix this when we really bump the date. Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Change-Id: I80bc6bfa0abaec3c050ee2ed8ccfa6344a0c0cba
2013-10-24disable Liberation fonts on WindowsAndras Timar
Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef
2013-10-24librelogo: fix Writer/Draw synchronization in cropped SVG exportLászló Németh
Change-Id: Id7dc7a2853a8c56ee56eab55c078650e16c278fd
2013-10-24bundle Carlito and CaladeaCaolán McNamara
Change-Id: Ibb68ad33764bcbab88e68c35805a00287177a5c8
2013-10-24is this the foo we need now to download automaticallyCaolán McNamara
Change-Id: I156c2a2d645c140bfd716f41d8c81c0656ceee56
2013-10-24Set carlito/calibri caladea/cambria as MSOffice export replacementsCaolán McNamara
so when we save one of our files that uses the chromium fonts to e.g. .doc we can set the in-file recommended fallback font to the MS equivalents to tell MSOffice what to use. Change-Id: Ia04022c91a7c43729ef315011addf33c316619ee
2013-10-24fdo#69079 - fix multiple user gallery creations.Michael Meeks
Conflicts: include/svx/gallery1.hxx svx/source/gallery2/gallery1.cxx Change-Id: I0539e2708b973b8bea7bd63488277f00201c6c46
2013-10-24i123485 secured file import scanning existing pagesArmin Le Grand
(cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036 and adapted to the rewritten scanBuildPageChainCache) Reviewed-on: https://gerrit.libreoffice.org/6272 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit dfa1afd0e8b7ae9c706c4a3171a04752e24230b0) Conflicts: sot/source/sdstor/stgstrms.cxx Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162 Reviewed-on: https://gerrit.libreoffice.org/6314 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-24curl: libcurl.so.4 goes into instset, not libcurl.so!Michael Stahl
Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file is not actually in the instset, just a libcurl.so with SONAME libcurl.so.4. (regression in LO 4.0.0) Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f (cherry picked from commit 30e1d4c0a9202d5c8057efdb0bfda11f46a25251) Reviewed-on: https://gerrit.libreoffice.org/6411 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-24librelogo: fix blinking LABELLászló Németh
Change-Id: I807dda255b741996480116fab22377b39bf963b4 (cherry picked from commit 022c955f138e350d9a431489380c054d9766a4d0) Reviewed-on: https://gerrit.libreoffice.org/6413 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-24fdo#70741 fdo#66042 rhbz#968892: force render full grapheme with fallback fontCaolán McNamara
Related: rhbz#968892 discard impossible languages for oriya script fallback Related: rhbz#968892 discard impossible languages for glyph fallback Resolves: fdo#66042 get the bounds of the current grapheme (also includes Change-Id: I14f1bab09eb0be9c2c896a1dde45913b99aab6df) (also includes Change-Id: I5b1808d74f0a1dd0d8b6ea22136e574c0a6e8e2a) (also includes Change-Id: I5bb98c61d047e69d74666261b2c489d80f344502) Change-Id: I46d8cacba2b8ca0f24e1c4ba836839387d74e1a4 Reviewed-on: https://gerrit.libreoffice.org/6398 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-24librelogo: fix black (not refreshed) invisible filling colorLászló Németh
Change-Id: Iabfd91f7c72f3dc30f9f1cebe3dfb45a7d1f6763 Reviewed-on: https://gerrit.libreoffice.org/6381 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-24fdo#68657 bool->string conversion to 1/0, not "true"/"falseLionel Elie Mamane
This matches what OO.org / older versions of LibreOffice did, and which was inadvertently changed in 2bd856e6 Change-Id: I1d45ea975a096c599a996caafc41e4aa06d35fcd Reviewed-on: https://gerrit.libreoffice.org/6274 Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-24fdo#70480 do not crash reading malformed zipDavid Tardon
Change-Id: Ibbdf7ce4979f8452c4a662cc9ae3f598cce23126 (cherry picked from commit f2422ab90d92104915b93e96f647a89bbf55ad30) Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/6313 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-24Fix build against the 10.8 SDKTor Lillqvist
Change-Id: I74adcca901e9a7c31d02779b1ee853731a55ea43 Reviewed-on: https://gerrit.libreoffice.org/6253 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-10-24fdo#70319 "exponent followed by at least on digit" also for special case 0.0Stephan Bergmann
Change-Id: I07e7917417b8a22cf6d64f2b7a447f9084b9fa2d (cherry picked from commit 7bbd58eafc3146abcefc73d2d1ca6869bb47ef5a) Reviewed-on: https://gerrit.libreoffice.org/6294 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-10-24Resolves: rhbz#1015594 CVE-2013-2924 use-after-freeEike Rathke
Added icu.10318.CVE-2013-2924_changeset_34076.patch from https://ssl.icu-project.org/trac/changeset/34076 assigned to https://ssl.icu-project.org/trac/ticket/10318 Change-Id: I93a33e59aec9b79fb8d4b1517cd0990c79ee65fb (cherry picked from commit 7693a4b9fbb60105d8438465db51c7afef4c3eb1) Reviewed-on: https://gerrit.libreoffice.org/6268 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-24Updated coreCaolán McNamara
Project: dictionaries ddce99b119fa7c565f0f6d783b2b136434ba9418
2013-10-22fdo#69979 SwCrsrShell::ExtendedSelectAll: exclude headers, tooMiklos Vajna
It turns out, normal Ctrl-A doesn't select headers, footers and fly content, either (just like not selecting footnotes). So do the same when in the "doc starts with table" special mode. Change-Id: Ib9bc397944a4d07ea03bc326f1536733c57f42e6 (cherry picked from commit 232df42b8dc0b4f7a335d2931fc0f29e73b8bca0)
2013-10-22fdo#69862 SwCrsrShell::ExtendedSelectAll: don't always select footnotesMiklos Vajna
ExtendedSelectAll() was originally invented to e.g. select the whole document, change the language of the selection and then inmediately (before the layout is updated) undo the selection. When using it for "select all and doc starts with a table" purposes, then footnotes shouldn't be selected, just like those are not selected either, when the doc starts with a normal paragraph. Their anchor is still selected, and that's enough to have correct delete and copy&paste. (cherry picked from commit 959711f1276106b0aaee69ab660f1b0d3ece5bbc) Conflicts: sw/source/core/edit/eddel.cxx Change-Id: I4fc49db628054a4b8a46effc2d0328eaabcaa9f8
2013-10-22fdo#37606 SwWrtShell::SelAll(): fix for doc starting with tableMiklos Vajna
SwWrtShell::SelAll() can now detect if the body text starts with a table, and if so, it explicitly selects the whole document, not just the first cell of the starting table. Also, SwCrsrShell::EndAction() now checks for this "select all and doc starts with table" situation, and if that's the case, it activates a special select all mode, so layout can act accordingly. (cherry picked from commit 3b11e66ab89c201591d8be8f1ab1af1aba11a821) Conflicts: sw/source/core/crsr/crsrsh.cxx sw/source/core/layout/trvlfrm.cxx fdo#37606 SwWrtShell: fix select all when doc starts with table and cursor ... ... is outside that table (cherry picked from commit 4b6445dba6bb5b2aed3edb4878ecb327446286e9) fdo#37606 SwEditShell::DeleteSel(): handle document starting with a table If the whole document is selected and the document starts with a table, then we used to delete the contents of the document, except the starting table, which was just cleared. Change this and do what is expected: remove the table as well, so the document will have a single empty paragraph only. (cherry picked from commit 0fb4adcff534e3841cf6df0e2363fb0797af7022) Conflicts: sw/source/core/edit/eddel.cxx fdo#37606 SwEditShell: fix copying when doc starts with a table ... ... and the whole document was selected The problem is that the cursor starts at the first cell of the starting table, but when copying, we want to copy the preceding startnode and tablenode as well. (cherry picked from commit 49505336a629a75f4fb48bbe0c532b402e857ed4) fdo#37606 testcase (cherry picked from commit f5fa78d75abac3dbe0f9edf9e9106f63ca5dca53) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: I60d34906a90a5143163e516f618648cf7178430e
2013-10-22w:spacing in a paragraph should also apply to as-char objects (bnc#780044)Luboš Luňák
Otherwise global w:spacing will be used even if overriden locally. (cherry picked from commit 186fc4c434384e07c18ff2dd2bd0e00a49bf17a7) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx [ Miklos: fix build. ] Change-Id: I01f0a3a323566f6e29faf73bf9d2ba874565eb42
2013-10-22compatibility setting for MS Word wrapping text in less space (bnc#822908)Luboš Luňák
The document itself is stupid and uses a SURROUND_THROUGH object with a number of empty lines that make it act is if it in fact was SURROUND_NONE, rather than actually disabling wrapping for the object and be done with it. But the difference was that Word still managed to fit those empty lines next to the object into the little space that was there, while LO already considered the space too small. So keep a compatibility setting for Word documents in order to avoid problems with such lame documents and hopefully that's enough. (cherry picked from commit 8f8b31abd02876c3601e343b8b3274754f8a61b6) Conflicts: writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyIds.hxx Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
2013-10-22fdo#66474 DOCX import: fix handling of mixed fixed/auto cell widthsMiklos Vajna
Instead of checking if any cells have fixed width, check if all calls have fixed with. Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa. (cherry picked from commit 67163f5531c29ff1983661ba832bd205944b33f3) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7
2013-10-22bnc#823675 RTF import: fix import of numbering bullet associated fontMiklos Vajna
There were multiple problems here: - \f had a special handler for the listlevel destination, \af had not - in case of multiple \f or \af, the first one is used for the bullet font - in case only \af is used for the bullet font, its value should be used for \f as well (cherry picked from commit 55162d7422a3b175c7fe9c175e0dec91b1932b6a) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I6631504c1aa9f2e0792a3469a5fdce5b7bd49518
2013-10-22n#820800: docx import of wrap polyon was based on dest size of pictureCédric Bosdonnat
... instead of the original size of it. Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09 (cherry picked from commit ae6981601b0e9175efaf9849b1279290ea3380f6)
generated by cgit (git 2.34.1) at 2024-08-08 21:20:40 +0000