summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-04-27tdf#107392 ODF import: fix z-order sorting of SVG imagescp-5.3-8-winMiklos Vajna9-8/+62
The problem was that in case the document has shapes where the order does not match the z-index order, so sorting is needed, then sorting failed to take the multi-image feature into account. E.g. SVG images have a PNG fallback, but at the end of the shape import the PNG fallback is removed, which means the "actual" (not the "wished") z-index of the shapes after the SVG image has to be adjusted. Without this happening SvxDrawPage::getByIndex() (or in case of Writer, SwTextBoxHelper::getByIndex()) will throw when the importer calls getByIndex(3) but we only have 3 shapes. This results in not honoring the z-index request of the remaining shapes. Regression from commit 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70 (re-base on ALv2 code. Includes (at least) relevant parts of:, 2012-10-09), from the Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement http://svn.apache.org/viewvc?view=revision&revision=1220836 part. Reviewed-on: https://gerrit.libreoffice.org/36998 Tested-by: Jenkins <ci@libreoffice.org> Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: Ibe880e5c6c74b728b4a760498720ee31f052b726
2017-04-26Bump version to 5.3-8cp-5.3-8Andras Timar1-1/+1
Change-Id: I882c0bb8199191e1422f8751129004b23f45fcca
2017-04-26Hack-around an unclear Windows problem in the test.Jan Holesovsky1-2/+10
Reviewed-on: https://gerrit.libreoffice.org/36985 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 8b2a287dacc4083c1cb3d6fba9ba41c5422beb12) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I5194c6a20953eb66745539493a8782f089e25e2a
2017-04-26sc lok: Do not change comment indicator settingPranav Kant1-4/+0
This setting is saved to doc model when document is saved eventually. We should respect the user settings, and not play with it like this - changing this setting to false unconditionally. Originally, setting SetNotesMode to false was meant to prevent any kind of in-tile note rendering in case of LOK when it is turned off. But turns out this option is only for note indicator i.e the red button. We already have a LOK in-tile rendering guard in ScDocFunc::ShowNote that prevents popping drawinglayer note even if corresponding UNO command is sent by the LOK client. Change-Id: Id6c7b2cd30cdbefe7dacc2a701638b2488ab245d Reviewed-on: https://gerrit.libreoffice.org/36993 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-04-26tdf#107205 vcl: don't always use D2DWriteTextOutRendererMichael Stahl2-7/+15
... because it cannot rotate text. (regression from commit df556aa47da22f96b3fcd356c12419d3035cba3c) Change-Id: If9bc6e98b8979c5eb02f1a5cfc12b4d19bdc481b (cherry picked from commit 2eb91035c2f60e9dc476336474d51b23b666bb04) Reviewed-on: https://gerrit.libreoffice.org/36904 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 8f51b4272450b6220f563740538f143c0bc70175)
2017-04-26Enable MSP patchingAndras Timar4-3/+4
Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
2017-04-26update creditsChristian Lohmaier1-1754/+1801
Change-Id: Id21b158bcdb4ff51950bcce0869e6c79a7e48fc4 (cherry picked from commit aa6a9bbd66beb234c54d8f881b56da6d8753c423) (cherry picked from commit 3b40661889be16f2034c02d17564f63bda4dabb6)
2017-04-26ofz#1220 sanitize nTyp to legal valuesCaolán McNamara1-1/+1
Change-Id: Iad71c4f79dbe03e2e325453eb0506a2d92d67c2d Reviewed-on: https://gerrit.libreoffice.org/36892 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 2b014a80022215a72d22bb950b2ee350c123c401)
2017-04-25tdf#107310: hybrid cell is a value cell as well as a string cell.Kohei Yoshida1-0/+3
Else it would cause a legitimate calculation to fail with #VALUE!. Reviewed-on: https://gerrit.libreoffice.org/36817 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 7c80ea40fab3cb8e8893d14e80e7bb7f63f0dbb0) Reviewed-on: https://gerrit.libreoffice.org/36917 Reviewed-by: Eike Rathke <erack@redhat.com> Change-Id: If8d4f40859d0c87b97afc952e4a3e4268450c40c
2017-04-25Optimize plain-text import.Michael Meeks1-3/+1
Cost of managing rsids is very significant >50% of import time, new Rsids will be generated for changes anyway. Also avoid un-necessary splitting of paragraphs on new-line. Change-Id: Ib959306f187f93bd3a85ead11fd2342b99d4ece3 Reviewed-on: https://gerrit.libreoffice.org/36938 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit e68b6e349c31ac1376e90218013e1e7612f2b522) Reviewed-on: https://gerrit.libreoffice.org/36952 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-25tdf#106359: register text/x-ms-iqy MediaType default extensionMike Kaganski2-0/+22
Change-Id: I63be77c4e148befa8f41086163ea2919b1e8baac Reviewed-on: https://gerrit.libreoffice.org/36942 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 82fbc7147183dd27be81c20d7c362937bafc3546) Reviewed-on: https://gerrit.libreoffice.org/36958 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-04-25The debugging rectangles are not needed any more.Jan Holesovsky1-13/+0
We have the debugging console in the loleafleat instead these days. Change-Id: I316fa6d101a14e1bc7f2a8fab554f516ec55644d Reviewed-on: https://gerrit.libreoffice.org/36949 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-04-24lok: When we actually have the OutputDevice, prefer that.cp-5.3-7Jan Holesovsky1-17/+17
Writer invalidation functionality depends on this actually. Change-Id: I0933c56ff3999a09118112ccf49bf00062c42444 Reviewed-on: https://gerrit.libreoffice.org/36914 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-04-24Bump version to 5.3-7Andras Timar1-1/+1
Change-Id: I3f0fa30309a0e90d8e7bd43fe7c90b94d0528dd5
2017-04-24Fix mouse position conversion in case of BottomToTop textTamás Zolnai1-2/+10
Change-Id: Ib058e44a1480013ce924585d8950534d0f3fc5a4 Reviewed-on: https://gerrit.libreoffice.org/36834 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit c0d09cc0e7ee12ac6dcc144e06855ba4621e4144) Reviewed-on: https://gerrit.libreoffice.org/36888 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-04-24Handle keyinput properly in case of BottomToTop vertical textTamás Zolnai3-2/+15
Change-Id: I2b0f7cee9a4a7d7ad154c705f84a8b995b4f23a1 Reviewed-on: https://gerrit.libreoffice.org/36830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 8c46185bf28f61e674186694e4944c1f8b3a9c00) Reviewed-on: https://gerrit.libreoffice.org/36887 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-04-24Avoid un-necessary dynamic_cast slowing plain-text import significantly.Michael Meeks1-2/+2
Change-Id: I5f3ff80b36220c80e777946f5f75354c4b6e4ab9 Reviewed-on: https://gerrit.libreoffice.org/36789 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 6d61720907f3f3392f9987f7c21a91bf049d1be5) Reviewed-on: https://gerrit.libreoffice.org/36799 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-04-24add ICU changeset-39671 fix for CVE-2017-7867 CVE-2017-7868Eike Rathke2-0/+190
http://bugs.icu-project.org/trac/changeset/39671 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=213 https://bugzilla.redhat.com/show_bug.cgi?id=1444101 Reviewed-on: https://gerrit.libreoffice.org/36754 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c7de8233d15ed0c90fef6c49a54d60cf10119f58) Backported to older MSVC using the UGLY_SIZEOF_MAPTOUCHARS macro instead of sizeof(UTF8Buf::mapToUChars). Change-Id: I4e776ad4fe63c77057b0c823f8672a2b6703346f Reviewed-on: https://gerrit.libreoffice.org/36774 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 3e227df8c645ee12b7852ab320c3041875d275ac)
2017-04-24ofz#1193 we only set these values, never read themCaolán McNamara4-14/+1
Change-Id: Ia2f54b536a4262e19abe260e8e19c9b15cc2d0ec Reviewed-on: https://gerrit.libreoffice.org/36780 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 241f36605bd50798afab9d3a7d3ae32619c906af)
2017-04-24tdf#107211 sw: ODF import: add a horrible hack to import "Default"Michael Stahl2-0/+25
... character style for hyperlinks and index-entry-templates. The problem is that the "Default" character style doesn't actually exist, it is just displayed in the UI so you can remove a character style that is set. So for the most part there is no need to store "Default" in ODF files, except that for hyperlinks the default isn't "Default" but "Internet Link"/"Visited Internet Link". Hence it was not really a good idea to rename "Default" to "Default Style", because when importing existing documents the text:style-name="Default" is not found, and for new documents text:style-name="Default_20_Style" is not found either because there is no style:style element that sets up the mapping between the encoded style-name and the unencoded display-style-name. Add some hack in SwXMLBodyContext_Impl::SwXMLBodyContext_Impl(), when all style:style elements have been read (so we don't override what's in the document) to create the mapping for "Default", "Default_20_Style" and whatever the translation of that is. (regression from 783d13a9276931e274a90b9b53de2c92dc8c055e) Change-Id: I8a80847571f194204c5df267cb48e826a82328b2 (cherry picked from commit 157013219230f251346a5aa662c39d02f15420ec) Reviewed-on: https://gerrit.libreoffice.org/36788 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 05710ae52ff9962c0852a4e2e59e1814c785b461)
2017-04-24tdf#107027 Remove language specific tags in templatesLaurent Balland-Poirier13-0/+0
For all templates: Modify XML code to: Remove Configuration2 directory Remove lang specific tags in: - settings.xml - styles.xml Remove printer and grid parameters Alizarin.otp Change names of master slides Remove hard coded texts tdf#104087 BrightBlue.otp DNA.otp Remove hard coded texts Focus.otp Remove hard coded texts Change text "Your logo here" to "Logo" to be less lang specific Impress.otp Inspiration.otp LushGreen.otp Metropolis.otp Remove hard coded texts Midnightblue.otp Remove Outline frame on page 3 Pencil.otp Remove hard coded texts Resize title to not overlap picture Sunset.otp Remove hard coded texts Set title in bold Resize outline text zone to fit in page Vintage.otp Vivid.otp Remove texts in Notes page Remove hard coded texts Change-Id: If16c6c65e6650c1b6600e6324c0f931009023074 Reviewed-on: https://gerrit.libreoffice.org/36752 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 59cf94fac8e53d7f098eb2fbdf59d3a6aff254ce) Reviewed-on: https://gerrit.libreoffice.org/36773 (cherry picked from commit 37b91d3f3a332ae7540c556751d39836b1f3d622)
2017-04-24redland: add raptor patch to fix some bugsMichael Stahl2-0/+44
Change-Id: I4e3db61fdfe0b984d36b4f67f8e891da48f79ddb (cherry picked from commit 8af6e5e0c4191b12d830b20f72ec3552eea15747) Reviewed-on: https://gerrit.libreoffice.org/36694 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 8044b81f1eaa8ac40acf405d5de450e011c4a34c)
2017-04-24tdf#107116 RTF import: fix missing upper and lower borders around textMiklos Vajna3-1/+36
See commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305: writerfilter RTF import: override style properties like Word, 2014-06-17) for the context. Here the problem was that various details of the top border were removed during the style deduplication, but not the top border sprm itself. That was interpreted (correctly) by dmapper as "no border", rather than "inherit from style". (cherry picked from commit e9f0d8d02885eca619552b19eab30c1eade9e7ef) Change-Id: I3dec8df789fc7b75fccfff91ce66f457fecd2f6e Reviewed-on: https://gerrit.libreoffice.org/36692 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c8c90854506cc7f1c3d7084ab97c156aead003e2)
2017-04-24Resolves: tdf#106838 icon set not visible in conditional formattingCaolán McNamara3-11/+27
Change-Id: Ibafaa487d39a69bc7c5c150361368614c0d9e004 (cherry picked from commit 1c2dd8dc14effe739bd826cf4fe77145d5b751bc) Reviewed-on: https://gerrit.libreoffice.org/35899 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 4e40cf62a142813a2ffa0a64148c84c1b4e60be9)
2017-04-24vcl: protect Window from exceptions during construction.Michael Meeks1-2/+8
Probable fix for: http://crashreport.libreoffice.org/stats/crash_details/f69188bd-0fdd-4b74-9ec6-35b544cba0c9 Change-Id: I6442451785867f0fc2daf84776118b092d4d6a18 Reviewed-on: https://gerrit.libreoffice.org/36653 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 6827da5052bfe975a3b34af8dfa8af75d41e904c) Reviewed-on: https://gerrit.libreoffice.org/36674 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 92edd724dd7f1ca85787480f046d48f9f27c51b8)
2017-04-21new loplugin: useuniqueptr: sc part 1 (only the ScMarkArray part)Noel Grandin2-20/+14
Change-Id: I24a837c79aaef2246929bb194635f01b4ddedb0b
2017-04-21LOK - Calc: header, cursor and selection misplaced by other view actionsMarco Cecchetti13-17/+445
The row header, the cell cursor and the currect cell selection become misplaced when another user inserts, deletes or resizes a row. The same is true for columns. This patch provides to invalidate cached position values in all views when one of the listed action is performed in any view. It also introduce 2 new LOK callbacks for informing the client that the row/col header is no more valid and needs to be updated. Finally, when a new row/col is inserted or removed in one view, the cell cursor position and the current selection (if any) in other views may need to be shifted lower by one row/col. Change-Id: I7002a9adf971929b3e38ff58fa0429e792a1e7c4 Reviewed-on: https://gerrit.libreoffice.org/36716 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-04-21sc lok: Notify when comment is added to destination docPranav Kant1-0/+2
This can happen, for example, when undoing a deleted comment. Change-Id: I4aff244f1263b650457a70334f5f4d2c75ad3b64 (cherry picked from commit 2373babc6888e840d44ed2db80567acccb9ba993) Reviewed-on: https://gerrit.libreoffice.org/36732 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-04-21related tdf#68604: Unit test for writing the plaintext annotations in DOCX.Jan Holesovsky1-0/+28
Change-Id: I8c747e72ca96ffd097c92326210c39740102ec79 Reviewed-on: https://gerrit.libreoffice.org/36786 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-21related tdf#68604: Write the plaintext version of the annotation...Jan Holesovsky1-6/+18
...if the TextObject is not available. This is perfectly valid situation in the case when the SwPostItField was created via the .uno:InsertAnnotation API. Change-Id: I3ae2a529ba7cc13cf5b04d57aa299d79e2044f37 Reviewed-on: https://gerrit.libreoffice.org/36785 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-21tdf#68604: Commit the data from the postit to the model before docx save.Jan Holesovsky2-2/+13
Change-Id: I74f4adad5f142b35ff8819577b1dbd6e5c45db96 Reviewed-on: https://gerrit.libreoffice.org/36757 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/36784 Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-19Updated corecp-5.3-6Christian Lohmaier1-0/+0
Project: translations 769636b6ac5701c4378d685440fed2e1f968f4bc update templates for 5.3.3 rc1 Change-Id: Id445b2ee9d0818a5af2de07f08890883065a4399
2017-04-19Bump version to 5.3-6Andras Timar1-1/+1
Change-Id: I2163820e1f7ba45ad02a341662c45a1c7627e078
2017-04-19tdf#106929 sw: SwCursorShell::Pop() ensure cursor ring is recreatedMichael Stahl2-0/+7
... from table cursor. The problem is that in this case, between Push() and Pop() there is no call to ClearMark() or any of the other functions that sets the SwTableCursor::m_bChanged flag, so MakeBoxSels() is never called for the m_pCurrentCursor after Pop() and there is no cursor ring selecting all table cells. (regression from b227a8e4d65e4bbfe991aed9342fe3e30eca8639) Change-Id: I5bce18b71fed60a926f4ddf9938dfb7d1ddf4e92 (cherry picked from commit c72b9c1dc5683a132bf00659e0c8556253340c97) Reviewed-on: https://gerrit.libreoffice.org/36670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 0ae1b76c3a90226ba588eb75837ab2f494ac5d5f)
2017-04-19call UpdateReference also for single cell copying, tdf#105245Markus Mohrhard1-0/+9
This is a combination of 2 commits. call UpdateReference also for single cell copying, tdf#105245 Reviewed-on: https://gerrit.libreoffice.org/36393 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit cb57a432ba98ffe197c8fd2528e4b363c3285cc4) only handling copy&paste needed, cut&paste bailed out, tdf#105245 follow-up (cherry picked from commit 840ac578dc5c21731b927bad6113839c4c69c108) 946d9f09e7571d347111ad66326ab375d153e298 Change-Id: I5fed22d2835466cbd07f8dbd917e9f881b7b2832 Reviewed-on: https://gerrit.libreoffice.org/36557 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit bbdaac9c5d03d59c55dc8ec1d9c34df502c11dea)
2017-04-19tdf#92650: handle overwritten references correctly in undo.Kohei Yoshida3-2/+12
(cherry picked from commit de39b6ba3a9edd20a476937ef0c78920df2f5c6d) Conflicts: sc/source/ui/docshell/docfunc.cxx Change-Id: Idc3fbd78f8163c97a9cd80a3ff474b6da0349353 Reviewed-on: https://gerrit.libreoffice.org/36539 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 856a2d868fedd010d58d6082d3cb4753a019408a)
2017-04-19actually show the newly selected cell, tdf#106194Markus Mohrhard1-0/+1
Change-Id: I0c9f839cbe55f2670602567e61dc4aba77fbef61 Reviewed-on: https://gerrit.libreoffice.org/36303 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit dbc616c0021b86e6365930ba581818fea280d1a8) Reviewed-on: https://gerrit.libreoffice.org/36386 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 7c1314bb1e63f9c3460175a8ee30422ebf3c4d37)
2017-04-19Change merge cell defaults for Collabora OfficeAndras Timar1-2/+2
Change-Id: Ib0f96e52f268df999fde34ea7bcf9ea9706ea11a
2017-04-19Settings for not showing Merge Cells dialog and for emptying hidden cellsAndras Timar2-3/+27
By default nothing changes. But users have the possibility to avoid the confusing (?) Merge Cell dialog. Also, when the dialog is disabled, users may want to set the EmptyMergedCells to true, to mimic Excel's behaviour. Change-Id: I9656ae59199bb697c45786dd478379f5c89eb08f Reviewed-on: https://gerrit.libreoffice.org/36680 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-04-19sw lok: Don't open the separate formula input bar in writer tables.Jan Holesovsky1-2/+6
With LOK, it steals focus from the user, and the user has no chance to get the focus back again. Change-Id: Ie54a377a9543ddda88e739fe1ebdfcb04d000ea7 Reviewed-on: https://gerrit.libreoffice.org/36686 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-18catch exception like text_wrapper_get_caret_offset doesCaolán McNamara1-1/+8
Change-Id: I7d681a5cd58af60005eefa9969ec975d5cfc5580 (cherry picked from commit 0d2a607a849e3f1b51092c7d96bc5529420cfab2) Reviewed-on: https://gerrit.libreoffice.org/36635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 615942e388c6dfa48d1edbf645fe6b0dd67cfa40)
2017-04-18coverity#1405158 Wrong sizeof argumentCaolán McNamara1-1/+1
Change-Id: Ie6b7fc3d2b7d1ac709501698e55aabc72215b187 (cherry picked from commit b17177c63a4eac55dcdaa3006abec05ab71ca1b4) Reviewed-on: https://gerrit.libreoffice.org/36578 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit ee85316249902aa19f4426acae546ee79a083b07)
2017-04-18tdf#106933 vcl: delete D2DWriteTextOutRenderer before exit()Michael Stahl3-10/+21
As it happens this DirectWrite stuff is using some thread pool internally, and that must be shutdown before exit(), as Win32 will terminate all other threads at that point, and then the thread pool wants to talk to threads that don't exist any more. https://blogs.msdn.microsoft.com/oldnewthing/20120427-00/?p=7763/ So convert this from a global variable that is deleted from DllMain() to a member of SalData, so it is deleted from DeInitVCL(). Change-Id: I51408a07c78758cf0c193ab66b9214d0c9dbd9e3 (cherry picked from commit df556aa47da22f96b3fcd356c12419d3035cba3c) Reviewed-on: https://gerrit.libreoffice.org/36534 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 1ba5bae490f7e14e475e0b80f03e5f444cdce908)
2017-04-18ofz: header has to be at least 1 pair longCaolán McNamara1-1/+9
Change-Id: I5725048519a2b68265e90d12b1e4bcb506c56fc2 (cherry picked from commit e72f3ce68e18ac604469ce5e856341a469af27ff) Reviewed-on: https://gerrit.libreoffice.org/36519 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d180418fedd4592044c33558426e9ea9be6f1ebd)
2017-04-18Replace EmfPlusRecordType decimal valuse with hexBartosz Kosiorek1-33/+55
Change-Id: Ia5f248282e663e86b76a8c90fb5dd55d112f6912 Reviewed-on: https://gerrit.libreoffice.org/36260 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 723ee43cf65f85d7b586ae8c98529a22621054a3) Reviewed-on: https://gerrit.libreoffice.org/36522 (cherry picked from commit 42bf09876a8cb7faef0c2490ff3e7531de4fec8f)
2017-04-18tdf#106970 DOCX import: don't collapse para auto space for different numsMiklos Vajna3-3/+24
Commit 1bf7f6a1a50ee9f24a3687240fe6ae390b905a6b (tdf#106690 DOCX import: fix automatic spacing before/after numbered para block, 2017-04-04) made sure that autospacing is only collapsed in case the adjacent text nodes both have a numbering rule. It turns out there is an additional condition: even if both text nodes have a numbering rule, do the collapsing only in case they have the same numbering rule. (cherry picked from commit e1c83d0514e6123faa50ad0a7aa6a9031b271c9a) Change-Id: Idb7a2b24d7eaa9094cc36f86b8a483045a33d028 Reviewed-on: https://gerrit.libreoffice.org/36510 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e57873156d3c04ecc34bb5f38b186ebe29567f0c)
2017-04-18tdf#92007 python scripts with tuple-assignments fails on access from GUIWerner Tietz1-1/+6
Change-Id: Ice1d7d92cec56751cb26cbb31a5995ab30895125 Reviewed-on: https://gerrit.libreoffice.org/36399 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 7ef47336411389ac492729bef52fe62aebe90f5a) Reviewed-on: https://gerrit.libreoffice.org/36483 (cherry picked from commit 9a6d78b722f3a49f71a680e49cf64e7cfb637c43)
2017-04-18Resolves: tdf#106078 get bounding box of commented region for gtk3 tooltipsCaolán McNamara1-1/+19
Change-Id: I4fdc1f471c6c191be9c7c611926bd2b5b2b41308 (cherry picked from commit eb433f83a5f66dd1ca8ed0c62ef9cc0761b7f0ac) Reviewed-on: https://gerrit.libreoffice.org/36383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 244d2abb6c1bcd89cedf773d8721f62451708c3f)
2017-04-18tdf#105286: Implement text rotation for Impress tablesTamás Zolnai39-120/+712
Typo: TopToBotton -> TopToBottom Change-Id: I1b4d3ab9ec1d1383d76a56c9662ffeeb9fe69655 Reviewed-on: https://gerrit.libreoffice.org/36014 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 334e6e2f1ad3da319be0849ec426aa64b18cb599) Add SvxTextRotateItem inherited from SvxCharRotatItem I will be use it later for text rotation inside a table. Change-Id: I4cbaf05953b0e71331d2f3fdb45b7c4254a2b8cc Reviewed-on: https://gerrit.libreoffice.org/36021 Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 1e30d2aface12a31687e5a27126e2061efd4b0cd) Introduce text rotation for Impress tables * Introduce new table property for text rotation * Support only two rotation angle (270° and 90°) * Implement editing and rendering of 270° rotated text (90° rotation was already implemented) (cherry picked from commit c671094154ecec6f3ba5beea9d26ff0d2d4d86ad) Change-Id: Ifc2e0f171e9c840e86b365e9af2c30aa97ecd92e Implement RotateAngle API property for Impress table cells (cherry picked from commit a0755ab8772d01797f4945016a978a2bbd8fdf20) Change-Id: I01379c0fc21e8fe294bc882bf824f64502863ff4 tdf#100926: PPTX import of table with rotated text (cherry picked from commit 2436cf17304f25c7d34da52a321d6da0e9011d19) Change-Id: I05a8e979ac11b179e15784023032a56edc5b569b ODF import / export of rotated text in Impress table (cherry picked from commit bcb371b1a830442610ad7fda476eda5271427a50) Change-Id: I57136e32ed2db5e405a45e8e4bad1b8d459b7ae8 Fix vertical text and bitmap bullet rendering Change-Id: I881fce0511c81b164516d68f72c7e750687d4e0e (cherry picked from commit 15ac3f9f4dc65fc0c6020284064e3725956f5d0a)
2017-04-18LOK - Calc: Selecting cells to the left/top does not work properlyMarco Cecchetti1-57/+76
This patch fix a regression of commit 4b39183c5740067cc31c006214cb24b81ee0f98c "LOK - Calc: make computation of cell cursor position faster" The problem occurs when bAllowNeg is false. At present should be safe, in the LOK case, to assume that GetPosX(eWhichX) and GetPosY(eWhichX) are always 0. In the end we could always find the screen position for the left-top cell position and subtract it from the final screen position values. Change-Id: I7d4bf24cb57757e7ac05fcde48ade9feec56aba7 Reviewed-on: https://gerrit.libreoffice.org/36562 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>