summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-05-17Resolves: tdf#39316 add matrix empty cells to ScInterpreter::QueryMatrixType()feature/cib_contract138Eike Rathke1-0/+5
(only partial cherry-pick, ScMatrix::IsEmptyResult needs newer mdds) (cherry picked from commit eccbc97c7c224269fe261b8924e7866c3758ec91) Change-Id: Ifa5d59e90afcfff66f2e8683fac2a9090ed615da
2017-05-17tdf#35636: Apply algorithm also to ranges spanning multiple columnsKatarina Behrens1-8/+14
Change-Id: I6e574f2237dd6d4dcf4438a9fdafadb66aa049c5
2017-03-23tdf#35636: Match also empty cells (backport of the idea)Katarina Behrens9-44/+88
Change-Id: I11fc198ef43250618b43e3c11e7c192accc6b7b8
2014-02-05bump version to 4.1.5.3.0+libreoffice-4-1-5Christian Lohmaier1-1/+1
Change-Id: Iaaa295c43e577b4ec5875003ddd3a6e6a0bb1284
2014-02-05Updated coreChristian Lohmaier1-0/+0
Project: translations 64b0266170e1ddd1c6fd13b84b276e65b8f09be8
2014-02-05fdo#73300: sw: don't swap in all images when loading filesMichael Stahl2-0/+6
(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> (cherry picked from commit 39892ecb0db10ffa4a9803862264fd6e12d497aa) Reviewed-on: https://gerrit.libreoffice.org/7845 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-02-05fdo#63433 fdo#74435: SdrPageView::DrawLayer(): avoid spuriously visible imagesMichael Stahl1-1/+10
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> (cherry picked from commit 5200d19a541b59141d15e3780f5197569b6b135e) Reviewed-on: https://gerrit.libreoffice.org/7846 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-02-04resolved fdo#74493 do not trust aCell.maBaseCellEike Rathke1-2/+1
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/7844 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-02-02fdo#67238: sw: fix table cell UnprotectMichael Stahl1-8/+9
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> (cherry picked from commit d506760f7797565486c2470abbc269a446fbc3b0) Reviewed-on: https://gerrit.libreoffice.org/7679 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-01-30bump version to 4.1.5.2.0+Christian Lohmaier1-1/+1
Change-Id: I3317d4cd36b3ba159dc170de437d9f4804199bf4
2014-01-30Updated coreChristian Lohmaier1-0/+0
Project: translations 18a4076d256e3626b719a191571c1e9085ef08c9
2014-01-30fdo#68876: sw: layout should never care about IsFirstShared()Michael Stahl1-1/+1
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> (cherry picked from commit 34afdbfd9689ecfa2ea3e93cd7812d192016baf3) Reviewed-on: https://gerrit.libreoffice.org/7678 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> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-30fdo#68959: sw: fix painting of tab fill characters in small caps textMichael Stahl3-9/+9
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> (cherry picked from commit 7cdf5a6995a017e295e9b1099abc6dcb1987ae9e) Reviewed-on: https://gerrit.libreoffice.org/7576 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-30fdo#63553: sw: fix copy/paste of cross referencesMichael Stahl1-5/+13
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> (cherry picked from commit 139342a9ad5995058081a47a24818b14581735a5) Reviewed-on: https://gerrit.libreoffice.org/7740 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-29Resolves: fdo#73970 CMYK labels are switchedJulien Nabet1-2/+2
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> (cherry picked from commit 1750192300d81c6ebc78e3265e2f01104b4a9f59) Reviewed-on: https://gerrit.libreoffice.org/7717 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-01-28resolved fdo#70275 write correct office:string-value if text format appliedEike Rathke1-3/+5
Change-Id: I52e5135139fdf88abe380b6e5ae60e2afb582289 Reviewed-on: https://gerrit.libreoffice.org/7556 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-01-22Resolves: fdo#73771 Non-standard behaviour for Function MidJulien Nabet1-1/+2
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) Reviewed-on: https://gerrit.libreoffice.org/7579 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-21resolved fdo#73836 do not apply format twice to stringEike Rathke1-4/+6
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/7554 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-16fdo#73095: fix invalid access in SwFntObj::DrawText()Michael Stahl1-1/+4
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> (cherry picked from commit 4b965b031e2196b39f20e28ce9d9fd40552753a5) Reviewed-on: https://gerrit.libreoffice.org/7442 Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-01-14bump product version to 4.1.5.1.0+Christian Lohmaier2-2/+2
Change-Id: I00c74a747e92650de3ade41b7b07e62183256406
2014-01-14Branch libreoffice-4-1-5Christian Lohmaier3-0/+0
This is 'libreoffice-4-1-5' - the stable branch for the 4.1.5 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: Ib95c4a409e8a3a0747836dc0b5b3ac6091be452c
2014-01-14Updated coreChristian Lohmaier1-0/+0
Project: translations 2d162eaae8875c3fc36fca0bf075c5796145ab56
2014-01-11fdo#73484: Ensure that we import all tab settings from Excel.Kohei Yoshida3-0/+23
The old code would not import settings of the last sheet if maTabData was not large enough before the loop begins. Enlarge maTabData ahead of time to ensure we load all tab settings. (cherry picked from commit 3e87471b6815a3cad48cab2ef81073bad5453c56) Conflicts: sc/inc/scextopt.hxx Change-Id: I9093a93ef26ccba9fef06a8929d1d86311f5c55d Reviewed-on: https://gerrit.libreoffice.org/7383 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-01-10Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2Julien Nabet2-0/+4
Change-Id: Id3691ab81af466dd21cc86592c5ac0c2c7a1c8f7 Reviewed-on: https://gerrit.libreoffice.org/6244 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2f8757e961d6156d529c2ab9131747071236f085) Reviewed-on: https://gerrit.libreoffice.org/7362 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-08fdo#73087: python3: upgrade to version 3.3.3Michael Stahl9-106/+23
- drop obsolete/upstreamed patches: python-3.3.0-ffi-clang.patch.1 python-3.3.0-15833.patch.1 one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in Reviewed-on: https://gerrit.libreoffice.org/7278 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57) Conflicts: external/python3/python-3.3.0-aix.patch.1 external/python3/python-3.3.0-elf-rpath.patch.1 external/python3/python-3.3.3-aix.patch.1 external/python3/python-3.3.3-elf-rpath.patch.1 python3/ExternalPackage_python3.mk python3/UnpackedTarball_python3.mk python3/python-3.3.0-15833.patch.1 python3/python-3.3.0-aix.patch.1 python3/python-3.3.0-elf-rpath.patch.1 python3/python-3.3.0-ffi-clang.patch.1 Change-Id: I12f0f78a172067986b63455847015ea2430a084c Reviewed-on: https://gerrit.libreoffice.org/7290 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-01-08fdo#72219: Fix for corruption of symbols in docxRohit Deshmukh2-3/+22
Issue: OUString uses UTF-16, so for a Unicode surrogate character there are 2 values stored, not just 1. So we are getting assert failure in "rtl_uString_iterateCodePoints" method. erAck: Underlying cause was that the dictionary breakiterator misused UTF-16 positions as Unicode code point positions. Change-Id: I923485f56c2d879b63687adaea2b489a3479991c Reviewed-on: https://gerrit.libreoffice.org/6955 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit d8fd15875901d584a4bbcc07c927fa20332e4841) Reviewed-on: https://gerrit.libreoffice.org/7322 (cherry picked from commit 994d0c9e7aa8d1a7602e61b770991da980c1cde5) Reviewed-on: https://gerrit.libreoffice.org/7324
2014-01-08fdo#37167 create statement before execute/wasNull/getBooleanLionel Elie Mamane2-0/+9
This populates "object" member variable. The "createStatement" calls were removed in: commit b9392a36645d8632b97ad79240f483b3a1683b61 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Apr 23 10:42:05 2009 +0000 CWS-TOOLING: integrate CWS dbaperf1 This was most probably in error since the call is not removed from the other modified member functions in this commit and/or failed to aaccount for the scenario of no parameter (and thus no setXXX call before execute). Change-Id: Ic0e7b7b64ea496791f32c1416aa7d4416f909616 Reviewed-on: https://gerrit.libreoffice.org/7280 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-01-08fix occasional crash on dragging and dropping pages in slidesortersCaolán McNamara2-7/+38
pages go into the cache, and sometimes they get deleted before the cache gets processed. Remove deleted pages when they go away Change-Id: I291072a8541f4ca36979e9914975d81cc23a9497 (cherry picked from commit abe9d1463282690313aaf91d2a54011d10b900b9) (cherry picked from commit 026e9335d792c6557255f064960e0ef6d28728e0) Reviewed-on: https://gerrit.libreoffice.org/7053 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-01-08fdo#72774: Generate correct group items for the year group.Kohei Yoshida4-9/+12
This changes bring it back to the same algorithm used in 3.5. Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781 (cherry picked from commit c2e88a32314012afb799e321ec1d658f99f71781) Reviewed-on: https://gerrit.libreoffice.org/7306 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-08fdo#72774: Ensure that all the group fields are in cache upon file load.Kohei Yoshida1-0/+3
This resolves the originally reported issue in that bug (in Comment 1). Change-Id: I6fb85cff1eafb78d784605aa08e7d992a1ac36e0 (cherry picked from commit 256e4ccba8a331f2d30c6b5da9dca70206deadae) Reviewed-on: https://gerrit.libreoffice.org/7302 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-08fdo#72645: Case-insensitive string comparison in GETPIVOTDATA.Kohei Yoshida2-13/+28
Change-Id: Ibdb2b7ab2bae03875a3462816e860f58d9076457 Reviewed-on: https://gerrit.libreoffice.org/7285 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-08fdo#72645: Allow GETPIVOTDATA to get result from leaf node of result tree.Kohei Yoshida4-9/+79
Change-Id: I0fc1fd069440ed6fee378fc2dfd2ed761afbdeab Reviewed-on: https://gerrit.libreoffice.org/7284 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-08n#839727 / rhbz#1038176 Crash fixMuthu Subramanian1-1/+2
(cherry picked from commit e5f24e0c7c8f4799223c19359f4228f0b1a71461) Change-Id: I8d733afbbc05900c68217ead44de798c1263ca84 Reviewed-on: https://gerrit.libreoffice.org/7309 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-01-07No serviceNames attribute in LoaderStephan Bergmann1-1/+1
Change-Id: I6cc001d18683fc412f0ec0b6a33054d6e745463f (cherry picked from commit 431b49fbec68c17c7a486ef0f577107d3dd27e55) Reviewed-on: https://gerrit.libreoffice.org/7294 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-07Fix fdo#70807: Page Style method isInUse() brokenMarcos Paulo de Souza1-4/+7
We need to check m_FirstMaster and m_FirstLeft too to verify is a style is used Thanks a lot mst__ for pointing how to fix this! Change-Id: Ic9c37c552893c17fba4aabcc0fd4beb7fe2550e8 Reviewed-on: https://gerrit.libreoffice.org/7295 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br> (cherry picked from commit 6131787afbb32e1e12aac4cf4f65625d11d39f08) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-01-06cp#2013101510000026: fix file coruption caused by comments' doc exportZolnai Tamás2-7/+0
Plcfbkl contains only character positions. The Plcfbkf is that one which contains additional informations. Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9 (cherry picked from commit 3ed870e237a0b7b95f48bfb8192fe7d5c2957a03)
2014-01-06read elements/attribs written to extension namespaceMarkus Mohrhard3-1/+10
Related to validation errors with fdo#31296 Change-Id: I1b76e05a9996b1123db164629475a3f7b07dda69 Reviewed-on: https://gerrit.libreoffice.org/7222 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-06only write new element and attributes in ODF 1.2 extendedMarkus Mohrhard1-1/+1
Change-Id: I038f200f500ef1c6a0815b6332fb17bb2f62282a Reviewed-on: https://gerrit.libreoffice.org/7221 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-01-06pages with equal Priority and Class getting droppedCaolán McNamara1-3/+8
Change-Id: Ib053dc4b6e5fb5f01f48c71a4b295a53c0ec6715 (cherry picked from commit 9790588da4b2de455ffc7a2cc69f26539823c3da) (cherry picked from commit be366ad7690b190c5ef4dc42311a4df6b7dcce4b) Reviewed-on: https://gerrit.libreoffice.org/7054 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2014-01-06cp#2013101510000026: doc import of comments affecting more text nodesZolnai Tamás3-6/+58
Change-Id: I3932d82cb4cd640b19957b93cc7e59711af1b564 (cherry picked from commit f2945255df273404ee2457dcf761cb8f334b732b) (cherry picked from commit e0bd7b01f31bfbaeac3bce86403bf25929c61c84)
2014-01-06cp#2013101510000026: doc export of commented text rangesZolnai Tamás8-33/+139
(cherry picked from commit 5969eec0e998804eba77338b17de90737e2acb43) Conflicts: sw/qa/extras/ww8export/ww8export.cxx sw/qa/extras/ww8import/ww8import.cxx sw/source/filter/ww8/wrtw8sty.cxx sw/source/filter/ww8/ww8attributeoutput.hxx (cherry picked from commit 765d89aa149e9afc78382e24bf7c86f70b1584ff) Change-Id: I2d31da5d659edcbebc682d5604d2db24b5e341fb
2014-01-06cp#2013101510000026: fix doc export of comments initialsZolnai Tamás2-24/+32
It seems comments' authers were exported twice. Once istead of initials. (cherry picked from commit 0127e3dbabaf24c6c0d828e6d26357ff0b63c3fb) Conflicts: sw/source/filter/ww8/wrtw8sty.cxx sw/source/filter/ww8/wrtww8.hxx Change-Id: I082fb5caea99df013922e16c5d8d4ef29e866665 (cherry picked from commit 7d12ed75718fcee74a731113928a12af0bb0e2f5)
2014-01-06cp#2013101510000026: wrong highlight of commented text range imported from docZolnai Tamás2-5/+3
When makeFieldBookmark() method is called with ODF_COMMENTRANGE it will ignore the added field name and generate an own one. We have to set the name of the SwPostItField to this generated name so these two names will match. Note: lTagBkmk is only an identifier but not the exported name of the fieldmark so we don't need to stick to use it as a name. (cherry picked from commit 12e287220ebaf3a8f5eaf7bf526dce2c47f45a20) Conflicts: sw/source/filter/ww8/ww8par.cxx (cherry picked from commit d6fc6624e1319257945f49388d635c36685108d5) Change-Id: I499abdcce1be0563c308bcf9f5c0a959a07f858b
2014-01-03added "EEK" and "LVL" to EUROCONVERT(), "EUR" to [*-LV] locale data fdo#73239Eike Rathke3-5/+24
This is a combination of 3 commits. added Estonian "EEK" to EUROCONVERT(), fdo#73239 (cherry picked from commit 127f863c727c07f1da40005fe638d97e89baaccf) Conflicts: sc/source/core/tool/interpr2.cxx added EUR as default currency to Latvia [*-LV] locale data, fdo#73239 (cherry picked from commit c32996987354d045523beaa98b5d227d161f72fb) added Latvian "LVL" to EUROCONVERT(), fdo#73239 (cherry picked from commit cc1b6535e01db62688a7bee50852d33e4ee50761) Change-Id: I82085b6661c954b2afbf22b8b8ed5bd8c48cc50e Reviewed-on: https://gerrit.libreoffice.org/7263 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-03Updated coreAndras Timar1-0/+0
Project: dictionaries 6ae2c9648e080d147b57da7edfca8cbb12b5a069 updated pt dictionary Change-Id: I0e7b163065fa65a009a67acd1dec09d70dd30156 Reviewed-on: https://gerrit.libreoffice.org/7265 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-03die binfilter die die dieEike Rathke1-38/+22
Euro Converter tried to obtain filters for names of binary filters that don't exist anymore and can't be resolved hence the TypeDetection GetByName() bailed out with an exception when calling the file picker (e.g. when attempting to select a document), stopping in Basic environment and effectively rendering the wizard useless. Change-Id: Ifdef6f59abdc16bedd0f54ec317dc44af8f1e628 (cherry picked from commit e625d00439f725b01f3818859e95e431e6173d57) Reviewed-on: https://gerrit.libreoffice.org/7264 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-01-02Make CalcFocusRect look rightStephan Bergmann1-10/+3
...at least for its (only, it appears) uses at the left of the "Insert - Hyperlink" dialog and at the left of a Database window. As aBmpRect and aTextRect never extend aBoundRect (and aTextRect always leaving a gap left and right towards aBoundRect, it appears, with the text abbreviated with an ellipsis if it would be too wide), there should be no need to eventually adjust "the focus rectangle [to] not touch the text," and for calculating the top of the focus rect aBoundRect can be used just as well as aBmpRect. (Though for calculating the bottom, aBoundRect apparently stretches "too far" compareed to aTextRect; whatever... The offsets look somewhat "magic" anyway, but appear to produce the desired visual results.) Change-Id: Ic324561294fb6172c0d02a697fc261717e01c87c Reviewed-on: https://gerrit.libreoffice.org/6165 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 143bb92761f54cb7b8e41e5ac83bd274d4f7079b) Signed-off-by: Eike Rathke <erack@redhat.com>
2014-01-02Resolves: fdo#72464 Character line break is set to 0 Options/.../Writing AidsJulien Nabet1-1/+1
Change-Id: I9f3d1c64fde064fc7ba9bdfcb9e35032a0c40255 Reviewed-on: https://gerrit.libreoffice.org/7253 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-02fdo#39007: blind fix for renamed OS X restore-state fileMichael Meeks1-0/+1
Remove also a potential restorecount.txt file (as reported in the bug) in addition to a potential restorecount.plist. Change-Id: I96fb688e9dda804f240cad8f2109c5880b544302 Reviewed-on: https://gerrit.libreoffice.org/7239 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Signed-off-by: Tor Lillqvist <tml@collabora.com>
2014-01-01EMF+: mapping can rotate the width vector, so use resulting length.Andrzej Hunt1-1/+1
Otherwise (i.e. with non-vertical lines) the width will be incorrect, and can result in lines disappearing as the resulting X component can be tiny/approaching zero. Change-Id: Icf3b7c10c627594600b517b8ff445f8df87c56f8 (cherry picked from commit 83f2b3c590120a60b5e94fb1a15054ebe0745dbb) Reviewed-on: https://gerrit.libreoffice.org/7249 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-18 08:43:21 +0000