summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-04Bump version to 23.05.9.3cp-23.05.9-3Andras Timar
Change-Id: I14522d60e0529e7c8521937f02680dd49c160e19
2024-03-04svx: fix default locale language stringHenry Castro
1) Open a spreadsheet 2) Format a cell with a currency. Example USD $ English (USA) 3) Open the sidebar if it's not opened already 4) Click in the currency dropdown 5) Observe: there is $ (Default) Expected result: USD $ English (USA) Default Signed-off-by: Henry Castro <hcastro@collabora.com> Change-Id: Idf7f4174557e59cb6f5ffd65c25572322a5794ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164109 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164350
2024-03-04clang complains about not used lambda captureMarco Cecchetti
`this` is not used in lambda implementation Change-Id: I64017f71f978c19ff132f75b6eb9a3d8b73da0cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164187 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2024-03-01LOK: send inner text boundry information of shapes/textboxPranam Lashkari
Sends inner rectangle boundry info as part of LOK_CALLBACK_GRAPHIC_SELECTION message Change-Id: Idc51e807bec01711c8a4326e3193127f0b2cd765 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164075 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-03-01Make Chart Object Properties Dialogs Asynccodewithvk
How to reproduce it: When double-clicking on a chart, it will now open the Chart Object Properties dialog box. Previously synchronous, this commit updates it to be asynchronous. Signed-off-by: codewithvk <vivek.javiya@collabora.com> Change-Id: I54c24e0cd30d6ec8b2bfa93567e830405d2fd30c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162576 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2024-02-29lok: calc: sheet position not restored on undo a tab insert/delete/moveMarco Cecchetti
Change-Id: I34158b267727048e703cf895cbc8e20b81da4944 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164166 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-29lok: calc: sheet geometry not updated on undo a tab insert/delete/moveMarco Cecchetti
Change-Id: I1e12ca71771e746155afe48215ba2df4b35634d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164165 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-29lok: calc: tiles not invalidated on tab moveMarco Cecchetti
This patch fixes a regression started from 9f3ee2b2 "don't invalidate when switching tabs" Change-Id: Icd560c73cff836b026b1ba69432bb712e36c035a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164164 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-29Make two TOOLS_WARN_EXCEPTION messages a bit more informativeTor Lillqvist
Change-Id: I614f44cfb94a214baace420f94f18991f368b953 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144859 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 3998ccfe14dab2e0a9b31cebe08534aa41177ce5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164168 Reviewed-by: Neil Guertin <neil.guertin@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-29Online: Make tooltip message specific to function usage tooltipGülşah Köse
Using same callback caused a regression about showing tooltip while reviewing a change in writer. So we need a type to understand which tooltip comes. Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com> Change-Id: Iae26ff48f9c5c711af071fd66b5314e7bc96ff8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164093 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164150 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-29tdf#159453 sw floattable: fix unexpected overlap of in-header fly and body textMiklos Vajna
Regression from commit e2076cf7a92694bc94bdc9f3173c2bddbe881a89 (tdf#155682 sw floattable: fix DOCX with big pictures causes endless loop, 2023-10-25), the bugdoc's body text was wrapping around the floating table from the header, while the expectation was that the top of the body frame is below the bottom of the header frame. It seems IsFollowingTextFlow is only needed when the relation of the floating table is not "page", and this bugdoc has has an examplicit vertical relation of page. Solve the problem by limiting the IsFollowingTextFlow=true request for the floating table to the VertOrientRelation=page case, which fixes the bugdoc and keeps the old use-case working. The doc model for the new bugdoc now matches the WW8 import result. (cherry picked from commit f74a6ef94ac957e4c146fc9923d30ce6bd31b5ce) [ Backport note: testSplitFlyNestedRowSpan no longer asserts the page count on this branch, as that would be 7, the primary purpose of the test is to make sure we don't layout loop and even previously the loop control was kicking in, so the outcome is not too interesting. The page count is correct on co-24.04. ] Change-Id: Ia3da65cd52d70b357e448a26a50ffb92a39795e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164072 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-29tdf#159927 sd headerfooterdlg: detect existing date/time languageJustin Luth
Sometimes it was hard to change an existing foreign language to your own language for Impress' header/footer fields. The function was only checking the first master slide for the date/time language. If it didn't have one, then the default locale was selected. However, although all pages share the same date/time language, it is not necessary for all (or even the first) master slide to have a date/time field. So check through all the master slides until one with a date/time is found. Obviously if none have one defined things still work OK, because that is effectively how it was working beforehand. A separate unit test was provided with https://gerrit.libreoffice.org/c/core/+/164070 Change-Id: Ida44957013978720ad12fadc9b4ebc88bc10ea40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164045 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164069 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164077 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-28assertion fails on last rows selection / modificationCaolán McNamara
Open Calc hello world spreadsheet Click on cell in column H Press ctrl + shift + down arrow to select and go to the end of sheet (cell H1048576) Click on the H1048576 and type something, Save Refresh browser / reload spreadsheet try to select modified cell, remove content Result: Crash assert(nEndRow >= nStartRow); nEndRow = 1048575 nStartRow = 1048576 likely an assert since: commit a86c00414a43c5d87981ffae1018cb242c5e5e1d Date: Fri Jan 19 14:27:10 2024 +0200 cool#6893 reduce allocation in ScGridWindow::PaintTile but seems harmless for this specific example Change-Id: I1d492c357a7a0a23b9f9cc974c4b9f684aba8648 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164092 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-28don't use EEControlBits::FORMAT100 in inline editengine for kit modeCaolán McNamara
With multiple users the EditEngine for the first user is created during load of the document, before ScModelObj::initializeForTiledRendering is called, and that sets SetTextWysiwyg(true) ScInputHandler::UpdateRefDevice has... if ( bTextWysiwyg ... ) mpEditEngine->SetControlWord( ... | EEControlBits::FORMAT100 ); That FORMAT100 means that layout for such edit engines is done at a X/Y Scaling of 1 The first users editengine doesn't get any of that set, because TextWysiwyg is not true yet when it's created, and so matches the normal document rendering, but later joiners have TextWysiwyg set, so trigger this alternative path and so the mapmode doesn't match the other case and the two users have different results for the width of text in an active editengine. As it turns out, the results without FORMAT100 are the preferred ones, so make that explicit for kit. Change-Id: I76a78be1fca4af84c493d32bdd43f968ba072452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164056 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-28if a SdrTextObj is being edited then TextHierarchyEditPrimitive2D existsCaolán McNamara
instead of the usual content, so actively edited shapes are different. Change-Id: I8c65a59b1724152d488f3b0ca83ec744207b0fa0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164074 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-28split TextAsPolygonExtractor2D for more general reuseCaolán McNamara
Change-Id: I102ccab2a423c38b0414c9565fec349aa6ffb5af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163725 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 006a8e3186c26c43560b2d616dde453437a49b47) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163766 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> (cherry picked from commit 9a5a13d4051b9de88249afa4c2ef41b99d9077f5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164083
2024-02-28sync InputHandler zoom on setClientZoomCaolán McNamara
analogous to what SetZoom and ScTabViewShell::Activate do. Otherwise the InputHandler editengine ref device used for cell editing stays at the MapMode stored in the document and doesn't update to stay in sync with the desired rendering so there is a visible mismatch between normal rendering and cell editing rendering. Change-Id: Ifd9b21ab15cc123e0747fcebfdd55f2ddc44bd31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163315 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-28tdf#159107 sw floattable: prefer inline table in footnote with change trackingMiklos Vajna
Writer doesn't really support tables in footnotes, see the warning at the top of SwFlowFrame::MoveFwd(). Still, there is some initial support for them, since commit 11c51eefe8c3210cef2b5850f401ba67a401d01 (tdf#95806 tdf#125877 tdf#141172 DOCX: fix tables in footnotes, 2021-03-28). Similarly, redlines really just track insertion and deletion, but some initial support for table operations were added in commit eebe4747d2d13545004937bb0267ccfc8ab9d63f (tdf#144270 sw: manage tracked table (row) deletion/insertion, 2022-01-12). The combination of these is a bit fragile, but the bugdoc happened to be imported as an inline table (in a footnote, with recording changes) before commit d477fa8ac1b0d3ee81427217bbb5950278ab16db (sw floattable: unconditionally map <w:tblpPr> to SwFormatFlySplit, 2023-03-17). Fix the problem by explicitly importing floating tables as inline in the footnote + redline case to restore the working use-case. DOCX import of this combination can be enabled again once Writer layout works for the produced model. Change-Id: I9cd0a1fabb9807f5117cb5a36ec8597d6646eece Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162733 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit af15f8b7f346898677f1eee6521a6be1ff63eb56) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162716 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163297 (cherry picked from commit 9589438d53f32ba7b59512d56a6dbd1d28de70a6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164071 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-27Online: Prevent hiding tooltips due to other users action.Gülşah Köse
Other user's actions like reloading reopening or refreshing document causes hiding other user function tooltips. Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com> Change-Id: I0aeb0aeb98182398e4740c71cfd65c4df2c51ba6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163979 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-27tdf#159017 sw floattable: only shift to the right when neededMiklos Vajna
Regression from commit 868140fcc1311259b9d5f666637b33d226511a53 (tdf#60558 sw floattable: allow wrap of table on the right of a floattable, 2023-12-05), the document had an inline table, followed by a floating table, and we moved the inline table to the right even if the left hand side of the floating table already had enough space. What happens here is that nominally the inline table's original position overlaps, but because the table width is small enough, such an overlap doesn't actually happen. In this case, it's not needed to shift the inline table to the right. Fix the problem by making the check that decides whether it's necessary to increment the left margin of the table more strict: it's not enough to have enough space on the right of the fly, it's also needed to *not* have enough space on the left side. This keeps the original "floating table wrapped by inline table on the right" use-case working, but restores the ~no left margin for the inline table for the new bugdoc. Conflicts: sw/source/core/layout/tabfrm.cxx Change-Id: Ifb30d90ca6dba7cc4a402d8a4445251120b575ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162447 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 6e3ad6ca0ae6cf62056610ddae9097973a887d99) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163953 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-26Bump version to 23.05.9.2cp-23.05.9-2Andras Timar
Change-Id: I6f9ede0bfa286e0ee2490a525bd673e2271823bd
2024-02-26lok: don't hide tooltim on every actionSzymon Kłos
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com> Change-Id: I62f69071a4857f7413a995da1ff9fc6ba2f942d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163947 Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-26Revert "lok: fix export pdf error"Caolán McNamara
this would silence an error if pdf export failed, I think the export warning we see is from svg export, and from a failed attempt to export a selection for a svg preview, which "return early without error if no shape is selected" attempt to address in an alternative approach This reverts commit 74d22a7dad84f4abff1819764b8c407d89bb0985. Change-Id: Ic2a54fddea2e5912e27184c7fa0a1e39b84b5886 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163944 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-26return early without error if no shape it selected on generating previewCaolán McNamara
of current selection. Which can arise in calc on repeatedly double-clicking on a shape and pressing esc. Eventually there will be a case where the shape isn't selected by the time the preview generation is attempted. Change-Id: Ic92149b5e12f35fe69265b6c8df289819313a899 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163936 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-26lok: fix export pdf errorHenry Castro
When autosave is triggered and for some reason fails, the callback LOK_CALLBACK_EXPORT_FILE message is sent to client. ------------- wsd-1210529-1210690 2024-02-23 16:49:50.381079 +1030 [ docbroker_001 ] TRC Triggering an autosave by timer| wsd/DocumentBroker.cpp:499 wsd-1210529-1210690 2024-02-23 16:49:50.381083 +1030 [ docbroker_001 ] TRC autoSave(): forceful? false, dontSaveIfUnmodified: true| wsd/DocumentBroker.cpp:2329 wsd-1210529-1210690 2024-02-23 16:49:50.381087 +1030 [ docbroker_001 ] TRC Checking to autosave [https%3A%2F%2Flocalhost%3A9980%2Fwopi%2Ffiles%2Fhome%2Fvalaki%2Fprojects%2Fconlinenext%2Ftest%2Fdata%2Fhello-world.ods] using session [072]| wsd/DocumentBroker.cpp:2365 ----------------------- wsd-1210529-1210690 2024-02-23 1kit-1210581-1210547 2024-02-23 16:50:14.250861 +1030 [ kitbroker_001 ] TRC Document::ViewCallback [4] [LOK_CALLBACK_EXPORT_FILE] [ERROR].| kit/Kit.cpp:1102 kit-1210581-1210547 2024-02-23 16:50:14.250880 +1030 [ kitbroker_001 ] TRC Document::ViewCallback end.| kit/Kit.cpp:1211 Signed-off-by: Henry Castro <hcastro@collabora.com> Change-Id: I6961d562bad8aa77bf479bafcaa8bd758dae259a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163857 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2024-02-23ONLINE: Add calc formula tooltip support.Gülşah Köse
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com> Change-Id: I1f3c438f5152e2b372212d003c1ec4e74e4d3ff2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163594 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-23optimize the text drawing, that's what we do most ofCaolán McNamara
maybe the alternative branch should be dropped, turned into a debugging option because it is obscure and presumably doesn't result in better results that using the platform text rendering Change-Id: Ief6882f7acf8737ca64b10e74e5d94aade60d71a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163794 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-23Drop some wrapper methods from SvtOptionsDrawinglayerGabor Kelemen
just use the wrapped officecfg methods instead of: IsSolidDragCreate IsRenderDecoratedTextDirect IsRenderSimpleTextDirect GetQuadratic3DRenderLimit GetQuadraticFormControlRenderLimit IsTransparentSelection Change-Id: Ie0f3ec0f8fdbbf08facfff1a372c666c8a0c8979 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160654 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163793 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-22Update git submodulesAndras Timar
* Update translations from branch 'distro/collabora/co-23.05' to b7278f5d10b67302ccdff518780d3ec1c35bb716 - [cp] Remove reference to menu in dialog text Change-Id: Ifabd27fba28f8189f4be3f3c3604982eba4602bc
2024-02-22[cp] tdf#159748 Remove reference to menu in dialog textHubert Figuière
This menu doesn't exist when using the tabbed UI Change-Id: I2dc89e630049171777684aff55b51872121b6e39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163776 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2024-02-22tdf#159815 DOCX import: fix redlined to-char image followed by inline SDTMiklos Vajna
The 2nd para of the bugdoc has a leading word, then a redlined anchored shape, finally a redlined checkbox content control. The Writer import result's content control starts at para start, while it should only start after the anchored shape. What happens is that writerfilter::dmapper::DomainMapper_Impl::PushSdt() gets called to remember the SDT start, then DomainMapper_Impl::applyToggleAttributes() deletes some content since commit 8726cf692299ea262a7455adcf6ec25451c7869d (tdf#142700 DOCX: fix lost track changes of images, 2021-07-08), which invalidates the SDT start position, finally PopSdt gets called, but that fails because our start position is no longer valid. This used to abort the import process. Since commit 1b0f67018fa1d514ebca59e081efdd24c1d7811b (docx import: correct redline content-controls, 2024-02-20), the import finishes the but start of the SDT is incorrect: it's at the para start, while it should start in the middle of the paragraph. The direct reason for the invalidation is a call to SwXTextRange::Impl::Notify(), which is from a content deletion from applyToggleAttributes(). Fix the problem by not deleting content when we're past PushSdt() and we haven't called PopSdt(): extract the redlined anchored shape code into a new DomainMapper_Impl::MergeAtContentImageRedlineWithNext() and call that also in DomainMapper_Impl::PushSdt() early, so it won't be called when we're in the middle of an SDT. This way createTextCursorByRange() should not fail, so warn in case it still fails in DomainMapper_Impl::PopSdt(). Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx (cherry picked from commit 833abb4a197561c34ec59cceb9d7d8a46f6b17ce) Change-Id: Ic4198804a92088ec268203d44c0da2d6997754b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163716 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-22Silence some bogus -Werror=array-bounds etc. with GCC 12 and -std=c++20Stephan Bergmann
...as witnessed with patch set 1 of <https://gerrit.libreoffice.org/c/core/+/155121/1> "Bump baseline to C++20", > In file included from /opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/char_traits.h:46, > from /opt/rh/gcc-toolset-12/root/usr/include/c++/12/ios:40, > from /opt/rh/gcc-toolset-12/root/usr/include/c++/12/ostream:38, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/include/rtl/ustring.hxx:34, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/include/svl/gridprinter.hxx:13, > from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/svl/source/misc/gridprinter.cxx:10: > In function ‘constexpr decltype (::new(void*(0)) _Tp) std::construct_at(_Tp*, _Args&& ...) [with _Tp = long unsigned int; _Args = {const long unsigned int&}]’, > inlined from ‘static constexpr void std::allocator_traits<std::allocator<_CharT> >::construct(allocator_type&, _Up*, _Args&& ...) [with _Up = long unsigned int; _Args = {const long unsigned int&}; _Tp = long unsigned int]’ at /opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/alloc_traits.h:518:21, > inlined from ‘constexpr void std::vector<_Tp, _Alloc>::_M_realloc_insert(iterator, _Args&& ...) [with _Args = {const long unsigned int&}; _Tp = long unsigned int; _Alloc = std::allocator<long unsigned int>]’ at /opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/vector.tcc:462:28, > inlined from ‘constexpr void std::vector<_Tp, _Alloc>::push_back(const value_type&) [with _Tp = long unsigned int; _Alloc = std::allocator<long unsigned int>]’ at /opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/stl_vector.h:1287:21, > inlined from ‘mdds::mtv::soa::multi_type_vector<Traits>::iterator mdds::mtv::soa::multi_type_vector<Traits>::set_cell_to_empty_block(size_type, size_type, const T&) [with T = rtl::OUString; Traits = mdds::multi_type_matrix<svl::{anonymous}::matrix_traits>::mtv_trait]’ at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/main_def.inl:2995:50, > inlined from ‘mdds::mtv::soa::multi_type_vector<Traits>::iterator mdds::mtv::soa::multi_type_vector<Traits>::set_impl(size_type, size_type, const T&) [with T = rtl::OUString; Traits = mdds::multi_type_matrix<svl::{anonymous}::matrix_traits>::mtv_trait]’ at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/main_def.inl:1240:72, > inlined from ‘mdds::mtv::soa::multi_type_vector<Traits>::iterator mdds::mtv::soa::multi_type_vector<Traits>::set(size_type, const T&) [with T = rtl::OUString; Traits = mdds::multi_type_matrix<svl::{anonymous}::matrix_traits>::mtv_trait]’ at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/mdds/include/mdds/./multi_type_vector/soa/main_def.inl:696:14, > inlined from ‘void mdds::multi_type_matrix<Traits>::set(size_type, size_type, const string_type&) [with Traits = svl::{anonymous}::matrix_traits]’ at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/mdds/include/mdds/multi_type_matrix_def.inl:356:5, > inlined from ‘void svl::GridPrinter::set(size_t, size_t, const rtl::OUString&)’ at /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/svl/source/misc/gridprinter.cxx:68:25: > /opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/stl_construct.h:97:14: error: array subscript 0 is outside array bounds of ‘long unsigned int [0]’ [-Werror=array-bounds] > 97 | { return ::new((void*)__location) _Tp(std::forward<_Args>(__args)...); } > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (<https://ci.libreoffice.org/job/gerrit_linux_gcc_release/148699/>), etc. (The curly braces in sw/source/core/doc/doc.cxx had to be added to avoid an ensuing bogus > sw/source/core/doc/doc.cxx: In static member function ‘static void SwDoc::CalculatePagePairsForProspectPrinting(const SwRootFrame&, SwRenderData&, const SwPrintUIOptions&, sal_Int32)’: > sw/source/core/doc/doc.cxx:1000:5: error: ‘else’ without a previous ‘if’ > 1000 | else > | ^~~~ ) Change-Id: I902f6d74d897b9bf281dc9c821aff30e7e72582a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155215 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2024-02-21use after free on clicking cancel in a calc spelling message dialogCaolán McNamara
e.g. the calc subdialog "Should the spellcheck be continued from the beginning of the current sheet" seen from the "spelling" dialog when starting spelling from some cell beyond used sheet bounds. With a local asan build, and hello-world.ods, load, put cursor in A2, review, spelling to get the spelling dialog. There should then be a sub dialog with "Should the spellcheck be continued ..." with "No" and "Yes" options, hammer the "no" button a few times in rapid succession. 2715237==ERROR: AddressSanitizer: heap-use-after-free on address 0x6140007a8118 at pc 0x7fdf28e73ce1 bp 0x7ffd012c88d0 sp 0x7ffd012c88c8 READ of size 8 at 0x6140007a8118 thread T0 (kitbroker_003) #0 0x7fdf28e73ce0 (instdir/program/libvcllo.so+0x2473ce0) JSMessageDialog::~JSMessageDialog has: JSMessageDialog::~JSMessageDialog() { if (m_pOK || m_pCancel) JSInstanceBuilder::RemoveWindowWidget(m_sWindowId); } but has int JSMessageDialog::run() { if (GetLOKNotifier()) { RememberMessageDialog(); sendFullUpdate(); } ... } where RememberMessageDialog has JSInstanceBuilder::InsertWindowToMap(sWindowId); this dialog doesn't have ok or cancel, so while it is inserted in that map when the dialog is run, it doesn't get removed from the map when the dtor is called, which goes on to cause use-after-free. Given that we only set m_pCancel and/or m_pOK if there is no "builder" it looks a more straight forward approach to simply call JSInstanceBuilder::RemoveWindowWidget based on if there was no builder. Change-Id: Icf04f0e9f3c3c864955e9d4ee41589f4d2aa4cb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163691 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2024-02-20docx import: correct redline content-controlsAshod Nakashian
When inserting and deleting content-controls with change-tracking enabled, we hit a few corner-cases that we need to handle more smartly. First, we shouldn't redline the controls themselves, just the placeholder text. Second, we have to take special care to create valid XML structure with the redline tags. Includes unit-test that reproduces the issues and verifies that both saving and loading work as expected. Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk> Change-Id: I6af4d0d2c3f0661e7990d5414cc93effc96f0469 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163555 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Ashod Nakashian <ash@collabora.com>
2024-02-20OpenSSL: upgrade to 3.0.13Mike Kaganski
Special on this branch: openssl-fix-CC.patch.0 I do not know why, but without this the build fails, because CC="C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x64\cl.exe " instead of CC="C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x64\cl.exe" note the trailing space. And then util/mkbuildinf.pl gets wrong parameters, buildinf.h is generated wrongly, and later build fails. Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163475 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 4897792975453024db8369c3d8c5f2e65c956d73) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163497 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163521 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2024-02-20tdf#156829 PPTX import: fix connector regression at missing glue pointsTibor Nagy
Glue points weren't imported if the custom shape type is "non-primitive", resulting broken line connectors, moreover broken graphic design, as attached to the original bug report. ~Regression from commit cbf66ec3e60d07efb7c3cceed9b4f0fb4f0510c8 "tdf#89449 PPTX import: fix line connectors". Change-Id: I9908a23f8e6997bc1384aaeb3e8ba43c08d20d42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156171 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit a126f499bd4bef203f26b251d85ee30ce5dc4f91) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156222 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit d13505b8ef7459d97e9f90ee099ca54354d99922) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163609 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2024-02-19sw: fix crash in SwSpellDialogChildWindow::LockFocusNotification()Miklos Vajna
Crashreport signature: Fatal signal received: SIGSEGV code: 128 for address: 0x0 program/libswlo.so SwSpellDialogChildWindow::GetNextWrongSentence(bool) sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx:824 program/libcuilo.so svx::SpellDialog::GetNextSentence_Impl(std::unique_ptr<UndoChangeGroupGuard, std::default_delete<UndoChangeGroupGuard> >*, bool, bool) /opt/rh/devtoolset-10/root/usr/include/c++/10/bits/stl_vector.h:919 program/libcuilo.so svx::SpellDialog::SpellContinue_Impl(std::unique_ptr<UndoChangeGroupGuard, std::default_delete<UndoChangeGroupGuard> >*, bool, bool) cui/source/dialogs/SpellDialog.cxx:370 /opt/collaboraoffice/program/libcuilo.so svx::SpellDialog::InitHdl(void*) /opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:173 Change-Id: I0ecae218beb30e5136f7a6f468e3eb9f6e6e5009 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163600 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2024-02-19openssl: upgrade to release 3.0.11Taichi Haradaguchi
Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163522 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2024-02-19libvisio: read and use simple solid fill stylesJaume Pujantell
Implemented the reading of simple solid fills from the fill styles list in a vsdx theme. And it's use with the quick style fill matrix value. This patch includes an alternative fix to tdf#77915 so the previous patch is no longer needed. Change-Id: Iccfe915c90bcb1280cfcbfa4920d2989d18518ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163581 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2024-02-19cool#8270 sw lok: fix bad statusbar pagenum string on async binding updateMiklos Vajna
This is similar to commit 51d8a2ef54751403fa707816e27ddb4e7faa8231 (cool#7492 sfx2 lok: fix bad view id / statusbar string on async binding update, 2024-01-08), but here the problem was that the async job tried to get the current view from the model, which is not correct. Fix the buggy page number string in the status bar by requesting callers of SwViewShell::GetFirstLastVisPageNumbers() to provide the view, given that SwViewShell itself doesn't have access to SwView, only the SwWrtShell subclass would have that. (cherry picked from commit ce350b840ce806c4060f9fdbd67fa4c95c82edf5) Change-Id: I7e10c05d2429ea2771d6c3e46ac9ce77c0eb2bbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163512 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-18tdf#101313 Copy-paste table from writer to calcNoel Grandin
With Merged Cells from Writer to Calc, Cells Placed in Wrong Position (Wrong cell offsets). regression from commit ed24564ce11683731b820c29d5a46e073ab7a2a7 Author: Noel Grandin <noel@peralex.com> Date: Thu Jul 19 15:22:31 2012 +0200 SV_DECL_VARARR_SORT(ScRTFColTwips) o3tl::sorted_vector Change-Id: I8c90c19f6a27a368fd5807b3eaab84ce820e26e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163518 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 4df426e429e1aed92f074d8acd3ba3a5ec335ba9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163533 (cherry picked from commit 034f6c29c309561e75719142c305245ac19f7ba9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163537 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2024-02-16Expat: upgrade to release 2.6.0Taichi Haradaguchi
Fixes CVE-2023-52425 and CVE-2023-52426. Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163395 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2024-02-16nss: upgrade to release 3.98Michael Stahl
Fixes CVE-2023-5388 Also update README, and remove obsolete documentation of Debian's mangled SONAME; relevant Debian changelog: nss (2:3.13.4-2) unstable; urgency=low * debian/control, debian/libnss3*, debian/rules, mozilla/security/coreconf/*, mozilla/security/nss/lib/*/manifest.mn: Move to unversioned library. ABI compatibility is ensured upstream, and the SO version, if it needed a change at any time, would be a change in the library name. There is no reason to keep making compatibility more difficult with other distros and upstream binary releases. While previous versions were one-way compatible (binaries built against other distros or upstream nspr could work on Debian), this approach works both ways. -- Mike Hommey <glandium@debian.org> Thu, 17 May 2012 09:45:36 +0200 Change-Id: Ifc1eae68827fa88ae001a3903c8555af67b488ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163482 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c5e7af92ebcde59cb72fda2a88d08dc6656dc2e2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163507 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2024-02-16for caching if a font has glyphs, strikethrough and underline don't matterCaolán McNamara
Those aren't part of the font. Likewise it's safe to assume these days that if the glyph appears at one size it will exist at any size. The same isn't through for Bold/Italic. A font like Freesans has, or had at least, glyphs in one variant not in another. So don't treat those properties the same. Change-Id: Iccc291642dfe7e9d2cb06a241a575fd1e4a4bb9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163516 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2024-02-16kit: editing text in shapes outside the topleft tile has misplaced textCaolán McNamara
keep into account the zoom factor as we do elsewhere Change-Id: I024ba16c2ef47c01f05ffb8630ec0ae3b2d2e5a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163467 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
2024-02-16clarify that "twipFactor" converts from pixels to 100mmCaolán McNamara
Change-Id: I7ce9a797b2a2132f0858dafc98bc3a105b8d0098 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163466 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2024-02-16writer: LOK: make sure redline comment undo/redo is notifiedPranam Lashkari
problem: when actions were performed on comments and changes were tracked, LOK was not notified and actions were not reflected Change-Id: Iad4d9338a6205278b586106e8f39769b731f18dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163357 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
2024-02-16avoid using subView on empty OUStringPranam Lashkari
it causes assertion failure rtl::OUString SwPaM::GetText() const: Assertion `(nEnd-nStart) == (aTmpStr.getLength() - nStart)' failed Change-Id: Ie479f224e8a1516735f96c3a09181d4c46dba10d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163461 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
2024-02-16calc: sheet protection dialog is asyncHubert Figuière
Change-Id: I33930ae212a8b35a4430df3180f4ffcca86ff870 Signed-off-by: Hubert Figuière <hub@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163387 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-02-16nss: upgrade to release 3.97Andras Timar
Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163411 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>