summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2019-07-19tdf#125546 DOCX import: fix overgrowth of change tracking entriesLászló Németh
The same text portion could get double redlines including ParagraphFormat. This broke redline compression, sometimes resulting huge amount of redundant change tracking entries based on rsId, or losing paragraph styles after deletion. Change-Id: I5930eab2ef0bc7eb9c93a10cdd30b96cd41c9098 Reviewed-on: https://gerrit.libreoffice.org/75926 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-07-19sw: fix use after free on tdf117215-1.odtMichael Stahl
Move the fix from 6d0ea082889c89eb8b408779f2de08da7441ff54 to SwFlyFrame::DestroyImpl() so we unregister every SwFlyFrame. ==1550==ERROR: AddressSanitizer: heap-use-after-free on address 0x615000383f56 at pc 0x7efcd70d5ab9 bp 0x7ffeb7ac7c40 sp 0x7ffeb7ac7c38 WRITE of size 1 at 0x615000383f56 thread T0 0 SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) sw/source/core/layout/anchoredobject.cxx:743:32 1 SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() sw/source/core/layout/objstmpconsiderwrapinfl.cxx:53:23 2 SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) sw/source/core/layout/layouter.cxx:387:84 3 sw::DocumentLayoutManager::ClearSwLayouterEntries() sw/source/core/doc/DocumentLayoutManager.cxx:497:5 4 sw::DocumentStateManager::SetModified() sw/source/core/doc/DocumentStateManager.cxx:45:39 5 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3942:36 0x615000383f56 is located 342 bytes inside of 504-byte region [0x615000383e00,0x615000383ff8) freed by thread T0 here: 1 SwFlyAtContentFrame::~SwFlyAtContentFrame() sw/source/core/inc/flyfrms.hxx:159:7 2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 3 SwFrameFormat::DelFrames() sw/source/core/layout/atrfrm.cxx:2624:17 4 SwUndoFlyBase::DelFly(SwDoc*) sw/source/core/undo/undobj1.cxx:161:19 5 SwUndoDelLayFormat::SwUndoDelLayFormat(SwFrameFormat*) sw/source/core/undo/undobj1.cxx:403:5 6 SwHistoryTextFlyCnt::SwHistoryTextFlyCnt(SwFrameFormat*) sw/source/core/undo/rolbck.cxx:538:20 7 SwHistory::Add(SwFlyFrameFormat&, unsigned short&) sw/source/core/undo/rolbck.cxx:1083:50 8 SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition const&, DelContentType) sw/source/core/undo/undobj.cxx:1020:39 9 SwUndoDelete::SwUndoDelete(SwPaM&, bool, bool) sw/source/core/undo/undel.cxx:229:9 11 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3939:55 Change-Id: Ia0c28c9d5792615cbb566e502374efd0f4056daf Reviewed-on: https://gerrit.libreoffice.org/75857 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-19cid#1448358 Improper use of negative valueCaolán McNamara
Change-Id: Ife6a57484734cab759c31ca4ded688a03400e9b7 Reviewed-on: https://gerrit.libreoffice.org/75909 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-19cid#14561625 Unchecked dynamic_castCaolán McNamara
Change-Id: Ibe350b00633ae55434da6aafc5829682cead35af Reviewed-on: https://gerrit.libreoffice.org/75919 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-19cid#1451638 Unchecked dynamic_castCaolán McNamara
Change-Id: Ia0fc1ffdd5dbed4b7c32587741d59dcf2782ed61 Reviewed-on: https://gerrit.libreoffice.org/75920 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-19cid#1448363 Unchecked dynamic_castCaolán McNamara
Change-Id: Ibfa31b291f58c90f052f1d052b6294e8c544965c Reviewed-on: https://gerrit.libreoffice.org/75918 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-19cid#704863 Dereference after null checkCaolán McNamara
Change-Id: I472f48c64a6f2d13b124ede28a83dab3b46f759f Reviewed-on: https://gerrit.libreoffice.org/75915 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-19sw btlr writing mode: remove not needed checkFrameBtlr() in the DOCX exportMiklos Vajna
Now that the DOCX import doesn't create this and instead uses the proper writing mode (neither VML nor drawingmL). Change-Id: I560c710866de8fb2f90d681e8cfc2d82afb1a327 Reviewed-on: https://gerrit.libreoffice.org/75930 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-19loplugin:constantparamNoel Grandin
and tweak the plugin to handle a crash seen with clang-9 Change-Id: Ie1ccf80c16a20dbca58e5bd081af13f75cf5ac8f Reviewed-on: https://gerrit.libreoffice.org/75850 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-19sw: fix missing OLE preview for actively edited OLE object on saveMiklos Vajna
Regression from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3 (disable generation of ole previews in ODF format until after load, 2016-09-13), if the user started an OLE edit in a Writer document, and saved without ending the OLE edit, then svt::EmbeddedObjectRef::UpdateReplacementOnDemand() removed the old replacement image, but no new one was created. Given that save is always an explicit user action (auto-save does not kick in for unmodified documents), restore the permission to update OLE replacement images during save. Do this check in SwDocShell::CalcLayoutForOLEObjects(), as that's OLE-related and is called from all the relevant save code paths (save, save-as, convert to alien formats). Change-Id: Idaad43909cd744a379e713efd70ffd000e2692bc Reviewed-on: https://gerrit.libreoffice.org/75867 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-18cid#1448377 silence Dereference null return valueCaolán McNamara
Change-Id: I8e124f005622091f7c3e989042c5298640ba819b Reviewed-on: https://gerrit.libreoffice.org/75816 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-18tdf#125894: DOCX: import tracked changes in framesLászló Németh
Tracked changes weren't imported in frames, losing also the actual text content: also tracked deletion reappeared as normal text here, not only the tracked insertions. Change-Id: I5fc8135cfb7402ad71c5c24eae606aa7ed707dfc Reviewed-on: https://gerrit.libreoffice.org/75779 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-07-18Revert "tdf#123627 DOCX import: fix relative hyperlinks to documents"László Németh
This reverts commit 217a80fd205c7f61794c863898cb7cfd1a17e78f. Change-Id: Ic6c9c68dff800f0969187bdd46b51f8e71c0c618 Reviewed-on: https://gerrit.libreoffice.org/75825 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
2019-07-18sw: missing SolarMutexGuard in SwXFrame::attach()Michael Stahl
Causes assert in a test i'm adding... Change-Id: I5be24aa9683ec0d31494c0c97270d1d58692f764 Reviewed-on: https://gerrit.libreoffice.org/75796 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-07-18tdf#126051 sync MINBODY copies to same valueCaolán McNamara
Change-Id: Id41da7b07dcb25e820e5fd20aed595b1170fa204 Reviewed-on: https://gerrit.libreoffice.org/75807 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-17Resolves: tdf#126439 dialog should be modalCaolán McNamara
Change-Id: Ib922be4375533aff69264ee5dc99d521306f93c5 Reviewed-on: https://gerrit.libreoffice.org/75787 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-17split sw_filters unit testNoel Grandin
so that a regular make takes less time, this unit test always seems to execute last and it takes a very long time Change-Id: If68bcfafad77c18676ee0ba2a915db142a1f4041 Reviewed-on: https://gerrit.libreoffice.org/75763 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-17tdf#123627 DOCX import: fix relative hyperlinks to documentsTünde Tóth
Revert "tdf#86087 DOCX Import link as relative if preferred" This reverts commit 40acf8d6447065077acba9e800c56239f58c8262. Relativ urls aren't converted to absolute urls, if the "Save URLs relative to filesystem" setting is checked. Change-Id: Ie6d277e54e5f0136fed6e2804a56d29bc78e202f Reviewed-on: https://gerrit.libreoffice.org/75682 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
2019-07-17loplugin:singlevalfieldsNoel Grandin
Change-Id: Ib4d9f6b89b2941ad0351ac42c606dbfda8ccba20 Reviewed-on: https://gerrit.libreoffice.org/75746 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-17loplugin:unusedmethodsNoel Grandin
Change-Id: Ie2285f64919d1c83b0a8df4ceb827f731e5cd609 Reviewed-on: https://gerrit.libreoffice.org/75739 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-07-16tdf:126142 ImageMap menubar entry moved to tools sectionandreas kainz
Change-Id: I8600e4bb88db4460a16a559a0fe1fd645bb0446a Reviewed-on: https://gerrit.libreoffice.org/75687 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-07-16sw comments on frames: no overlay in the LOK API, eitherMiklos Vajna
So that the Online and the desktop rendering result match. Change-Id: Iabc62e74f5ce5880b663b4d7217c81729592a356 Reviewed-on: https://gerrit.libreoffice.org/75729 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-16cid#1448483 Dereference null return valueCaolán McNamara
Change-Id: Ia773b8350f1cb5b78d4ec712293f2d6e18280c09 Reviewed-on: https://gerrit.libreoffice.org/75717 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16cid#1448538 Explicit null referencedCaolán McNamara
Change-Id: I143fc38076a811b15c9f13bef96589a55ea649fc Reviewed-on: https://gerrit.libreoffice.org/75715 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16cid#1448540 Dereference null return valueCaolán McNamara
Change-Id: I675a19c19ef64480b5414d9b2bb7a5387533dc4a Reviewed-on: https://gerrit.libreoffice.org/75714 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16tdf#126414: MSForms: fix flickering of date field button on WindowsTamás Zolnai
Need to ignore empty paint area parameters. Change-Id: I195d7bf9b3914199984f4a732d7616520d51dbba Reviewed-on: https://gerrit.libreoffice.org/75708 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-07-16tdf#1448234 Uninitialized pointer fieldCaolán McNamara
Change-Id: I295cdc194d566c6801d4a7f9d6cbb31ee5e45df2 Reviewed-on: https://gerrit.libreoffice.org/75707 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16sw comments on frames: avoid overlay that covers only an as-char imageMiklos Vajna
As-char images had their comment arrow on the bottom left corner, as-char ones had it at the bottom right one. Standardize on bottom left and avoid the content overlay in case only the frame itself is selected. See commit cf5a3cb687a502e7f71cefb5f7001a73925bee56 (Adapt new test to actual values observed on macOS, 2019-06-24) on why the test is not for macOS, till somebody can check if this is working there properly. Change-Id: I83516ea558182ecc7362f8383894ed07a16d3ad2 Reviewed-on: https://gerrit.libreoffice.org/75706 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-16Resolves: tdf#126236 reset modality back to initial modality on closeCaolán McNamara
Change-Id: I959820b75a70f6090120970c9ce11787bbe25037 Reviewed-on: https://gerrit.libreoffice.org/75700 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16Related: tdf#126236 keep user defined responses out of ambiguous rangeCaolán McNamara
Change-Id: I6481f40ba5f50c3d76978b0f4a477f1d0b9adc99 Reviewed-on: https://gerrit.libreoffice.org/75699 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16cid#1448306 silence Unchecked return valueCaolán McNamara
Change-Id: I4d95a54820a3cce9b23ac772abfbfe35ec908765 Reviewed-on: https://gerrit.libreoffice.org/75667 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-16RTF import: add tests for RTF_PGBRDRT/L/B/RMiklos Vajna
lcov points out these were not covered previously. Change-Id: I0211cc35be99bf2487c73b4e63889a2af56d02c2 Reviewed-on: https://gerrit.libreoffice.org/75661 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-07-15uitest for bug tdf#126017Zdeněk Crhonek
Change-Id: I8a64c5eb017f4b6d468d082925a5022cb75d549e Reviewed-on: https://gerrit.libreoffice.org/75564 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>
2019-07-15sw comments on frames: avoid overlay that covers only an at-char imageMiklos Vajna
The comment is already attached to the image via the anchor, and the overlay would change the image, which is confusing. Change-Id: I7a1c2a25182f628effa224fb82b5bcd71fdf35d4 Reviewed-on: https://gerrit.libreoffice.org/75638 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-15ofz#15731 Direct-leak RedlineExtraData is copiedCaolán McNamara
Change-Id: I363c91125ecc78e746865cf1fba5913730e0d8e7 Reviewed-on: https://gerrit.libreoffice.org/75633 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-15cid#1448275 Dereference before null checkCaolán McNamara
Change-Id: I2c647658c1f9213962e3392cc4206a6e9107e165 Reviewed-on: https://gerrit.libreoffice.org/75571 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-07-15tdf#39593 Remove SvxUnoDrawMSFactory::concatServiceNamesArkadiy Illarionov
Replace with comphelper::concatSequences Change-Id: I6b16104fac6ac5fdfcb6f322da4a5b8405d5d999 Reviewed-on: https://gerrit.libreoffice.org/75315 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-07-15Disable testDateFormFieldCurrentDateInvalidation test only for WindowsTamás Zolnai
Change-Id: Id267d118b509177f93f3c440a03d05feb532cd34 Reviewed-on: https://gerrit.libreoffice.org/75613 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-07-15sw: prefix members of SwXCellMiklos Vajna
See tdf#94879 for motivation. Change-Id: I209fe0474fc9275052da389455cca26cd4c9f47a Reviewed-on: https://gerrit.libreoffice.org/75609 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-15Deduplicate RemoveHyperlink commandSamuel Mehrbrodt
Change-Id: I0b190dd15cd214478629aaf2c5e7e49f22ff9cea Reviewed-on: https://gerrit.libreoffice.org/75482 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-07-15Deduplicate EditHyperlink commandSamuel Mehrbrodt
Change-Id: I23f0c276c5c1229aeb4ea468c6b858e36c120bd9 Reviewed-on: https://gerrit.libreoffice.org/75480 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-07-15tdf#112543 Add Edit/Remove hyperlink to text boxes/shapes in WriterSamuel Mehrbrodt
Change-Id: I9052387cf39135c2324b9db03662dc0365323400 Reviewed-on: https://gerrit.libreoffice.org/75479 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-07-15Fix formattingSamuel Mehrbrodt
This method had inconsistent indentation. Fix this by formatting the method with clang-format rules. Change-Id: I8ca33cac23563903606bc39e45019038618222e6 Reviewed-on: https://gerrit.libreoffice.org/75478 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-07-15-Werror=deprecatedStephan Bergmann
("implicit capture of ‘this’ via ‘[=]’ is deprecated in C++20"; but the recommended replacement with [=,this] leads to "'this' cannot be explicitly captured when the capture default is '='" failures in older C++ versions) Change-Id: I6376e0503ef66bff5a0c27c1d997667669b6d5b1 Reviewed-on: https://gerrit.libreoffice.org/75579 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-07-14rMarkList shall presumably be captured by referenceStephan Bergmann
...in the lambda introduced by f86578129a14e2e70a50a9e13afaed7ad522463a "lokdialog: Convert the Format -> Position and Size... to async exec for sw" Change-Id: Ie1ead8f21ac0466001a37cfc75c17bd21d26e7e7 Reviewed-on: https://gerrit.libreoffice.org/75586 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-07-14Disable testDateFormFieldCurrentDateInvalidation() testTamás Zolnai
It hangs on Windows. Change-Id: If1e0054327212e5c2bf691c51f419677a4a15739
2019-07-14FixAndrea Gelmini
Change-Id: Ib3b96872190e87a7d68b5605b81152852b1036f7 Reviewed-on: https://gerrit.libreoffice.org/75569 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-07-13Removed duplicated includeAndrea Gelmini
Change-Id: Iec8ba76e2d60baff369f7f09e2253f9e067b9a6f Reviewed-on: https://gerrit.libreoffice.org/75475 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-07-13Removed duplicated includeAndrea Gelmini
Change-Id: I42d64ec828e4ae03025f0b65a6b3bebbde267ec6 Reviewed-on: https://gerrit.libreoffice.org/75505 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-07-13UI test for #tdf124413Artur Neumann
Test if LibreOffice crashes when text is copied and pasted overwriting the original content and then undoing and redoing the change several times Change-Id: I22d92bde02364675fbbbe8064065ae955bdcae24 Reviewed-on: https://gerrit.libreoffice.org/75485 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek <zcrhonek@gmail.com>