summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-12Bump version to 4.1-5cp-4.1-5Andras Timar
Change-Id: I90f4a8fd5eb62155fe81b1e19408da9e540d4958
2014-02-12Do not reference a dangling OUStringStephan Bergmann
(cherry picked from commit 151f3d665581d887cda1e36b817afb124c5c789e) Conflicts: sw/source/core/unocore/unostyle.cxx Change-Id: I0908d1300d0d1acb515345ccbdf6cdc2bf44d6a5
2014-02-12nPDescPos is never readStephan Bergmann
...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 "#86296# use page descriptor only if necessary", and this nicely removes the odd for(i = 0; i < nPDescCount + 1; i++) loop that read past the end of the maPageDescs vector. (cherry picked from commit 7fb6ae28ae7bebd67c2b9bf2cf517f1f7bb2777e) Conflicts: sw/source/core/unocore/unostyle.cxx Change-Id: I9b0f24231774eef7231eff4b053fd56c020c6e69
2014-02-12new brand imagesAndras Timar
Change-Id: I2cdc50ef3b1c0c099cea91c4ba161cda5728a758
2014-02-12edit->changes->show has empty filter settingsCaolán McNamara
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9 (cherry picked from commit 55c413b9cb2692b784c6c43a519be08146438237) Reviewed-on: https://gerrit.libreoffice.org/7995 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-12fdo#46707: Don't bother with synonyms for text with mixed script types.Kohei Yoshida
Change-Id: I7922905523406d05f864b10e1ecfd27f3fb5f9d6 (cherry picked from commit 49341001e76389f11bf67d756f4742275bc9dcd9) Reviewed-on: https://gerrit.libreoffice.org/7963 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-02-12related fdo#65430: forgot to 'unlink' setOpenTemplateHdlJoren De Cuyper
This was introduced in 96e7225260aac0815643a4043f4ddb4e6b5764a1 Conflicts: sfx2/source/doc/templatedlg.cxx Change-Id: I9bb8abbc9e9167b1e43bebf4477cf73010bf2d92 Reviewed-on: https://gerrit.libreoffice.org/7960 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#65430 add OnItemDblClicked and setOpenTemplateHdl in templateSearchViewJoren De Cuyper
Currently only templateAbstractView had such handler, which are templateLocalView and templateRemoteView are based on. Change-Id: I6694d0804a8b7e58abc0ddc970e811d053394d6f Reviewed-on: https://gerrit.libreoffice.org/7918 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 96e7225260aac0815643a4043f4ddb4e6b5764a1) Reviewed-on: https://gerrit.libreoffice.org/7924
2014-02-12fdo#56511 Don't unduly delay Bridge terminationStephan Bergmann
When terminate is called from the Reader or Writer thread, the final terminate was delayed until disposal of the BridgeFactory, as an unfortunate consequence of always trying to join on the Reader and Writer. Instead, forgo the join in such a case and rely on the underlying osl::Thread becoming detached after calling termiante. Change-Id: Ifba788c4d0d2e9b14b4f7f6b5f0f1380b712ce36 (cherry picked from commit f6245d5bcb18dff2721d5975cd84711559cefe65) Reviewed-on: https://gerrit.libreoffice.org/7926 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#33852 do not remove too much from the pathDavid Tardon
Change-Id: I1cf89f300530e761df5a287097d05f95d8af2017 (cherry picked from commit eba6a6789c8832f961ac7054588ed84d04b65480) Reviewed-on: https://gerrit.libreoffice.org/7900 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-02-12rhbz#1017379 do not remove too much from the pathDavid Tardon
Change-Id: Ibffa7f2fbe91be9b95217ce36999e286ef444a37 (cherry picked from commit 5b35f21f1c69239d0605b0751bed87a410fbffee) Reviewed-on: https://gerrit.libreoffice.org/7897 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2014-02-12Resolves: fdo#69271 i#123510 changed priority in style preparationArmin Le Grand
(cherry picked from commit 86459550d81c3eae067e89d9af1b6e872215a588) (cherry picked from commit 8b2fb0e153fa846a171105b7801c398ffbe3d595) Change-Id: Ia567666cd76dce646479003a830d969f4962da71 Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-02-12fdo#69652 Default(Date|Time) is a UNO struct nowLionel Elie Mamane
Changed to UNO struct from integer by fdo#67235 adapt form control code to time nanosecond API change Change-Id: I5817d44438d70a0da534c03afd22d74a311252f5 Reviewed-on: https://gerrit.libreoffice.org/7882 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#69873 FixedText (label) is implemented as no valueLionel Elie Mamane
And the actual label is put as *body* of the cell. I'd prefer that the value be put as string-value attribute of the cell, but since in the report definition the label is as body (as opposed to as an attribute), it is easier that way. We could move (actually *copy* for backwards compatibility reasons) the label to an attribute of the rpt:fixed-content element (similar to the rpt:formula attribute of rpt:formatted-text) but it is not obvious this is completely desirable: Indeed it would keep us from putting anything more complex than a string there (which we don't do anyway now, but thinking of future extensibility here); I'll leave the exploration of that idea to the indefinite future. Change-Id: Ia0f7460718ee35a971117e2f79c0997e17e1095e Reviewed-on: https://gerrit.libreoffice.org/7866 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#74519 - don't drag around and use an uninitialized variable.Michael Meeks
Change-Id: I08b43a6658a600398b434a0c90e0e16863402b33 Reviewed-on: https://gerrit.libreoffice.org/7857 Reviewed-by: Ahmad Harthi <aalharthi@kacst.edu.sa> Tested-by: Ahmad Harthi <aalharthi@kacst.edu.sa>
2014-02-12resolved fdo#74493 do not trust aCell.maBaseCellEike Rathke
Regression introduced with 70c61a549184cf8611f7890ac31b0ba4c460cdec on 4-1 and 68a753b6a36560eb83ba6ebe4fe9897a8759d265 on 4-1-5 Apparently aCell.maBaseCell does not always follow the current cell position, so do not trust it. Always explicitly obtain the correct cell. Change-Id: Ib88de44a326be75c13d37538b8ae56d265b60ee5 Reviewed-on: https://gerrit.libreoffice.org/7843 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-12fdo#73300: sw: don't swap in all images when loading filesMichael Stahl
(regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0) (cherry picked from commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: I55532ac0fe983461e961a61149479343d2b879a1 Reviewed-on: https://gerrit.libreoffice.org/7812 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#63433 fdo#74435: SdrPageView::DrawLayer(): avoid spuriously visible imagesMichael Stahl
In the TestBook2.odt of fdo#73300 it happens that at some particular points when scrolling down, the ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy() will determine that > 200 images are visible; most likely this is due to an empty ObjectContactOfPageView::maViewInformation2D::getViewport(). Loading this many images may need more RAM than is available on 32bit platforms. That appears to happen only (but not always) if somehow (not sure how exactly) the rectangle passed to SdrPageView::DrawLayer() and the existing GetRedrawRegion() do not overlap at all. (regression from commit 8af09bf33291df2fb2bfbbd6e42f9bf074fcc4fc) (cherry picked from commit 66f8b54931f193bdc844c6bca388d9bde98779cd) Change-Id: Iafc595241df05204bccec1f2336014fc471b6602 Reviewed-on: https://gerrit.libreoffice.org/7813 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12cairo canvas: Zero font's width means "the same as height".Jan Holesovsky
Change-Id: I1d24b2039fb3c615e672189d12c77e960cc858ee Reviewed-on: https://gerrit.libreoffice.org/7764 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12EMF+: Only draw endcap outline if not filled, fix endcap scaling.Andrzej Hunt
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971 Reviewed-on: https://gerrit.libreoffice.org/7726 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 8d1ca883b119857daa3b8d0ece9da90917589040) Reviewed-on: https://gerrit.libreoffice.org/7742 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12fdo#63553: sw: fix copy/paste of cross referencesMichael Stahl
If one of aIds or aDestIds contains nSeqNo then adding an identity mapping for it will actually re-define a previous mapping. Likely this can only happen when clipboard document is the source. (regression from 44f971506c0ed37928c48e55d8007f24b0c43a5f) (also it looks like 4b0b0a5b3045902d9a6b95510ec30a3027181e29 has subtly changed what the "else" branch does when it is erroneously taken - results are differently wrong) Change-Id: I34e2979e45cffeb62ebf3d7b3e5ac6d2afff0c2b (cherry picked from commit bb665affbd8870652ade3951d626d76e99143f67) Reviewed-on: https://gerrit.libreoffice.org/7730 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Presumably "eType ==" is missing hereStephan Bergmann
Change-Id: I7af8cabac09369a9be605413b799289d48cb3f57 (cherry picked from commit d18827e266d1bf44b0bac02ed486d2cdccba9c8a) Reviewed-on: https://gerrit.libreoffice.org/7724 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2014-02-12Resolves: fdo#74051 support 8430x11700 jpegsCaolán McNamara
Change-Id: I1ca95a496bca80e5e2787af2ccbf0f6cd42455a5 (cherry picked from commit 53c803004554a3a0fff26501357a183bba008a26) Reviewed-on: https://gerrit.libreoffice.org/7697 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-02-12fdo#69244: Avoid putting these cells in formula tree prematurely.Kohei Yoshida
Marking the cell dirty alone appears to be sufficient to trigger resetting of number format. SetDirty() would mark it dirty *and* put the cell into formula tree, which would prevent proper value propagation as seen in the bug report. Change-Id: Ib4000e955dec43ba976d1486e1e80d7b64197c80 Reviewed-on: https://gerrit.libreoffice.org/7708 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-02-12resolved fdo#71598 postpone SetDirty during Insert/DeleteEike Rathke
... until after all listeners are re-established. (cherry picked from commit 20b7476142f75b49d10a75e48429a94cff0cec32) Conflicts: sc/inc/formulacell.hxx sc/inc/table.hxx sc/source/core/data/column.cxx sc/source/core/data/document.cxx sc/source/core/data/formulacell.cxx Backported. Change-Id: I9f6036d4bcc9206191959a88ed5439b9860ca268 Reviewed-on: https://gerrit.libreoffice.org/7624 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-02-12Resolves: fdo#72682 text field doesn't horizontally expandCaolán McNamara
also see fdo#73920 (cherry picked from commit 674aeac88ffa1840f2d6a7f33656193aaebc9a0c) (cherry picked from commit c1e0e4364b9ca3e437e118cde91183271357f3c5) Change-Id: I3d12d0b376c9c0488d12df8f9d3fe76b1c00a437 Reviewed-on: https://gerrit.libreoffice.org/7591 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-02-12fdo#67238: sw: fix table cell UnprotectMichael Stahl
SwDoc::UnProtectCells() was setting the old box format (from aFmts) instead of the new one, and actually these 2 vectors are a map. (regression from 772101649cf16233bbaf0900aa9ebbc915151a95) Change-Id: I0881a1c499c51b5f3c257e9def1a2e9a00bcb639 (cherry picked from commit b2f9d1b43e4b14cc48327cdce14a03c826096579) Reviewed-on: https://gerrit.libreoffice.org/7640 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12fdo#68876: sw: layout should never care about IsFirstShared()Michael Stahl
With 75084f6c42c27dc95418df9cefed2fddfb26000e the layout should put the "first" frame-format on every first-page of a page style; unfortunately SwFrm::OnFirstPage() was not adapted with this change and that results in various misbehaviour in the layout. Change-Id: Ia31add0d72ca581963b7e8e40c3ea932361b7fd6 (cherry picked from commit ecf617ee0cb74526e3989500c122835c32082845) Reviewed-on: https://gerrit.libreoffice.org/7639 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Resolves: fdo#73970 CMYK labels are switchedJulien Nabet
Change-Id: Ie6a2aa5b1123c0ab752e10c4e587ef780784b247 Reviewed-on: https://gerrit.libreoffice.org/7622 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12Resolves: fdo#73771 Non-standard behaviour for Function MidJulien Nabet
Change-Id: I90be516235228574dc219447a0eef3a34f83bee2 Reviewed-on: https://gerrit.libreoffice.org/7539 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ff48f28f71609b0ab4e6b8bc79818f765e48fddd) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-02-12fdo#68959: sw: fix painting of tab fill characters in small caps textMichael Stahl
The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7568 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12resolved fdo#70275 write correct office:string-value if text format appliedEike Rathke
Change-Id: I52e5135139fdf88abe380b6e5ae60e2afb582289 Reviewed-on: https://gerrit.libreoffice.org/7555 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-02-12resolved fdo#73836 do not apply format twice to stringEike Rathke
ScDocument::GetString() already returns the formatted string that then was formatted through number formatter. Format raw string instead. (cherry picked from commit f6b9b73a1f87d1815ed8ab8f2494e5526a710bb9) Change-Id: I806b4fc904d04169a6c1dbd4a3d00e2556eda7bd Reviewed-on: https://gerrit.libreoffice.org/7553 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-02-12fdo#51180 reset (Multi)Selection on Clear()Lionel Elie Mamane
Change-Id: I06dde63093eab4e5e1c692f6363aca70b89de96a Reviewed-on: https://gerrit.libreoffice.org/7429 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-12libodfgen produces strings in utf8 encodingFridrich Štrba
Change-Id: Iad17f4b4786473205669bd5b080b0a64d4a6a441 Reviewed-on: https://gerrit.libreoffice.org/7455 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9e5e7c9b556bf9386fb5ad3ecd28b3d43aeeb393) Reviewed-on: https://gerrit.libreoffice.org/7457
2014-02-12String::Len was used in a non-bool context hereStephan Bergmann
...and apparently erroneously got rewritten as a call to OUString::isEmpty instead of OUString::getLength in the conflict resolution of 7ec7a9a68b4a9c5600840a34434fc800cda3d815 "Fix #120224# Mapping the text rotation in Writer table cell with MSO." Change-Id: If02687437848917f64b8f92f323979ccb51aaad2 (cherry picked from commit 60af010a98540b4785353b27ccbb545ef72e7791) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-02-12Fix brace positionStephan Bergmann
Presumably a typo during conflict resolution for d02f75a8c36705924ddd6a5921fe3012fafce812 "Resolves: #i121420# merge sidebar feature." Change-Id: Id328c2d2dd0e1a3bb60b7ffd34842fd789da332a (cherry picked from commit f86084ea6cc72ac282e3d262ec230d49807cd70f) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-02-12fdo#73095: fix invalid access in SwFntObj::DrawText()Michael Stahl
aStr may be 1 larger than pKernArray. Trivial fix by checking the largest index; not sure if it would be a good idea to allocate pKernArray with the larger size in the first place, but that would be a bigger change... (regression from 02ce734450559c9353ca7f42b2519239220dd265) Change-Id: Ia33feab001c34e85066b7596d8873f41588984e9 (cherry picked from commit 61ec8f086ba314b86c80a02b16072e88774abf6c) Reviewed-on: https://gerrit.libreoffice.org/7428 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-02-12Updated coreOlivier R
Project: dictionaries 676c158920ab055e7532116a2491be76b5871e56
2014-02-12fdo#73363: sd: fix mis-detection of Visio files as PPTMichael Stahl
SdFilterDetect::detect() erroneously detects all binary MSO files, and because the Visio types would be checked after PPT, Visio is pre-empted. Change-Id: I6ec3647a508dc8d79b47bfff6de35ccae39416ee (cherry picked from commit e62339f856efa0b8ef03df3bf8b93e098c4ac0d3)
2014-02-11Handle app bundles with space in name, also sign the mdimporter properlyTor Lillqvist
Just like the Python framework, also the Spotlight importer needs to be signed specially, it seems. I wondoer if we could get rid of all the hair in this script by simply just signing the app bundle, with the --deep option? Change-Id: I722b4403e74560f6555a7528005ed7aa0c94352b
2014-02-11Hardcode app bundle name here, tooTor Lillqvist
Change-Id: I69cabd516e7c40b7ee75e311d725f6db78519855
2014-02-10cp#100030: Use internal API to fill dxf styles during xlsx import.Kohei Yoshida
It's faster, and it actually prevents a bug where styles fail to get set when the document contains at least one protected sheet. Change-Id: I9a5d7250ca44dd46364ab62f2e0130e967427c66 (cherry picked from commit d12c0e5d36cc106cb4f9a27dba2f29c10b5d6f93)
2014-02-10Hardcode vendor-specific app bundle nameTor Lillqvist
Change-Id: Iee89a606e507f4356a62d5cd4ee2ebbed671bcdd
2014-02-10Use IOKit *framework*, not library directly. And ApplicationServicesTor Lillqvist
Change-Id: I6e67bb5a4c540d0be605c54c833ebb0b4187c771
2014-02-10Stop defining "inline" as empty on OS X and iOS in icuTor Lillqvist
It causes problems on newer SDKs. Change-Id: I6bdb1e50cb239d99b190460fdb11d5c684e92275
2014-02-10Enforce avoiding looking for non-existent system dicts on OS X and WindowsTor Lillqvist
It is totally pointless to look for "system" /usr/share/myspell, hyphen and mythes dictionaries on systems where they don't exist. Use only bundled dictionaries. (For OS X, we have code to use a system-specific spell checking API.) Change-Id: I13aed7225d003e608f61de95671feb2e50b26c25
2014-02-10Do not silently ignore --enable-libc++Stephan Bergmann
2014-02-10Don't use -d32 when building 64-bit codeTor Lillqvist
Change-Id: I83a960cebb8347170a08d2fda7ed11050b8c4229
2014-02-10Simplify EPM tests for OS XTor Lillqvist
We always should use the internal epm anyway on OS X, so no need to look for PackageMaker.app in /Developer which doesn't even exist any more. Change-Id: I943f34e14e9ce0c3bec5bd7b86612a62e5b9e83d
generated by cgit (git 2.34.1) at 2024-07-01 16:10:05 +0000