summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-04-27Bump version to 5.3-48co-5.3-48Andras Timar1-1/+1
Change-Id: Iaaf4ba4953f7da2b7267792b3df99328f4e3fc9d
2018-04-27Winreg config layer: Allow to define external backend separatelyMike Kaganski1-3/+14
Defining backend separately allows e.g. creating ADMX templates with easy-to-use UI, where user defines only LDAP names for the setting, and doesn't need to type the LO configuration backend name. Change-Id: I64f23043c94a5a4e0ba7281d0f711a427d694126 Reviewed-on: https://gerrit.libreoffice.org/53413 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 8776a895d41f174bf5d86332093ed5795c73bdd6) Reviewed-on: https://gerrit.libreoffice.org/53437 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-04-27tdf#117246 RTF import: don't loose page breaks inside nested groupsMiklos Vajna3-0/+26
Regression from e3f254ab8211fbab7541cde2100a35c875b0c240 (RTF import: fix spurious page breaks at doc end (related: rhbz#1065629), 2014-02-27), the problem was that now we update the parser state to remember the next section break should set the break type of the current section to "next page", but this state should be remembered once the RTF group ends ("}" character), otherwise \page will be represented with a continuous break, i.e. lost. (cherry picked from commit 4a93b46e4652e73ed3460e4c66999d94e50db4b7) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I69a8413f45e17e11d6d676c7bfd13ca7560b4d43 Reviewed-on: https://gerrit.libreoffice.org/53557 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-04-20Bump version to 5.3-47gov-5.3-47co-5.3-47Andras Timar1-1/+1
Change-Id: I81158b8cdc2c53b6369e84a44e786ecf5d3baa83
2018-04-20Don't crash when opening templates via WebDAVJan-Marek Glogowski1-2/+3
When loading a ODT template via HTTP, it crashes LO with an lang::IllegalArgumentException in LockFileCommon::ResolveLinks. This happens when closing the loaded template, as LO tries to remove a not-existing lock. aDocURL at this point is empty, so HasError() is true. As stated in the comment, we don't need a lock for documents created from templates, as this opens an internal copy of the document, so don't mark the teplate document as locked. Change-Id: Ide60020b6287aa67861dbcc8ec1b94f37896b7ef Reviewed-on: https://gerrit.libreoffice.org/42485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit f95e7ef38e0bf79fa9662bfd50de612d50ef71de) Reviewed-on: https://gerrit.libreoffice.org/53195 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-04-18Bump version to 5.3-46gov-5.3-46co-5.3-46Andras Timar1-1/+1
Change-Id: I7c882c04e4e89e3d33fddfa5341be90cf2f2ed3b
2018-04-18tdf#116420: Windows: Test if a filepath redirects to a WebDAV resourceMike Kaganski4-1/+113
In Windows, filesystem redirectors can map WebDAV resources to UNC paths, or to drive-based "local" paths; so a WebDAV URI of the form "http://WebDADServer/root/directory/File.ext" may be accessed using "\\WebDADServer\root\directory\File.ext" or "Z:\directory\File.ext". When using these paths, failure to create a lockfile aside the opened document should not be considered an error; so this patch checks for this. Regression from commit 6ca3b3648e25ae9d4d2d29a0df83349198ec3f5e. Change-Id: I1de55b66447dc91d22b6d2b5b121de96bf32e4ee Reviewed-on: https://gerrit.libreoffice.org/53070 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 642a49e8d3006d000bc6c58def34d4e96764c6cc) Reviewed-on: https://gerrit.libreoffice.org/53084 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2018-04-09Bump version to 5.3-45gov-5.3-45Andras Timar1-1/+1
Change-Id: Ib8cfe6b6cadf5db3ed216d7f51bb03129c92d838
2018-04-07forcepoint #33 ensure payload is a EMFPPathCaolán McNamara1-2/+2
Change-Id: I0a9f332cc66e43caa4e1611006fa765cad063539 Reviewed-on: https://gerrit.libreoffice.org/51916 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 5795e68be1afe185ed71294a4d389e763c95bfdd)
2018-04-07tdf#115407: preselect sound file savedJulien Nabet1-3/+5
To display the sound in the dropbox, the complete filename (eg: file:///home/julien/lo/libreoffice/instdir/share/gallery/sounds/pluck.wav) was compared with items of the sound list formed like this: file:///home/julien/lo/libreoffice/instdir/program/../share/gallery/sounds/pluck.wav See https://bugs.documentfoundation.org/show_bug.cgi?id=115407#c1 Since listbox displays only basename, let's just compare basenames Change-Id: I5fb49990322423fa7818e5d6e1cafd828e3500ec Reviewed-on: https://gerrit.libreoffice.org/52476 (cherry picked from commit 23c82e1a377ea6fce65d71277ec59b3ca150b98a) Reviewed-on: https://gerrit.libreoffice.org/52490 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fce0f5823bbd6297f3455a2a36e4a66c423db9b9)
2018-04-07tdf#116544 crash on unhandled IllegalArgument exceptionCaolán McNamara1-14/+62
Change-Id: I290ba6097d6d91bf4677e7e92c896bd6359cbc49 Reviewed-on: https://gerrit.libreoffice.org/51835 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 92a0181d96a43a7a0449f400d38299097e864617)
2018-04-07forcepoint #34 survive missing autostylesCaolán McNamara1-0/+2
Change-Id: I742816297659d614e836a8d5e8965b1c55154719 Reviewed-on: https://gerrit.libreoffice.org/51892 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 2446ae942b2ca35c9f727fb15ef5ec8d248b55c5)
2018-04-07forcepoint #32 survive missing value rangeCaolán McNamara1-4/+14
Change-Id: I90315f0481bf73c4d9071959bf5408f4a2690257 Reviewed-on: https://gerrit.libreoffice.org/51886 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit ee9d80d6d93afe914097b3f1835777052cc0000d)
2018-04-07forcepoint #31 check validity of another group rangeCaolán McNamara1-0/+2
Change-Id: I82ff3e47a033c91581b108e1685b1ff4d5865895 Reviewed-on: https://gerrit.libreoffice.org/51883 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit be9e229ee147d45f110ecc1680be4068c1716c02)
2018-04-07forcepoint #31 survive missing control modelCaolán McNamara1-2/+8
Change-Id: I37e4af560b46b4f6d9e0b87fe58493818f366d3c Reviewed-on: https://gerrit.libreoffice.org/51878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit d98cfa4df4e6f7391b7790c625c1f8a650514e88)
2018-04-07forcepoint #32 survive missing emf pathsCaolán McNamara1-4/+10
Change-Id: Ic27c3bbac12f66b30ff2f30f558180127cc73a51 Reviewed-on: https://gerrit.libreoffice.org/51876 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 6ec045e846d49d60975cb4eb41f81e46652a0070)
2018-04-07forcepoint #30 check validity of group rangeCaolán McNamara2-0/+2
Change-Id: Ie0611f36809b051ce46030e44c137b4e1f8d2fe0 Reviewed-on: https://gerrit.libreoffice.org/51865 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e82beb0812f2f4742b80ba1f63a026cbe77f5b25)
2018-04-07forcepoint #29 detect illegal self series addCaolán McNamara2-0/+5
Change-Id: I3bba0f942780c54951a3a810c05cc3b56ca18a5e Reviewed-on: https://gerrit.libreoffice.org/51862 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit a471620af5099c960e22b46fad6e6f92a5055dbd)
2018-04-07forcepoint #28 missing cell on abw importCaolán McNamara1-2/+5
Change-Id: I7633a17afab5aa2eb9e47a552bd5d92c87d383c7 Reviewed-on: https://gerrit.libreoffice.org/51853 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 671e9453ed07f1cf537ee507d63976f54be8e465)
2018-04-07ofz#7063 ensure lifecycleCaolán McNamara2-22/+16
Reviewed-on: https://gerrit.libreoffice.org/51734 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 919ff229ff33b0b23b30ee963e9f96f46fe9e1a2) Change-Id: I18d62bc3bd409ca65c85ea47e8d5b3930481edf9
2018-04-07forcepoint #35 handle odd number of dimension fragmentsCaolán McNamara1-1/+1
Change-Id: I97e4e1b38d80276077b3427c90ae33023afb5e59 Reviewed-on: https://gerrit.libreoffice.org/51901 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit bd89b70a2f7ecccfa2edc965121c4b5976e54db9)
2018-04-07ofz#7165 set a recursion limit for svm in svmCaolán McNamara5-11/+48
Change-Id: Id9089986012588690b6d5e33cd71d094ef2357dd Reviewed-on: https://gerrit.libreoffice.org/51984 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit fc6e9a715c74b2ff74ff9370fe5f5a29e20be8cd)
2018-04-07forcepoint#36 avoid dangling SvTextShapeImportHelper in case of exceptionsCaolán McNamara2-0/+5
Change-Id: Ibdbc047029c31d2b06d2349d68e1cbd9b15fd514 Reviewed-on: https://gerrit.libreoffice.org/52137 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit c4674e8a1b04314fc45f6a8269cf6519b5fc012b)
2018-04-07ofz#7121 NamedDBs::insert takes ownership of its argumentEike Rathke4-11/+8
at one point this was based on std::auto_ptr and didn't free its arg on failure Adapt description to reality (cherry picked from commit f161cdc979587488df83e63002bee7ee15152d42) Reviewed-on: https://gerrit.libreoffice.org/51934 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c4946ba195c9f0c2fb3f18f1028eea725c920e2e) Change-Id: I24133fb6c52bd7500037364120cb11d1b1f099c2 8aeed6876d80b7ebe4ebb5e2cfd12e00420bd207
2018-04-07ofz#6999 check available data lenCaolán McNamara1-2/+2
Change-Id: I89a7913d35706ee5797beee654ef99be088431b8 Reviewed-on: https://gerrit.libreoffice.org/51499 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit de7d754e8706eb9187ddfb9e87c4f00faa98ca17)
2018-04-07ofz#6827 Bad-castCaolán McNamara3-18/+35
Change-Id: I856d781f122c21c02a0a8cd01369d49f50b8a555 Reviewed-on: https://gerrit.libreoffice.org/51365 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 19f0b25acc2a23b790301755a9fee2629eb667b0)
2018-04-07forcepoint #24 back() on empty vectorCaolán McNamara3-0/+525
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: Idb6723b53a1ae8aaca80847bfe643bc4abaedd21 Reviewed-on: https://gerrit.libreoffice.org/51123 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 13468a3a667c6719ccbc44c913c194fc77d8e7cf)
2018-04-07forcepoint #26 check input against max valid enum valuesCaolán McNamara2-8/+8
Change-Id: Ide72884c77904ae9495b5189cde086e43923e4bd Reviewed-on: https://gerrit.libreoffice.org/51138 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 05315e34c354b84409aa5e29ce9b8ce494570b52)
2018-04-07forcepoint #25 ensure null terminationCaolán McNamara1-5/+9
Change-Id: I37f4787fb5772e959c45280d9650adcc15591033 Reviewed-on: https://gerrit.libreoffice.org/51130 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5a6a1e932f2efe9646d927f20b2cca9ca12a3a70)
2018-04-07ofz#6827 drop last anchor pos if it will be joinedCaolán McNamara1-0/+15
Change-Id: Ib36b74b455f741d9dcccbdf244d21453837bda3c Reviewed-on: https://gerrit.libreoffice.org/51100 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit f79c3fbd8a9c4e89346e042cc31397bd6e277e09)
2018-04-07forcepoint #16: fix heap-use-after-freeMiklos Vajna3-1/+5
PDFDocument::Tokenize() in the aKeyword == "obj" case allocates a PDFObjectElement, stores it as an owning pointer inside rElements, and also stores two non-owning references to it in m_aOffsetObjects and m_aIDObjects. So make sure those 2 other containers are also cleared then elements go away. LO_TRACE="valgrind" bin/run pdfverify <sample> doesn't report errors anymore after the fix. Reviewed-on: https://gerrit.libreoffice.org/50632 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 506d4cbc2f0dbef6f20f1199efcda805c9901d09) Change-Id: Ie103de3e24a1080257a79e53b994e8536a9597bc
2018-04-03tdf#107035 Fix field character style DOCX importLuke Deller2-0/+4
Reinstate a call to DontExpandFormat which was removed from appendTextContent in commit 232ad2f2588beff50cb5c1f3b689c581ba317583 This ensures that direct character formatting which ended immediately before the insertion point will not be expanded to cover the inserted content. Reviewed-on: https://gerrit.libreoffice.org/50729 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 18cbb8fe699131a234355e1d00fa917fede6ac46) Change-Id: Ie5fa6b5c5acee4f885f9e67535e98801af23661a (cherry picked from commit c1f393d899360e11e25d562d90285895f1e751e9)
2018-04-03tdf#116472: import "auto" border color as blackMike Kaganski3-18/+23
Since commit fe6da2feb57c3d5e355a36f6b8ac09b48412ff39, "auto" color is supported in OOXML import. Since ODF doesn't support "auto" color as border color, just convert "auto" border color to black on import, like is done in GetLineIndex in ww8par6.cxx. Incidentally, this also fixes a problem in RTF import, where we used to import black borders ("\red0\green0\blue0;" entries in color table) as 0x000001 ("\red0\green0\blue1;") - see fixed tests in rtfimport.cxx. Change-Id: I4f5e720d215b51c8a43dc7c58f338741bd608efc Reviewed-on: https://gerrit.libreoffice.org/51519 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51585 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/52272 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 3a53fe4456f72dd57640b5bb33c5f08da96069f7) Reviewed-on: https://gerrit.libreoffice.org/52348
2018-04-03tdf#116179 Support reading "auto" colour from docxLuke Deller17-31/+74
In docx a colour value is represented as a 6-digit hex RGB value, or alternatively the word "auto" to represent automatic colour. - Add support for reading the value "auto" as COL_AUTO. Previously this would be read as if it were a hex value, stopping at the letter 'u' which is not a valid hex digit, resulting in the colour 0x00000A - a very dark blue, which looks close enough to black that it went unnoticed for a long time :-) - Remove code which tried to handle this wrong 0x00000A value, including the constant OOXML_COLOR_AUTO, as it is no longer needed and will cause surprises for anyone who really wanted this exact shade of dark blue - Fix unit tests that were checking for 0x00000A Reviewed-on: https://gerrit.libreoffice.org/50995 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/51461 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 3967aebca94be9ceea3e36b43f7f53589473ad4e) Change-Id: I6000070341931147ff9341ad6281cd3b53c02b46 (cherry picked from commit ccef956c4f11ac6c0612a0d22845d02743c91039)
2018-03-27tdf#116241 Customizing value highlighting colorsSzymon Kłos9-61/+280
Available in: Tools->Options->Application colors Change-Id: I6e4f7a0dcad9a6ee222275019596853f0cbd3ab0 Reviewed-on: https://gerrit.libreoffice.org/51791 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51943 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit a99998525242d7d3ee48bece6ea699814fd4433f)
2018-03-27tdf#84205 If theme not found, use firstSzymon Kłos3-2/+20
Not a complete fix, workaround. Change-Id: If4d765eaeae3419f4f1deb4e1cfbe0113a71da94 Reviewed-on: https://gerrit.libreoffice.org/51440 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51458 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 586d56208861135e6548a4d73961e64cd3df5d68)
2018-03-27tdf#104789 Export opacity attribute nameSzymon Kłos3-35/+41
Change-Id: Id47ab6b3cb20fbcebb2d7fa589f3b0d7552e2cce Reviewed-on: https://gerrit.libreoffice.org/51369 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51457 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 63f6174b67a7e731389d477e0856b64478e6511d)
2018-03-27tdf#104786 Don't export empty 'to'Szymon Kłos4-9/+33
Change-Id: I16b573fd6455813c6be5c2f5a0f0a820360a239f Reviewed-on: https://gerrit.libreoffice.org/51359 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51456 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 16d316c912ef0ebbab30c66f2df898a407ca5c86)
2018-03-27tdf#90627 Don't save empty conditionsSzymon Kłos4-35/+47
Change-Id: I5a953c1b0fff7bf41a59360a8f52596264ddf266 Reviewed-on: https://gerrit.libreoffice.org/51293 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51455 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit a21204ec1cf0b5f311f581ecce437785005d0456)
2018-03-27tdf#104792 Double check for target shapeSzymon Kłos3-2/+24
Change-Id: Ibe23377c7752d9ce97c7b100af4b2759b3ce946f Reviewed-on: https://gerrit.libreoffice.org/51241 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51454 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 03a5a78a78808e1ec0c1cd4ee41c05cfa49143bd)
2018-03-26tdf#116489 - fix ucb TaskManager deadlock.Michael Meeks1-1/+3
Change-Id: Ia362db52e7b078203964704569e1d54f053f2b57 Reviewed-on: https://gerrit.libreoffice.org/51544 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 5b1442ec1e6946ec3a3b9d8cfdd57ac1437d23ab) Reviewed-on: https://gerrit.libreoffice.org/51555 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-03-26Update company's address in EULAAndras Timar2-1/+1
Change-Id: I6b7e53882fc36c96928b93bc1cf42d63dd77556a (cherry picked from commit 96cc6a5a858b5b04f00d44fac1e4e00719871af6)
2018-03-23tdf#115861 DOCX import: avoid last-paragraph removal when discarding footerMiklos Vajna4-1/+26
Discarding header/footer is necessary when the document or section settings request to ignore first or even headers/footers. In the bugdoc case settings.xml didn't opt-in for different even/odd footers, but there was an even footer to be ignored. Handle this state at two more places, so we don't end up in a situation where we ignore the footer but not its "remove last (empty) paragraph at the end of the footer" action. Also make the debug dumper for text ranges more robust to have a working token dump when we try to get the string for a table. (cherry picked from commit 49cf733effc56c09c5e2eb023120c2d3532b5b3d) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport11.cxx Change-Id: I6395f37aa40c42304e2c918d87dadecb21e9d378 Reviewed-on: https://gerrit.libreoffice.org/51763 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit 01d1fdf8a348013eb6fc4cda61d3225a81681dd5) Reviewed-on: https://gerrit.libreoffice.org/51764
2018-03-23tdf#112118: Use correct border when calculating marginMike Kaganski9-65/+108
This is a longstanding (at least since 2000: already present in commit 7b0b5cdf) error where left border linespace was used when calculating right margin. It was copypasted from ww8 import to ooxml code verbatim. The problem only manifests itself when left and right border spacings are not the same; and since we had other errors in the borders import, that additional problem simply wasn't apparent. Also use scaled border width in border distance/margin calculations. Unit tests updated. Change-Id: I70961e1bde29471def69e1ef944ba2779cffe307 Reviewed-on: https://gerrit.libreoffice.org/51474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51489 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/51688 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2018-03-23tdf#116403: consider borders when updating right-aligned tab in indexMike Kaganski3-0/+31
Change-Id: I415d8fcfdd75e6d608ec2e3ba228146cf8139278 Reviewed-on: https://gerrit.libreoffice.org/51388 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51488 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/51687 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2018-03-23tdf#112118: DOC: properly import/export border distanceMike Kaganski13-233/+278
DOCX part was done in fb959e581c900b392efd0bb329b7cf30c8ed56a5. This commit fixes DOC part. Line width wasn't taken into account on import; and export was done only with "from text" distance, which gave poor interoperability with Word, where the borders were close to page edge. The common code is moved to editeng/source/items/frmitems.cxx and include/editeng/boxitem.hxx. Change-Id: I3d1d1312cb9dc9a9e00d9847ec11234cd787df60 Reviewed-on: https://gerrit.libreoffice.org/51366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51487 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/51686 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2018-03-23tdf#112118: DOCX: properly import/export border distanceMike Kaganski9-113/+235
https://wiki.openoffice.org/wiki/Writer/MSInteroperability/PageBorder discusses implementation differences between ODF model and MS formats wrt dealing with page margins and distances to borders. This patch corrects import from DOCX, so that the border distance and width doesn't add to the margin size imported from file anymore. It takes care to preserve size from page edge to text (the most important size that affects document layout). When borders go outside of range valid for ODF, the margin is set to keep text area intact, and the border is placed as close to intended position as possible. Export code now also properly handles border width. Also, an improved heuristic implemented to better export cases unsupported by Word, so that the result would look closer to ODF original. We still write correct sizes to OOXML, so that when reopened by LO, the borders will be in correct places; but as Word cannot handle sizes more than 31 pt, it will show borders shifted. This prevents from adding border widths and distances to page margins at each opening of DOCX, saving back the changed value, increasing the margins each time. Change-Id: Ia978ab119dd661949d6c321aea91397f28d205b0 Reviewed-on: https://gerrit.libreoffice.org/51267 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51399 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit c91f81f59fac308d8ab86637b241502e68d7ab6a) Reviewed-on: https://gerrit.libreoffice.org/51400 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2018-03-14sw: remove duplicate "MsWordCompTrailingBlanks" view settingMichael Stahl1-14/+1
This is already a document setting, no point in writing it twice into settings.xml. (cherry picked from commit 7667675397c98bb38cdd14dd689a32e9f8a986d3) Change-Id: Idcc99a194df321e11e091a2388b919e11fe94316 (cherry picked from commit 15b9ea2b42d1c2e012c064d39b9afffdb08a9bbd)
2018-03-14tdf#104349, tdf#104668 MS Word compatibility trailing blanks optionVitaliy Anderson12-70/+146
The commits: 1c1747ac13a9d895df0fcba2fbb1bd266dccd74b and 4a410dd147f7160c1d62e3e0b67388a178d5136c make trailing spaces and their highlighting compatible with the Ms Word. The option is enabled by default for imported MS Word formats: .doc, .docx, .rtf For the ODF files the option is disabled by default Also it allows saving and loading the option state to the ODF UserData. It may be manually set in Tools->Options->LibreOffice Writer->Compatibility Reviewed-on: https://gerrit.libreoffice.org/33046 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 7fa20da88a4778bdf20d6ca0491fe97ae03ab554) Change-Id: I5a86359c52d18e50bbb54b9f37c79b672591c369 (cherry picked from commit 6c86ae2fec7d2a1375a3e9683ea2155448990ce7)
2018-03-14avoid crash in 130+ odt export testsCaolán McNamara1-4/+4
e.g. fdo44181-1.ott to odt Change-Id: I23403415378ddf50ff007fb4b5d88b4009668bf6 (cherry picked from commit 2085d8203b0ff49b6e43ff900f497fb5343708d8) (cherry picked from commit 38d2aa02e8b617301f1a7db3831b73572d8b40bf)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 16:32:34 +0000