summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2018-01-17Fix typosAndrea Gelmini
Change-Id: I5fff9ccb1bc74b85ee378439ffa2272583ffcb0f Reviewed-on: https://gerrit.libreoffice.org/48024 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-17Fix testTdf113481 in case detected script is not as expected.Mark Hung
Change-Id: Iefc85ab40831e4e2576ce1b3ac513858cf18185b Reviewed-on: https://gerrit.libreoffice.org/47898 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2018-01-17loplugin:unnecessaryparen extend to delete statementsNoel Grandin
Change-Id: Ic4383ea948876a26f791f0e5b0110cef978a26e1 Reviewed-on: https://gerrit.libreoffice.org/48027 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-17lokdialog: Convert the Format -> Paragraph... dialog to async exec.Jan Holesovsky
Change-Id: I47ec0ca95a713a7485b936aea7d7351970c9d967 Reviewed-on: https://gerrit.libreoffice.org/48011 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-17lokdialog: Convert the Format -> Character... dialog to async exec.Jan Holesovsky
Change-Id: Idd1407f54729f7be18d458db7bda7de0b0cc6ad6 Reviewed-on: https://gerrit.libreoffice.org/47986 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-01-17remove indirection in SwFormatField ..Jochen Nitschke
, implicit delete the copy assignment and remove comments. no logic change intended. Change-Id: I5c21b812154f501c68a522def4f223c38a9ff83b Reviewed-on: https://gerrit.libreoffice.org/46636 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-16sw: try to fix non-HAVE_MORE_FONTS buildMiklos Vajna
Change-Id: I8d8ac84ac8bb44fbc00be26c7e4b16001103a535 Reviewed-on: https://gerrit.libreoffice.org/48006 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-16UITEST - add test for writer Tracked changesZdeněk Crhonek
Change-Id: I53773d52bfb3d171988764f76af0487ba571f13c Reviewed-on: https://gerrit.libreoffice.org/46928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-16tdf#97361 Tests in sw should be more pythonicSaurav Chirania
The modified files have been made more pythonic by removing Java-like codes. Change-Id: I46c121f3bd350b0218ca700ea949616e010f917e Reviewed-on: https://gerrit.libreoffice.org/47863 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-16use more ScopedVclPtr to avoid missing disposeNoel Grandin
follow on to commit 315be3a276b01e88c794da1dbc6252a8b803d269 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 12 10:48:59 2018 +0000 VclPtr, missing dispose Change-Id: Idfa4709f10928ef6d53ada93db0f5452e5d5c4eb Reviewed-on: https://gerrit.libreoffice.org/47982 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-16Fix typoAndrea Gelmini
Change-Id: I02379f413d59226c81a8919dc1bc0786cecf900a Reviewed-on: https://gerrit.libreoffice.org/47927 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-16Fix typosAndrea Gelmini
Change-Id: Id3d1a07922d4ca05e3bbf61d4b5797a30fc5b23a Reviewed-on: https://gerrit.libreoffice.org/47872 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-16Fix typosAndrea Gelmini
Change-Id: I46873c8bea3bbfeebb7dee50918d3978408fcf63 Reviewed-on: https://gerrit.libreoffice.org/47842 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-16Fix typosAndrea Gelmini
Change-Id: Ia976371bf52eb1216d8abe728d80bbb87a3c38a2 Reviewed-on: https://gerrit.libreoffice.org/47858 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-16tdf#114536 sw: fix use-after-free in SwTextFormatter::MergeCharacterBorder()Miklos Vajna
SwTextFormatter::Underflow() truncated a line portion, which deletes the rest of the line portions, but left m_pFirstOfBorderMerge unchanged, leading to a crash when SwTextFormatter::MergeCharacterBorder() tried to access it. Fix the problem by updating the non-owning m_pFirstOfBorderMerge accordingly when truncating the line portion. Change-Id: I5e445bbe2424d70d60c363fa4e3a00636e282325 Reviewed-on: https://gerrit.libreoffice.org/47923 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-16Fix typosAndrea Gelmini
Change-Id: I078626eaa3155cc429320cc8c1532003b382b22a Reviewed-on: https://gerrit.libreoffice.org/47855 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-16Remove unused CSS1_OUTMODE_SPAN_TAG1_OFFStephan Bergmann
...no other traces of it apart from its definition in 7b0b5cdfeed656b279bc32cd929630d5fc25878b "initial import" Change-Id: Id18fef73416a5159b002ff6ab6d54c2ced51cbfd Reviewed-on: https://gerrit.libreoffice.org/47921 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-16ofz#5391 Integer-overflowCaolán McNamara
Change-Id: Ic252a95cf535bc40560d8e772224871f2b944345
2018-01-16ofz#5347 Indirect-leakCaolán McNamara
Change-Id: I4eb18c7ee52b29de9fabb555ad59cd9051d376b2 Reviewed-on: https://gerrit.libreoffice.org/47922 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-16tdf#115013: write merge field column into docx merge fieldsMike Kaganski
Change-Id: If1e0a8968407c72e42cb7ca487541d0b8227aabc Reviewed-on: https://gerrit.libreoffice.org/47895 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-16Writer tabbed notebookbar update file tab to have 2 linesandreas kainz
Change-Id: Ic622ae2deb65e8a2972056514a93bb062fd34886 Reviewed-on: https://gerrit.libreoffice.org/47169 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-01-15change Not to Dont in tdf#36308 fixJim Raykowski
Change-Id: I05806eea3363b7363d7a377277c63785aadc5386 Reviewed-on: https://gerrit.libreoffice.org/47870 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-15tdf#113877 Insert document: merge two lists into oneSerge Krot
When inserting a new document into current position we need to concat to lists into one only when they have the same list properties. Added unit test. Change-Id: I66a8090fdeacd3a630700113d6a26a1cad75dc41 Reviewed-on: https://gerrit.libreoffice.org/47814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-15sw: prefix members of SwAuthorField, SwBreakIt and SwCombinedCharFieldMiklos Vajna
Change-Id: Ic277b91a75602b0997ff68feb46a9cad9dae4e46 Reviewed-on: https://gerrit.libreoffice.org/47891 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-15tdf#76817 ooxmlimport: connect Heading to existing numbersJustin Luth
This fixes the inability to insert a numbered Heading into an existing sequence in an opened document. Before it would start a new sequence, but now it connects to / adjusts the other numbered Headings. LibreOffice has built-in handling for "Chapter Numbering". All of the formatting for this is tied to the paragraph stylename. Since MSO has a different structure, in docx format these are defined as "regular" styles with an OutlineLvl component. During import, that style information was copied to LO's special Outline chapter numbering style. *From this point on, the "regular" list style should no longer be referred to.* Numbering is only defined by the paragraph stylename (which by definition is "Heading X"). The unit test I am hijacking has an unchangeable Paragraph Numbering style of "Outline Numbering" and not WWNumX. So, in reality the document ought to require the style name to be the internal Outline style like it originally was. A followup patch allows this to round-trip. Change-Id: If5d544529fa32d4abaa2b46403bc61c028e53f21 Reviewed-on: https://gerrit.libreoffice.org/47827 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-15Fix typoAndrea Gelmini
Change-Id: I51c97356c9c2939f2d94d6388c829a179ca00daa Reviewed-on: https://gerrit.libreoffice.org/47853 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-15ofz#5299 TimeoutCaolán McNamara
Change-Id: I9c7968d44fc608431615b6fe0b1013e8a677bf60 Reviewed-on: https://gerrit.libreoffice.org/47871 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-15More loplugin:cstylecast: swStephan Bergmann
Change-Id: I75f75b53e58221a3bd0a6eb837483e7ebae3a02b
2018-01-15convert a<b?a:b to std::min(a,b)Noel Grandin
with something like git grep -nP '(.*)\s*<\s*(.*)\s*\?\s*\g1\s*:\s*\g2' -- *.?xx Change-Id: Id5078b35961847feb78a66204fdb7598ee63fd23 Note: we also convert a>b?b:a Reviewed-on: https://gerrit.libreoffice.org/47736 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-14ofz#5294 Indirect-leakCaolán McNamara
Change-Id: Ie183f1fcf3ac3358f5960382ec043a9250876679 Reviewed-on: https://gerrit.libreoffice.org/47864 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-14Fix typosAndrea Gelmini
Change-Id: Icc5fc590a6a90e30afa5f61028d4dd0279fbe120 Reviewed-on: https://gerrit.libreoffice.org/47861 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-14Fix typoAndrea Gelmini
Change-Id: Ibab7a1b98e35e6e6f282f83e361f067708e1fdc1 Reviewed-on: https://gerrit.libreoffice.org/47854 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-14lok: Tile not invalidated with certain changesTamás Zolnai
Calling FillRects caused this issue, which updates text area, so the invalidation, runing after that call, won't now where was the old text. We call invalidation here on the whole frame not only on the rects where the actual text is. Change-Id: I23db4b9579aa5710540b5d241506726630219b02 Reviewed-on: https://gerrit.libreoffice.org/47848 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2018-01-13tdf#113481 Let backspace delete complete CJK ideograph IVS.Mark Hung
If the character to be deleted is in CJK script and is a Unicode variance selector, delete the complete IVS if the base character is a CJK unified ideograph. Change-Id: I5d29664d5e964fc685110333f8109b0bfa8e0955 Reviewed-on: https://gerrit.libreoffice.org/44555 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2018-01-13sw: lazy load table autoformats for style purposesMiklos Vajna
Commit b7138e03ebc8a33258c099c5cf6015970646a40e (GSoC Writer Table Styles; Import bugfix, 2016-07-26) changed the SwDoc ctor to always load the table autoformats, which is expensive for simple documents. Avoid the load in the ctor by switching to lazy-load and adding a way to count the number of styles without loading the autoformats when there would be none. (mpTableStyles -> m_pTableStyles was only necessary to see if there is access outside GetTableStyles() to this member, but there were not any.) Times for 100 hello world inputs: 3863 -> 2753 ms is spent in XHTML-load + ODT export + close (71% of original). Change-Id: I6737e7712c775573b56c8b0566e8e7fb615edee6 Reviewed-on: https://gerrit.libreoffice.org/47820 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-12tdf#114939 package,comphelper: Try both real SHA1 and StarOffice SHA1Michael Stahl
... when importing ODF documents. In CreatePackageEncryptionData(), add a 3rd SHA1 password hash, PackageSHA1CorrectEncryptionKey, to EncryptionData. Use it in ZipPackageStream::getDataStream(), which has 3 fall-backs for SHA1 bugs now. Also add a CorrectSHA1DigestContext, to be used together with PackageSHA1CorrectEncryptionKey, and rename the existing one to StarOfficeSHA1DigestContext, to be used together with the existing 2 PackageSHA1{UTF8,MS1252}EncryptionKey. The fallback won't be used very often anyway: for the password SHA1 to be wrong, you need a password between 52 and 55 bytes long, and for the SHA1/1K checksum to be wrong, you need a file smaller than 1K with compressed size mod 64 between 52 and 55; all XML files have enough random "chaff" added to be too large. Test that we can read both correct SHA1 and StarOffice SHA1. Change-Id: I988fa489b5e40c7657f404f18538f637d54d28f1
2018-01-12uitest for tdf#93068Zdeněk Crhonek
Change-Id: Ib76d2a2f386b1584104d97ce2f2602fdac71517c Reviewed-on: https://gerrit.libreoffice.org/46929 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-12More loplugin:cstylecast: swStephan Bergmann
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable loplugin:cstylecast for some more cases" plus solenv/clang-format/reformat-formatted-files Change-Id: I0f49d21dfdf82742f11b27709f74294feb1e419e
2018-01-11ofz#5247 Integer-overflowCaolán McNamara
Change-Id: I333f8bb2d7168f43d7d85c48dd39c6ed02ca970d Reviewed-on: https://gerrit.libreoffice.org/47769 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-11loplugin:redundantcast: swStephan Bergmann
(after a to-be-committed improved loplugin:cstylecast would have rewritten the C-style casts into static_casts) Change-Id: If1bdd1a1b03fd0f705e1167c3ca8139799350f20
2018-01-11ofz#5235 Bad-castCaolán McNamara
Change-Id: I041f09f37941a92ccee3f0ebf9e5a950dee0c52f Reviewed-on: https://gerrit.libreoffice.org/47747 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-11[API CHANGE] migrate PackageKit usage to Modify2Caolán McNamara
xid dropped in favour of application_id Change-Id: Id1eb43aa9c8dfb4eac82f99eff0f84c5320e0da0 Reviewed-on: https://gerrit.libreoffice.org/47661 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-11tdf#36308 make double click not expand/collapse node in Navigator treeJim Raykowski
Change-Id: I0075af147e5aa02f09db57fc2113dcdfcab5bc57 Reviewed-on: https://gerrit.libreoffice.org/47241 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-11tdf#91292 ooxmlexport: cleared fill != use grabbag infoJustin Luth
A while back the way that backgrounds are handled changed. This was one spot where the changes didn't sync up. When the background is cleared, then the imported grabbag attributes should be tossed, not re-applied during save. Change-Id: I9759def6321697a634bcbd66ecdc9d73693ce1a3 Reviewed-on: https://gerrit.libreoffice.org/44040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-11convert (a>b?a:b) to std::max(a,b)Noel Grandin
with something like: git grep -nP '(.*)\s*>\s*(.*)\s*\?\s*\g1\s*:\s*\g2' Change-Id: I60b9a3a2a09162bc0de4c13fdde2c209696e5413 Reviewed-on: https://gerrit.libreoffice.org/47602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-11RotateFlyFrameFix: Disable AutoContour for rotated FlysArmin Le Grand
As long as it is not clear when, how and why we should offer this feature and if ODF needs to be adapted to it, disable the feature for now. Discussion about how to support is ongoing. Change-Id: I8ecd91ef9aefb6f49840a4f6108f5d5a17072af0 Reviewed-on: https://gerrit.libreoffice.org/47721 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-01-10Fix typoAndrea Gelmini
Change-Id: Ib148e8b5b9a9641b756023f1fb2eea4e6fa9dd5f Reviewed-on: https://gerrit.libreoffice.org/47723 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-10ofz: Integer-overflowCaolán McNamara
Change-Id: Iad8ebd0861a74399f6bb4a18aecf0de735a60b61 Reviewed-on: https://gerrit.libreoffice.org/47694 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-10ofz#5211 limit table parsing depthCaolán McNamara
Change-Id: I77b569faacc6f2655b050d09a236f78843e87560 Reviewed-on: https://gerrit.libreoffice.org/47691 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-01-10tdf#106991: Highlighting remains after select no fillTamás Zolnai
Change-Id: I911970539b96bc0d1c6427829fcae869142c9010 Reviewed-on: https://gerrit.libreoffice.org/47679 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>