summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2021-08-11sw: fixed regression from [1] - OLE height in mm instead 100th mmTomaž Vajngerl
OLE height is 3cm, but converted to 30 (mm) where the Size is expected to be in 100th mm. This uses the correct value of 3000, which correcponds to 30mm and the expected 3cm. [1] 0d356f93e4d5ca073a6e866168f76103c60c6a45 Change-Id: I77cab1641b948a8839da543c12835c5c64825a5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120316 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-11Drop convertMm100ToTwip in favor of the new o3tl::toTwipsMike Kaganski
Step by step, duplicates from <tools/UnitConversion.hxx> may go Change-Id: Id4c03ff8adc120ae06dbfdbdfb4f5ff0bb51f489 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120315 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-08-11tdf#143583 DOCX import: fix lost empty paragraphs of footnotesLászló Németh
Last empty paragraphs of footnotes were removed (except in the case of the first footnote), related to the double call of RemoveLastParagraph() during footnote load and later during its copying. Regression from commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357 "tdf#76260 DOCX import: fix slow footnote import". Change-Id: I61d9aa6765f3af1893451684dde12c199251d06b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120270 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-08-11tdf#135247: sw_uiwriter3: Add unittestXisco Fauli
Change-Id: I4f78b42600c0b7316aee9e6c106a25cc8cff983a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120285 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-08-11sw: preserve the value in original units to minimize conv. errorTomaž Vajngerl
Not really an big issue but let's preserve the values in original units as long as we can without conversion so that the error is minimal. Change-Id: I96981eaecac74b591803dbc93e487c1d106ab23c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119490 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-11CppunitTest_sw_ooxmlexport2..5: avoid DECLARE_OOXMLEXPORT_EXPORTONLY_TEST()Miklos Vajna
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd (CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation. Change-Id: I7b48ff2427b8c544db07323a98a236cfd8904df8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120284 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-08-11tdf#143577 check node is a text node before use as suchJim Raykowski
Change-Id: I337c94aa90ed906c5b744171728022ba5f9c64b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120191 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2021-08-11convert some LogicToLogic calls to use o3tl::convert insteadTomaž Vajngerl
If a LogicToLogic uses fixed units, we can use o3tl::convert instead. We can also do the same for all other cases where LogicToLogic is used, but that needs additional investigation to determine if it is safe to do so. Note: MapUnit::Pixel is converted to o3tl::Length::pt because it assumed 72 PPI for a logical pixel, which corresponds with the conversion rate of a point (72 PPI). Today, 96 PPI is standard, which is also used for o3tl::Length:px. Change-Id: I29126df38bfcfda74b5d83d4cb880a378aecd18b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120230 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-10boost::make_tuple->std::make_tupleCaolán McNamara
Change-Id: I3c4fb707aace43c1ea75a313fcdef6df17e007c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120279 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-10tdf#136991 Open RTF with colored textNoel Grandin
We spend most of the time in MergePortions, and the resorting is a significant part of that, so only resort if we actually have to. This shaves 10% off the load time for this document. Change-Id: I2380c5aa744f6d9c82195bb2a17ced2ce7616e9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120269 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-10Revert "tdf#58521 DOCX import: enable ContinuousEndnotes compat flag"Xisco Fauli
This reverts commit f9982c24066d6dd2f938cc20176af0f196bc018f. Reason for revert: tdf#143456 shows there are layout problems with this compatibility option This was reverted in libreoffice-7-2 branch only. See 43d2b3bbacdd6bbe24149ed33c54a180d74c77e4. Instead, this should have been reverted in master first, and the cherry-pick the revert to libreoffice-7-2 Change-Id: I3a29b77289ef1445fdf4886b32861f6d8e79de21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120150 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-08-10Revert "tdf#58521 Enable ContinuousEndnotes compat option for RTF too"Xisco Fauli
This reverts commit 892488b64f09190896d5a14e3f555ca91b3449e3. Reason for revert: tdf#143456 shows there are layout problems with this compatibility option This was reverted in libreoffice-7-2 branch only. See 43d2b3bbacdd6bbe24149ed33c54a180d74c77e4. Instead, this should have been reverted in master first, and the cherry-picked the revert to libreoffice-7-2 Change-Id: I3c06001f3f3faeaa4a05a7c9ebd2e175e88ededa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120232 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-08-10sw: removed unused NO_NUMLEVELVasily Melenchuk
NO_NUMLEVEL is not used in code for a while. Change-Id: Ia39879723455dbe5cc13b20042e930088618588d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120113 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-08-10indexing: use XML as input that is identical to indexing XMLTomaž Vajngerl
Change-Id: I2242b4bd77220b55e67c2e0f0fe54f008759d282 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120194 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-10give SwTableBoxFormat::TableBoxAttributeChanged its own functionBjoern Michaelsen
- ... because at somewhere around growing past 100 LOC it deserved that. - also make the box a reference there as it should never be a nullptr Change-Id: Ia14cfb7a88e14fdd02f6011a745c2b008d94bc10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120159 Tested-by: Jenkins Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
2021-08-10indexing: add "type" to the xml for paragraph nodesTomaž Vajngerl
The type is either WriterNode (1) or SdrObect (2) as we need to know for which one the index is refering to. Change-Id: I0f4bc95d91e37cf75db5ed49cd14df61133f5f19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120193 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-10indexing: add support for SdrObjects in SearchResultLocatorTomaž Vajngerl
Also add (node) "type" parameter because we need to differentiate between Writer nodes and SdrObject nodes. Change-Id: I590695ae71781f64c22bdd7e1df01d69e3376e67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118671 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-10Missing includeStephan Bergmann
(for std::unique_ptr, with recent libstdc++ 12 trunk) Change-Id: I61b7823dd740ea7cdfe0d7403a50ac73b24d1c4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120229 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-08-10sw: remove all uses of MM50 with (added) o3tl::toTwipTomaž Vajngerl
MM50 constant is the number of twips for 5mm. This is (ab)used as a "shortcut" to set or compare various variables through the code and also to set a multiplied value (like 1cm, 2cm, 4cm) or divided value (2.5mm, 1.25mm). The problem with this is that converting the 5mm to twip doesn't round up exactly and multiplied and divided values increase the error even more. Instead of basing it from MM50 constant, it is just better to use our o3tl::convert (or the added variant o3tl::toTwip), which can actually calculate the conversion at compile time, so there is no added complexity at runtime and we get a more readable code with more exact result. i.e. o3tl::toTwip(4, o3tl::Length::cm) instead of the more cryptic MM50 * 8 In addition also sanitize and comment the values of the constants in sw/inc/swtypes.hxx. Change-Id: I85c306c36207d47ac3dc207094b68d0fb1ca5b70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119397 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-08-09sw HTML export: avoid writing EMF data with JPG extensionMiklos Vajna
Regression from commit f3b2fc2276ee8a7f64e73d9975d0143d1696362c (sw XHTML import, improved <object> handling for images: support more formats, 2021-07-20), the problem was that now an EMF image was written with the JPG extension in the HTML export. Solve the problem by making the "use emf as-is" check more strict in XOutBitmap::WriteGraphic(): that will be still true in the XHTML case when the source image is EMF, but the filter name will be JPG in the HTML case, so that will avoid the unwanted EMF data in the HTML case. Change-Id: I7bced482d677cf121be1ed494a3aaeb319e1c5b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120209 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-08-09sw: prefix members of SwXMLDDETableContext_Impl, SwXMLTableCell_Impl, ...Miklos Vajna
... SwXMLTableRow_Impl and SwXMLTableRowsContext_Impl See tdf#94879 for motivation. Change-Id: Ibff24ae9b6470069ceebaa5d133b8bdf0ee4e70f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120190 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-08-08sw: numbering rule is not constructed for numbering type "None"Vasily Melenchuk
Previously during refactoring this condition was lost. And it is possible practically that we have all format for numbering (prefix, suffix, format string, etc) but numbering is disabled. Change-Id: I0c8ab446753308ad80b8d133824a936dacf6cc82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120082 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-08-08create comphelper:OMultiTypeInterfaceContainerHelperVar2 and use itNoel Grandin
based on OInterfaceContainerHelper2 which is considerably faster than the original OInterfaceContainerHelper Change-Id: Ia8cdbc5ef877a7af3d9193e1bb2faf1595c15470 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120165 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-07create comphelper::OMultiTypeInterfaceContainerHelper2 and use itNoel Grandin
based on OInterfaceContainerHelper2 which is considerably faster than the original OInterfaceContainerHelper Change-Id: I9c8b6d0e5382018824bf7188a26343703abf2d51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120161 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-07no need to use UNO_QUERY hereNoel Grandin
Change-Id: I1bfe8238d7c08f27d2b21f9fe79712aba045c812 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120152 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-06use Helper_optional SCRIPTING for libs that don't exist if --disable-scriptingCaolán McNamara
Change-Id: Iec65d6395b903e13f788fe8322b60aac5b974cd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120125 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-06sw: fix footer for new fileMiklos Vajna
And a tab in makefile where surrounding code uses spaces. Addresses <https://gerrit.libreoffice.org/c/core/+/120077/2#message-980569fcf06d57af04db12f1f8d96e805336c902>. Change-Id: I4a4e5fd5c989cbce5fa0602484eb6bba21c19851 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120096 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-08-06drop intermediate vcl::Window from Application::GetDefDialogParentCaolán McNamara
Change-Id: I96be984cbefeb8e45bf49de4c50a225a46fbefb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120089 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-06sw: handle mbMathBaselineAlignment when replacing compat optionsMiklos Vajna
This is on for new documents and off for old ones. Change-Id: Ia96fd1901ddb5872730716824096509a80b0b9c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120083 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-08-05improve LOK notifyInvalidationNoel Grandin
(*) tweak buffer in SfxLokHelper::notifyInvalidation to be a bit larger, so we avoid the cost of a resize&copy (*) use our optimised OString concatentation instead of going via std::stringstream (*) pass down a pointer to rectangle, instead of a string. later we will use this to avoid doing the stringify until later Change-Id: Ia3e3042bc919d9b9cb80e47a93704eb236438605 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119994 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120072 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-05tdf#99932: sw: fix for invalid anchor location for FLY_AT_CHAR modeVasily Melenchuk
In such case anchor position depends on LastCharRect which can be invalid because of happened frame movement, resize, etc. Change-Id: I3d3c6318ee1ce5f4043e21ab091417d283c4260c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120059 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-08-05sw: undo/redo for outline modificationVasily Melenchuk
Outline changes done via "Tools"->"Chapter Numbering" were not tracked by undo/redo before. Change-Id: I764dda526d2b17ecbb62eca0d6a9fb0b368c4a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119405 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-08-05osl::Mutex->std::mutex in SidebarWinAccessibleContextNoel Grandin
Change-Id: Ic8cba9d900f74511ad721085f9d728b43c1be3c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120018 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-05osl::Mutex->std::mutex in SwSendMailDialog_ImplNoel Grandin
Change-Id: I81ad469f8cb45d7ece97a256301e7ea71683d2ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120017 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-05sw: fix assert fail with ShowRedlineChanges=false and para formatMiklos Vajna
It fails like this: loolforkit: sw/source/core/layout/wsfrm.cxx:4551: void UnHide(SwRootFrame&): Assertion `rLayout.GetCurrShell()->ActionPend()' failed. #4 0x00007f98e9f8c198 in UnHide(SwRootFrame&) (rLayout=...) at sw/source/core/layout/wsfrm.cxx:4551 #5 0x00007f98e9f8c839 in SwRootFrame::SetHideRedlines(bool) (this=0x7f98c40f7bd0, bHideRedlines=false) at sw/source/core/layout/wsfrm.cxx:4664 #6 0x00007f98e9b18afd in sw::DocumentRedlineManager::SetRedlineFlags(RedlineFlags) (this=0x80a4120, eMode=49) at sw/source/core/doc/DocumentRedlineManager.cxx:1097 #7 0x00007f98e9cfa503 in SwEditShell::SetAttrSet(SfxItemSet const&, SetAttrMode, SwPaM*, bool) (this=0x8885840, rSet= SfxItemSet of pool 0x808fd10 with parent 0x0 and Which ranges: [(63, 64), (120, 120)] = {...}, nFlags=SetAttrMode::DEFAULT, pPaM=0x0, bParagraphSetting=true) at sw/source/core/edit/edatmisc.cxx:187 #8 0x00007f98ea995f07 in SwTextShell::ExecParaAttr(SfxRequest&) (this=0x8bd0820, rReq=...) at sw/source/uibase/shells/txtattr.cxx:451 Fix it the same way commit dd489bc01adc22fc5015ea56b61d66104af184a8 (tdf#125754 sw_redlinehide: avoid recursive layout in SetHideRedlines(), 2019-06-19) did: make sure that SetHideRedlines() is called before EndAllAction(). Change-Id: I6304abec2e2e2967a8369b0219492bebcd606d03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120069 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-08-05Resolves: tdf#143720 treeview not resizing to fill available spaceCaolán McNamara
Change-Id: I041c3a743b8624f49bfe57e8a4469535e334e5dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120067 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-05drop unneeded forward declareCaolán McNamara
Change-Id: Ifc7eab2bed8bfa55bf7d4dc6d56dac8ccfdf5642 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120065 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-05No need for extra uno commands for shape hyperlinksSamuel Mehrbrodt
Change-Id: Ibf5987f543d4e1a767a7a5ae6a855f7eb883bfae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120056 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2021-08-05Pass context and resource string down to boost::locale separatelyNoel Grandin
because this is often on a hot path, and we can avoid the splitting and joining of strings like this. Change-Id: Ia36047209368ca53431178c2e8723a18cfe8260a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119220 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-08-05tdf#123643 Import/Export for hyperlinks on text boxesSamuel Mehrbrodt
Change-Id: Ied436c4a619985f27e5854369d319d76c05890d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120028 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2021-08-05sw: use more StaticWhichCast() in source/core/docnode/Miklos Vajna
See commit 0025e80ba6d882f6f885499efaf37ab0e2ed699d (sw: use SfxPoolItem::StaticWhichCast() in SwTextBoxHelper, 2021-07-07) for motivation. Change-Id: Id3ca7f0796a9afdccd7211a2ceec19e476647612 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120010 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-08-04sw lok: avoid expensive DLPre/PostPaint2() around InvalidateWindows()Miklos Vajna
This shows up on profiles and it's not needed. It was only there, because Online always needs an invalidation to have updated tiles, so there the paint was replaced with an invalidate. And then the drawinglayer setup/teardown was not made conditional by accident. The PaintTile() case goes via Paint() -> PaintSwFrame(), which still calls these functions; this commit only speeds up SwViewShell::ImplEndAction(), which is called synchronously e.g. on every keypress. Change-Id: I6c362f148bc2837bd842602754770c5267e16afd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119997 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-08-04tdf#143476 improve import of lockedCanvasRegina Henschel
A lockedCanvas is used in Word 2007 to include dml-shapes. It is treated similar to a group, only that its content is not editable. This patch changes the implementation so, that the lockedCanvas is imported as group. Prior only content was imported in the case the content was a single custom-shape or a single group. That has resulted in these errors: Image or line in a lockedCanvas were not imported at all. Only one of several shapes in a lockedCanvas was imported. I have changed mpShape to mpShapePtr to reflect the data type and be consistent with ShapeContext. The patch changes GraphicImport so, that lockedCanvas as special version of a group is detected and handled. That solves regression from commit 3262fc5ef3bde5b158909d11ccb008161ea95519 Change-Id: I57005e64ff073bca6ebb46a404486203fb6802ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119684 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-08-04tdf#143499 don't search entire tree looking for insertion pointCaolán McNamara
keep a short insertion candidate vector up to date as the tree is populated for gen takes time from ~310ms to ~45ms Change-Id: I70e6c0243771cef39e54f4d039069cf54aa6d41c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119956 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-04CppunitTest_sw_ooxmlexport: avoid DECLARE_OOXMLEXPORT_EXPORTONLY_TEST()Miklos Vajna
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd (CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation. Change-Id: Ic3e15bff48d56349cead8391d32db92418c305a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119942 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-08-04Revert "tdf#104254 sw DOCX import: fix text wrapping in headers"Justin Luth
This reverts commit 798b69087119c01a3b51e0bb3240ef35cfededeb. The change affected not only DOCX compatibilityMode 15, but also DOC and ODT and older versions of DOC and everything else which should not have been affected. This reverted change of course affected layout. Some bug documents didn't loop after this layout breakage. That doesn't mean that those bugs were fixed. So just revert the tests: Revert "tdf#96840: sw_ww8export3: Add unittest" This reverts commit 975488594fc88aaba7298448e0ff727ebca7fe85. Revert "tdf#64997: sw_ww8export3: Add unittest" This reverts commit 02af9b8ef1f87bb6bc5fee22ad184681b20f201a. Change-Id: I54f7b801199bba45d8ca6f82f77e7060c7b3fcf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119887 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-08-04tdf#123919 - Sort custom document propertiesAndreas Heinisch
Sort custom document properties on opening the dialog under File > Properties > Custom Properties. The sorting order in the document's xml still depends on the generated handle of the document property itself. Change-Id: I12c4f641d22ca0a3db2f4c6ef54f41c113aeeaa5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115780 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
2021-08-03Related: tdf#143499 lookup id just onceCaolán McNamara
instead of twice for gen takes time from ~400ms to ~310ms Change-Id: Ic5e11e889c10fa90b23165aabdca751436ecf55c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119943 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-03tdf#143626 "protect" always shown checked for sections linked to fileCaolán McNamara
Change-Id: I8a403a25ae5c5e3b6183ba559b0224f2886eb925 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119928 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-03Consolidate on C++17 std::scoped_lock instead of std::lock_guardNoel Grandin
as in commit 9376f65a26240441bf9dd6ae1f69886dc9fa60fa Change-Id: I3ad9afd4d113582a214a4a4bc7eea55e38cd6ff9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119927 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>