summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-08-04Bump version to 22.05.5.2cp-22.05.5-2Andras Timar1-1/+1
Change-Id: I7cab891b04c9e11fc8d8a1635b9a62baf55d9160
2022-08-04tdf#150249 close of popover not detectedCaolán McNamara1-12/+16
the popover listened to here isn't the one that ends up getting actually used, its contents are transferred to another one, so the OnPopoverClosed wasn't called, its sufficient to just use the SubToolbarControl dtor to detect what is wanted here Change-Id: I3f4a038acfc183b863457919bf89d600517ddc01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137732 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
2022-08-04Resolves: tdf#147782 restore focus to launching frame asynchronouslyCaolán McNamara2-3/+16
Change-Id: I7ebde70e4e1aae861f6ac7d70a91741596cb2cc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137526 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
2022-08-04windows signing: use sha256 (instead of the default sha1)Christian Lohmaier1-1/+2
will be enforced in e.g. microsoft store later this year... Change-Id: Ifa7f98d5c72bd7c7f602dc54ba8e16f7470dc3d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137738 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ae434ccb4878ed49f19be578e4935f50196b6b78) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137721 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-08-04more_fonts: Update Reem KufiKhaled Hosny3-4/+5
Also update test expectation due to changed glyph order. Change-Id: I8f6d1a057077cb6de5e5d7fce4bec29929edb8b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137663 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit f1540e05327873a73c0bbb232689d2be5c0072b7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137610 Reviewed-by: خالد حسني <khaled@aliftype.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 15da0f9b805e090e61b2eb82913130d7a77d16c6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137714
2022-08-04more_fonts: Update AmiriKhaled Hosny3-9/+9
Update PDF export test that depends on a mapping the font no longer has, and use different characters that meet the test criteria. Change-Id: I0f89297a52ffcef3513e0a788ec3bab645cc354b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137661 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit 660c14d12592fdc1bd566398d272e0e8b1affe89) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137611 Reviewed-by: خالد حسني <khaled@aliftype.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit ab355fde048052ace3a37e9b499ef321e0835546) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137715
2022-08-04Revert "tdf#141652 partial revert "Reset ShapeProperty priority..."Justin Luth3-11/+4
This reverts 7.4 commit 18cc1240565e697859dd7d17058f91d5e01df929. Someone backported it to 7.3 as well. Reverting fixes regression report tdf#150061. Change-Id: Ie04595e11dd9d2e15fa940b8ada71714bd434f6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137581 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit 84b719e41c3a5f1e3dba112508721d69c1b3185e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137530 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit aaf6070682dd99bed9e172a6f27a9801237b9c3e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137532 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-08-04tdf#149467 fix re-entrance crashJim Raykowski1-12/+3
This crash is caused by an odd re-entrance happening. In this case re-entrance to SwContentTree::UpdateTracking happens when SfxHintId::DocChanged is broadcast from SwDocShell::SetModified when GetContentAtPos is called from SwContentTree::UpdateTracking which eventually causes a stack crash. Getting model position for view point when getting content at position (GetContentAtPos call to GetModelPositionForViewPoint) shouldn't set the document modification state. Which is what happens using the steps to repro this crash. This patch disallows setting document modification state during the DocumentStylePoolManager::GetFormatFromPool call from SwTextINetFormat::GetCharFormat. backtrace of last 100 levels before crash: 1 SwTextFrame::GetModelPositionForViewPoint_ frmcrsr.cxx 551 0x7fffbddbde96 2 SwTextFrame::GetModelPositionForViewPoint frmcrsr.cxx 665 0x7fffbddbe891 3 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 4 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 5 SwPageFrame::GetModelPositionForViewPoint trvlfrm.cxx 211 0x7fffbdcf6f2f 6 SwRootFrame::GetModelPositionForViewPoint trvlfrm.cxx 452 0x7fffbdcf7fa0 7 SwCursorShell::GetContentAtPos crstrvl.cxx 1370 0x7fffbd581050 8 SwContentTree::UpdateTracking content.cxx 3700 0x7fffbe9864a0 9 SwContentTree::TimerUpdate content.cxx 3589 0x7fffbe985474 10 SwContentTree::Notify content.cxx 3047 0x7fffbe9811ad 11 SfxBroadcaster::Broadcast SfxBroadcaster.cxx 40 0x7ffff4180f32 12 SwDocShell::SetModified docsh2.cxx 1446 0x7fffbe53b663 13 SwDocShell::Ole2ModifiedHdl docsh.cxx 1150 0x7fffbe52d660 14 SwDocShell::LinkStubOle2ModifiedHdl docsh.cxx 1131 0x7fffbe52d597 15 Link<bool, void>::Call link.hxx 111 0x7fffbd8889f5 16 sw::DocumentStateManager::SetModified DocumentStateManager.cxx 50 0x7fffbd888729 17 SwDoc::MakeCharFormat docfmt.cxx 861 0x7fffbd6ef2b8 18 SwDoc::MakeCharFormat_ docfmt.cxx 883 0x7fffbd6ef43a 19 sw::DocumentStylePoolManager::GetFormatFromPool DocumentStylePoolManager.cxx 1514 0x7fffbd89132c 20 sw::DocumentStylePoolManager::GetCharFormatFromPool DocumentStylePoolManager.cxx 1718 0x7fffbd892d86 21 SwTextINetFormat::GetCharFormat txtatr2.cxx 144 0x7fffbdfa1a03 22 SwTextINetFormat::GetCharFormat txtinet.hxx 52 0x7fffbddb4f4e 23 CharFormat::GetItemSet atrstck.cxx 145 0x7fffbddb07e5 24 SwAttrHandler::PushAndChg atrstck.cxx 345 0x7fffbddb1047 25 SwAttrIter::Chg itratr.cxx 102 0x7fffbddf02db 26 SwAttrIter::SeekFwd itratr.cxx 296 0x7fffbddf1104 27 SwAttrIter::Seek itratr.cxx 419 0x7fffbddf17b3 28 SwAttrIter::SeekAndChgAttrIter itratr.cxx 158 0x7fffbddf06e2 29 SwTextIter::SeekAndChg itrtxt.hxx 313 0x7fffbde01791 30 SwTextCursor::GetModelPositionForViewPoint itrcrsr.cxx 1658 0x7fffbddff83f 31 SwTextFrame::GetModelPositionForViewPoint_ frmcrsr.cxx 604 0x7fffbddbe337 32 SwTextFrame::GetModelPositionForViewPoint frmcrsr.cxx 665 0x7fffbddbe891 33 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 34 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 35 SwPageFrame::GetModelPositionForViewPoint trvlfrm.cxx 211 0x7fffbdcf6f2f 36 SwRootFrame::GetModelPositionForViewPoint trvlfrm.cxx 452 0x7fffbdcf7fa0 37 SwCursorShell::GetContentAtPos crstrvl.cxx 1370 0x7fffbd581050 38 SwContentTree::UpdateTracking content.cxx 3700 0x7fffbe9864a0 39 SwContentTree::TimerUpdate content.cxx 3589 0x7fffbe985474 40 SwContentTree::Notify content.cxx 3047 0x7fffbe9811ad 41 SfxBroadcaster::Broadcast SfxBroadcaster.cxx 40 0x7ffff4180f32 42 SwDocShell::SetModified docsh2.cxx 1446 0x7fffbe53b663 43 SwDocShell::Ole2ModifiedHdl docsh.cxx 1150 0x7fffbe52d660 44 SwDocShell::LinkStubOle2ModifiedHdl docsh.cxx 1131 0x7fffbe52d597 45 Link<bool, void>::Call link.hxx 111 0x7fffbd8889f5 46 sw::DocumentStateManager::SetModified DocumentStateManager.cxx 50 0x7fffbd888729 47 SwDoc::MakeCharFormat docfmt.cxx 861 0x7fffbd6ef2b8 48 SwDoc::MakeCharFormat_ docfmt.cxx 883 0x7fffbd6ef43a 49 sw::DocumentStylePoolManager::GetFormatFromPool DocumentStylePoolManager.cxx 1514 0x7fffbd89132c 50 sw::DocumentStylePoolManager::GetCharFormatFromPool DocumentStylePoolManager.cxx 1718 0x7fffbd892d86 51 SwTextINetFormat::GetCharFormat txtatr2.cxx 144 0x7fffbdfa1a03 52 SwTextINetFormat::GetCharFormat txtinet.hxx 52 0x7fffbddb4f4e 53 CharFormat::GetItemSet atrstck.cxx 145 0x7fffbddb07e5 54 SwAttrHandler::PushAndChg atrstck.cxx 345 0x7fffbddb1047 55 SwAttrIter::Chg itratr.cxx 102 0x7fffbddf02db 56 SwAttrIter::SeekFwd itratr.cxx 296 0x7fffbddf1104 57 SwAttrIter::Seek itratr.cxx 419 0x7fffbddf17b3 58 SwAttrIter::SeekAndChgAttrIter itratr.cxx 158 0x7fffbddf06e2 59 SwTextIter::SeekAndChg itrtxt.hxx 313 0x7fffbde01791 60 SwTextCursor::GetModelPositionForViewPoint itrcrsr.cxx 1658 0x7fffbddff83f 61 SwTextFrame::GetModelPositionForViewPoint_ frmcrsr.cxx 604 0x7fffbddbe337 62 SwTextFrame::GetModelPositionForViewPoint frmcrsr.cxx 665 0x7fffbddbe891 63 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 64 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 65 SwPageFrame::GetModelPositionForViewPoint trvlfrm.cxx 211 0x7fffbdcf6f2f 66 SwRootFrame::GetModelPositionForViewPoint trvlfrm.cxx 452 0x7fffbdcf7fa0 67 SwCursorShell::GetContentAtPos crstrvl.cxx 1370 0x7fffbd581050 68 SwContentTree::UpdateTracking content.cxx 3700 0x7fffbe9864a0 69 SwContentTree::TimerUpdate content.cxx 3589 0x7fffbe985474 70 SwContentTree::Notify content.cxx 3047 0x7fffbe9811ad 71 SfxBroadcaster::Broadcast SfxBroadcaster.cxx 40 0x7ffff4180f32 72 SwDocShell::SetModified docsh2.cxx 1446 0x7fffbe53b663 73 SwDocShell::Ole2ModifiedHdl docsh.cxx 1150 0x7fffbe52d660 74 SwDocShell::LinkStubOle2ModifiedHdl docsh.cxx 1131 0x7fffbe52d597 75 Link<bool, void>::Call link.hxx 111 0x7fffbd8889f5 76 sw::DocumentStateManager::SetModified DocumentStateManager.cxx 50 0x7fffbd888729 77 SwDoc::MakeCharFormat docfmt.cxx 861 0x7fffbd6ef2b8 78 SwDoc::MakeCharFormat_ docfmt.cxx 883 0x7fffbd6ef43a 79 sw::DocumentStylePoolManager::GetFormatFromPool DocumentStylePoolManager.cxx 1514 0x7fffbd89132c 80 sw::DocumentStylePoolManager::GetCharFormatFromPool DocumentStylePoolManager.cxx 1718 0x7fffbd892d86 81 SwTextINetFormat::GetCharFormat txtatr2.cxx 144 0x7fffbdfa1a03 82 SwTextINetFormat::GetCharFormat txtinet.hxx 52 0x7fffbddb4f4e 83 CharFormat::GetItemSet atrstck.cxx 145 0x7fffbddb07e5 84 SwAttrHandler::PushAndChg atrstck.cxx 345 0x7fffbddb1047 85 SwAttrIter::Chg itratr.cxx 102 0x7fffbddf02db 86 SwAttrIter::SeekFwd itratr.cxx 296 0x7fffbddf1104 87 SwAttrIter::Seek itratr.cxx 419 0x7fffbddf17b3 88 SwAttrIter::SeekAndChgAttrIter itratr.cxx 158 0x7fffbddf06e2 89 SwTextIter::SeekAndChg itrtxt.hxx 313 0x7fffbde01791 90 SwTextCursor::GetModelPositionForViewPoint itrcrsr.cxx 1658 0x7fffbddff83f 91 SwTextFrame::GetModelPositionForViewPoint_ frmcrsr.cxx 604 0x7fffbddbe337 92 SwTextFrame::GetModelPositionForViewPoint frmcrsr.cxx 665 0x7fffbddbe891 93 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 94 SwLayoutFrame::GetModelPositionForViewPoint trvlfrm.cxx 168 0x7fffbdcf6c08 95 SwPageFrame::GetModelPositionForViewPoint trvlfrm.cxx 211 0x7fffbdcf6f2f 96 SwRootFrame::GetModelPositionForViewPoint trvlfrm.cxx 452 0x7fffbdcf7fa0 97 SwCursorShell::GetContentAtPos crstrvl.cxx 1370 0x7fffbd581050 98 SwContentTree::UpdateTracking content.cxx 3700 0x7fffbe9864a0 99 SwContentTree::TimerUpdate content.cxx 3589 0x7fffbe985474 100 SwContentTree::Notify content.cxx 3047 0x7fffbe9811ad Change-Id: I7e0814cf3a42dc876dd60c926d4b2245a036cc3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135802 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 45312369331688bde9d1b8c97ad883a69e5982d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137605 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-08-04Update git submodulesMartin Srebotnjak1-0/+0
* Update dictionaries from branch 'distro/collabora/co-22.05' to cdbc21defb8bf9d4f6dfd4bb23a1428e97084a01 - Updated Slovenian thesaurus Change-Id: I7209dd3153e83674b473e95797fff7b0b01a7b2e Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/137726 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2022-08-04Revert "mmap a "downloaded" font in Collabora Online already in the..."Tor Lillqvist5-120/+62
Font files are opened in a lot of places anyway, that commit was very far from enough. This reverts commit ba00d997ddd6867c3f2bd4909625a91bf4db590b. Change-Id: Ifca3c86f1e5d9b35a58abda52e3e214a969d99e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137790 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2022-08-04lok: Dont render active text edit on slide previewsSzymon Kłos6-3/+39
- extend ITiledRenderable interface to pass active text edit drawing state to the SdXImpressDocument - when painting tiles - allow text edit only for current part - pass new setting also to SdrPaintView where painting happens Change-Id: Ib4ff226961a76129f4f5ff11c90694cd46a83a6b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137676 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2022-08-04Turn the split table dialog into an async JSDialogSkyler Grey6-20/+36
- Previously the split table dialog was not an async dialog, and it wasn't a JSDialog either - A non-async dialog has issues when multiple people try to change something using the dialog at the same time. Generally the changes from one person will not be applied until all people who opened the dialog later than them have submitted - This PR makes the dialog async, fixing multi-user issues with it - This PR makes the dialog into a JSDialog, rendering it on the client with native HTML elements Signed-off-by: Skyler Grey <skyler3665@gmail.com> Change-Id: I9254bc1b635531c8b38d1ade76f99ffdda145b35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137741 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-08-03desktop: avoid run graphic tests if ...Henry Castro1-1/+5
DISPLAY=hostname:displaynumber.screennumber has defined a remote display server, otherwise the initialization stuck for long time. Signed-off-by: Henry Castro <hcastro@collabora.com> Change-Id: Ieb598a023bce3d4298e02fa3ed6ae2bcfc6df015 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137366 Tested-by: Jenkins (cherry picked from commit 554370661554652e7be96034e310d6863c700285) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137613 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-08-03removed unused variablesPranam Lashkari1-2/+0
use of these variables was removed in 3f97c911aa91c3bdfbae05fd5646b55987691e42 Signed-off-by: Pranam Lashkari <lpranam@collabora.com> Change-Id: Ia8fee6e9fc7443438c84155caf9c6d826c2c5b51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137739 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-08-03tdf#150034 very slow opening pathological chartNoel Grandin1-1/+2
revert part of commit 10c934147d469965dba6abc78efd02759a010b8e Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Tue Apr 23 09:26:46 2019 +0200 tdf#113266 slow opening XLS with 45 MB drawing in this situation, avoiding setting all the rects dirty speeds up the load from 70s to 1s. Change-Id: Ia35119ff20ef5bded9a34f12cce453434dea4383 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137688 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 613f6e75fbfcc024fc9c3732261cbf2cda6f4ad8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137716 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-08-03show "tabs" tab in paragraph setting even when para has different settingsPranam Lashkari1-1/+1
Signed-off-by: Pranam Lashkari <lpranam@collabora.com> Change-Id: Ida61e8878382988a7470d156ded187d21bcc9d91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137707 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-08-02sc, out of order undo: allow multiple actions from other viewNoel Grandin4-8/+90
this is the calc equivalent of commit c88c2d40d1a4aebc46b25368b80c02bc2f136658 Date: Fri Nov 12 08:39:35 2021 +0100 sw, out of order undo: allow multiple actions from other views Change-Id: I5acbd1e1cacef7c2e2a549f4d2270e961f576a65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137652 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 3ccbfaaf95005a34ca64ad250463ef5ce8842f43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137608 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-08-02generalize the undo independence checkNoel Grandin4-12/+25
Change-Id: I441edbdf11ada1a0a724577a4f76ae8ae14177e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137683 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 41a513e5bbd253fad0ea78e297f4c1dd3c0837aa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137607 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-08-01Fix 'Architecture' string on ppc64le platform, Debian uses 'ppc64el'cp-22.05.5-1Andras Timar2-0/+12
Change-Id: Idb678ac2669914575d3ddb813d35212df26e3d17
2022-08-01sc, out of order undo: allow a subset of a non-empty redo listNoel Grandin3-10/+119
This is the calc analogue of commit 60665dc4a2af238939b1a5056ae4a4ce2c083159 sw, out of order undo: allow a subset of a non-empty redo list Specifically, we used to not allow out of order undo at all if the redo list was non-empty. This relaxes that condition a bit. Out of order undo is OK with a non-empty redo list, in case all undo actions in the redo list are either 1) owned by the current view or 2) independent from the undo action to be executed I.e. if view1 has lots of type undo actions and an view2 adds a single type undo action on top of it, then allow view 1 to execute multiple of its typing undo actions, not just a single one. Change-Id: Ib7ab88e9ebbefce267d3c7d567debd1cd98d7d6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137598 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-08-01vcl: fix crash in vcl::ImportPDFUnloaded()Miklos Vajna1-0/+5
Crashreport signature: SIG Fatal signal received: SIGSEGV code: 1 for address: 0x0 program/libmergedlo.so vcl::ImportPDFUnloaded(rtl::OUString const&, std::vector<vcl::PDFGraphicResult, std::allocator<vcl::PDFGraphicResult> >&) vcl/source/filter/ipdf/pdfread.cxx:256 program/../program/libsdlo.so SdPdfFilter::Import() sd/source/filter/pdf/sdpdffilter.cxx:55 program/../program/libsdlo.so sd::DrawDocShell::ConvertFrom(SfxMedium&) sd/source/ui/docshell/docshel4.cxx:500 (discriminator 1) program/libmergedlo.so SfxObjectShell::DoLoad(SfxMedium*) sfx2/source/doc/objstor.cxx:768 Change-Id: I2fc635de696643af6a80a29aa5af4fa128f8776c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137669 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-08-01Bump version to 22.05.5.1Andras Timar1-1/+1
Change-Id: I81745554f5cf60df0d95529d6a390b848c022c6b
2022-08-01sw: SolarMutexGuard missing in SwXBookmark::setPropertyValue()Michael Stahl1-0/+2
Change-Id: I41187b02e6b0545529e2a2c5b07da671eae89079 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137506 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit c7a76952b6fa0e6688028047726ac794fdd5cca3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137518 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-08-01tdf#123983 fix loading graphic that is in root folder + testTomaž Vajngerl5-2/+152
We need to detect that the storage name is empty, so in that case the root storage needs to be set as the current storage. Change-Id: Ibe3287ccf1f1513a3531dcf4d540a456cca8dfb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137276 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit d449da36086409e3cc440036193c4fc8a10a37a1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137424 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137469
2022-08-01related: tdf#97539: SVGIO: iterate over parent's clippathsXisco Fauli3-1/+42
This commit reintroduces fb33451a27d8668bc14f5bcfd6ea742fc4c5b84c "tdf#97539: SVGIO: iterate over parent's clippaths" which I reverted it in 82c0a363abbceac6464b62c3571aa3225415c7db "tdf#97539; if parent is css style, look one level up" because I thought it was no longer necessary, but I was wrong. Also add a unittest Change-Id: Ib66ca0afd63e8e52be6677b6965179e092a61aa8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137195 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137208 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137218 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-08-01Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR EuroEike Rathke3-1/+21
TODO: switch defaults before 2023-01-01 in i18npool/source/localedata/data/hr_HR.xml Change-Id: Ifc62aefbc8c9fe8bbf044f61ae4fd6eeff692185 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137371 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 7c4b2db21ef77b37daf234ac1ab9989234606a22) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137331 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-08-01tdf#97539; if parent is css style, look one level upXisco Fauli4-6/+53
if the style attributes are set like <rect x="10" y="10" width="100" height="100" fill="#00D000" clip-path="url(#myClip)"/> it works, however, if it uses a css style like <rect x="10" y="10" width="100" height="100" style="fill:#00D000" clip-path="url(#myClip)"/> it fails to get the clipPath from the parent, because the css style is the direct parent, thus, check one level up Change-Id: Iff6df95c9fa9da4c2f1a986cca0ad82ab1494353 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137094 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 1eff99718e3cfc01961dc798d708e574f669b200) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137064 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137217 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-07-30sc: allow undo of typing in 2 views independent from each otherNoel Grandin18-13/+220
This commit follows the same pattern as commit c72e500ccaf0ce2261c5233b80fba9342778f810 sw: allow undo of typing in 2 views independent from each other with some changes since calc and writer have different undo/redo infrastructure on top of SfxUndoManager. Change-Id: Ib6e7e21caccb94752c01c529b5013553dba8b4f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137579 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit a2e1754dc96955a8c6da0e25896f645cf2f09f74) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137596 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-29tdf#149738: Minor inconsistencies in sparkline related UI stringsJulien Nabet2-3/+2
Change-Id: I5b4c31e69743ad519a8bcc99fa3a5a7512a4cc18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136955 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit f8a84ef8f085251d545597a83d71b5b5b2f547d6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137436 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-07-29tdf#148467 Move sparklines items to Insert/Format main menuRoman Kuznetsov1-10/+10
Change-Id: I2606fdd6301e5d1cb1e855d79a971762ed2d835d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133608 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit a68629fdf97f181d4c6975f91e66fe52f83247e9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137435 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-07-28Resolves tdf#148568 - Rework the Sparklines dialogHeiko Tietze4-712/+460
* controls rearranged and variables renamed * radiobuttons changed into comboboxes Change-Id: Ifda426b5fa9596c2b23c335165785c0cb341433f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133636 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com> (cherry picked from commit 0ba1d661430effda61d8a6fadff9527dc9562698) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137413 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-07-28Use colors from standard palette for sparklinesHeiko Tietze1-8/+11
Change-Id: I95cfb74efd5e28e048c8057a464a57c88aab7e7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133634 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit ee1705a95bdfffbe0e36d449378be726733d7141) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137412 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-07-28lok: add dumpState feature for better in-field diagnostics.Michael Meeks12-1/+149
Always suspicious that some un-expected dialog / state can cause strange behavior in a client. An initial cut at an API to make it easier to unwind such problems by exposing the toolkit state. Change-Id: If8f17943fa4837df4f9ca659a111dcdce5c23244 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137564
2022-07-28lok: Properly update sidebar context in MathMike Kaganski4-47/+29
Change-Id: I830c0d9bdeaa6340283eafc3e91251d02602d7aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137247 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137546 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-28lok: Enable sidebar in MathMike Kaganski10-26/+80
Change-Id: I1554a924eef0bfcaffa893057a37ef45321a0cf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137246 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137545 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-28Enable Math sidebar panels for JSInstanceBuilderMike Kaganski1-1/+3
Change-Id: I9c71dd3cad1e45d0a01ab187c652711c19fe3b89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135444 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137544 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-28lok: find active SmViewShell reliablyMike Kaganski4-15/+30
... even after SfxViewShell::Current() had been set to parent document frame's viewshell (e.g., see LOKPostAsyncEvent grabbing focus, which replaces current frame and its associated viewshell). Change-Id: If63087f4c7f3f878ada93d93cc0af6c20a6c0a62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129323 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137549 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-28Add a title to the widget test dialogSkyler Grey1-0/+1
- Previously the widget test dialog didn't have a title, however most of the other dialogs do. This commit adds a title to the dialog Signed-off-by: Skyler Grey <skyler3665@gmail.com> Change-Id: I8b61e00e93cd71a6a7bf068537d9cbcdc735753d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137534 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Rashesh Padia <rashesh.padia@collabora.com> Reviewed-by: Pedro Silva <pedro.silva@collabora.com>
2022-07-27crashtest: fix crash on ODT export of forum-mso-de-84211.docxMiklos Vajna3-17/+39
XMLTextParagraphExport::ExportContentControl() disables the export of the <loext:list-item> XML element in autostyle mode, then it should also disable the export of the matching attributes. (cherry picked from commit 6cf1f3c09c43bd3bbcda611a9476ff5e64c5164f) Change-Id: Ia65fc8bd3398df0ab1b71973695c9bc8d10deaa4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137496 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27sw content controls, plain text: add insert UIMiklos Vajna10-1/+65
- handle the plain text case in SwWrtShell::InsertContentControl() - expose this as a new .uno:InsertPlainTextContentControl command - add the new uno command to the default & MS-compatible menus (cherry picked from commit 7748a0c437855133fb0a0ebadb60f5f083112f20) Change-Id: Ie6eb7271f2c1603fb92036e0067b1e6be70d93ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137495 Tested-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27sw content controls, plain text: add DOCX importMiklos Vajna13-16/+99
- the core of this is the writerfilter/ change to call PopSdt() for SdtControlType::plainText, which maps inline plain text SDTs to Writer content controls, not to input fields - disable the grab-bag in this case, otherwise we would run duplicated <w:sdt> elements on export - fix CppunitTest_sw_ooxmlexport7's testSdtAndShapeOverlapping by postponing the SDT start in DocxAttributeOutput::WriteContentControlStart() in case a shape is anchored at the same position as the SDT start: if the shape should start inside the content control, then it should be anchored after the dummy character - reduce the debug output in VMLExport::Commit(), which could write control characters to the terminal on test failure, potentially breaking it (requiring a 'reset' to recover) - fix CppunitTest_sw_ooxmlexport5's testSdt2Run: now we merge two runs inside a plain text content control into a single one, and there is no problem with that, so adapt the test instead - fix CppunitTest_sw_ooxmlexport17's testTdf148361: plain text inline SDT is now a content control, not a field - fix CppunitTest_sw_ooxmlfieldexport's testfdo82492: explicitly assert that there is 1 text run inside the SDT and there is a shape after it (outside). Also extend DocxAttributeOutput::EndContentControl(), so it ends the content control at the correct, earlier position in case it's followed by an as-char shape - fix CppunitTest_sw_ooxmlfieldexport's testfdo82123: again assert that the SDT has 1 run with text, and there is a drawing after the SDT - fix CppunitTest_sw_ooxmlfieldexport's testTdf104823: this revealed that some more complex logic is needed to support data bindings, so exclude text-with-databinding from the scope of this commit and continue to map those to input fields for now - fix CppunitTest_sw_ooxmlfieldexport's testFdo81945: this had a similar problem as as-char shapes, but this time a new SDT is starting right after a previous SDT. Adapt DocxAttributeOutput::EndContentControl() accordingly, though perhaps this should be generalized later, so we always close SDTs in the previous run, unless this is the last run, or something similar (cherry picked from commit 9700c1b2170ad04453a361ed5647937833ac3c18) Conflicts: oox/source/export/vmlexport.cxx Change-Id: Ifaf581be884a683de6c8b932008a03ba43734b75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137494 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27sw content controls, plain text: add DOCX exportMiklos Vajna4-0/+144
Map the PlainText UNO property to: <w:sdtPr> <w:text/> </w:sdtPr> (cherry picked from commit a6e5726f186bf9d2a0ea91169649504c7396c539) Conflicts: sw/qa/filter/ww8/ww8.cxx Change-Id: I57f365fcfb3a80acb74aa932432a8ae8f3acc92b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137493 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27tdf#150145 text appears to have a row of pixels cropped outCaolán McNamara1-3/+3
which is very similar sounding to https://gitlab.freedesktop.org/cairo/cairo/-/issues/390 seems to be a bad interaction of slight hinting and sub pixel positioning with hints_metrics disabled with CAIRO_HINT_METRICS_OFF. lets continue to assume we desire CAIRO_HINT_METRICS_OFF most and disable hinting rather than use slight (cherry picked from commit 59cfcd863b483a99491e6f8cd30016386bbff870) Change-Id: Id7b35d0e4f9291987e8ab96814936700374c6e16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137491 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27sw: fix heap-use-after-free in SwTextNode::InsertHint()Miklos Vajna1-0/+1
This is a problem since commit 1dce9ee7e12871ee63434499db805e806b9e9d3c (sw content controls, plain text: apply formatting to the entire contents, 2022-07-21), because I forgot to check if pAttr is still a valid pointer after the input field code is executed. Below code already uses this flag to make sure it's not accessing a dangling pointer, apply the same fix here as well. (cherry picked from commit 5d68b3878fed165bf1bdc6aa47be1df4a8265b96) Change-Id: Ifcba0bc5e3a3c0abd81ff954fb10f6880163461b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137473 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27sw content controls, date: add ODT filterMiklos Vajna9-0/+106
Map the PlainText UNO property to: <loext:content-control loext:plain-text="..."> on export, and do the opposite on import. (cherry picked from commit 33cf26c8b6dc6cf38edf2d22cfefbd00904d9da8) Conflicts: xmloff/source/token/tokens.txt Change-Id: Icec0c35b2b9fca53104e6526c98083db52df5d42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137472 Tested-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27sw content controls, plain text: apply formatting to the entire contentsMiklos Vajna2-0/+45
The difference between normal (rich text) content control and a plain text one is that if you try to format a subset of the contents, that's possible in the rich text case, but the plain text case extends the formatted range to the entire content control. Handle this in SwTextNode::InsertHint(), similar to how it's done for input fields. (cherry picked from commit 1dce9ee7e12871ee63434499db805e806b9e9d3c) Change-Id: I9a1ad0095f0ca810da24d5c4ce4aa48d1ac59225 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137471 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-07-27Handle Ctrl+Z / Ctrl+Y in Math graphic window correctlyMike Kaganski1-0/+7
... instead of trying to insert a control character in the formula. Change-Id: Ifcf4d3ce1111a381cd29de310b041c08f7314cff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137402 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137477 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-27Some refactorMike Kaganski2-91/+91
Change-Id: I58f315e39e33a09585d6325590998ac8195687db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137401 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137476 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-27Related: tdf#128610 drop obsolete encoding attribute replacementMike Kaganski1-10/+0
It was needed once, when we used expat; now libxml2 does its own detection (in its xmlDetectCharEncoding) after the strange dance in our XMLFile2UTFConverter::readAndConvert (which does nothing useful for UTF-16 case). The original problem in tdf#128610 was addressed in commit c964700d16d99d1569373a1eb9a1352fb3512915. This one just drops the obsolete replacement. Change-Id: I2e6b28212619dd0f6cb90ae8234277092a37e7a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131409 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137475 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2022-07-27lok: enable in-place editing of math equationsMike Kaganski15-83/+349
Change-Id: Ic4d187d1e2ee92eab74a6bb43e47bb4f3d47ebd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128506 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137460 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>