summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-22svl: fix build with --enable-debugXisco Fauli
After author Armin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de> 2023-12-20 19:42:28 +0100 committer Armin Le Grand <Armin.Le.Grand@me.com> 2023-12-21 21:13:55 +0100 commit 789a737ac92c4f2b0eb9820b99c43cc8253c8b29 (patch) tree bc167ec04de29e63168844be973f59980fa36ac2 parent 3430a2c639a9f714259f9d319515464a653d21ab (diff) Remove DeleteItemOnIdlex it fails with /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘SfxItemPool& SfxPoolItemHolder::getPool() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:64:44: error: ‘isDeleted’ was not declared in this scope 64 | SfxItemPool& getPool() const { assert(!isDeleted() && "Destructed instance used (!)"); return *m_pPool; } | ^~~~~~~~~ /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘const SfxPoolItem* SfxPoolItemHolder::getItem() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:65:50: error: ‘isDeleted’ was not declared in this scope 65 | const SfxPoolItem* getItem() const { assert(!isDeleted() && "Destructed instance used (!)"); return m_pItem; } | ^~~~~~~~~ make[1]: *** [/home/xisco/libreoffice/solenv/gbuild/LinkTarget.mk:340: /home/xisco/libreoffice/workdir/CxxObject/svl/source/items/itemiter.o] Error 1 make[1]: *** Se espera a que terminen otras tareas.... In file included from /usr/include/c++/12/cassert:44, from /home/xisco/libreoffice/include/svl/whichranges.hxx:16, from /home/xisco/libreoffice/include/svl/itemset.hxx:30, from /home/xisco/libreoffice/svl/source/items/sitem.cxx:23: /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘SfxItemPool& SfxPoolItemHolder::getPool() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:64:44: error: ‘isDeleted’ was not declared in this scope 64 | SfxItemPool& getPool() const { assert(!isDeleted() && "Destructed instance used (!)"); return *m_pPool; } | ^~~~~~~~~ /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘const SfxPoolItem* SfxPoolItemHolder::getItem() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:65:50: error: ‘isDeleted’ was not declared in this scope 65 | const SfxPoolItem* getItem() const { assert(!isDeleted() && "Destructed instance used (!)"); return m_pItem; } | ^~~~~~~~~ make[1]: *** [/home/xisco/libreoffice/solenv/gbuild/LinkTarget.mk:337: /home/xisco/libreoffice/workdir/CxxObject/svl/source/items/sitem.o] Error 1 In file included from /usr/include/c++/12/cassert:44, from /home/xisco/libreoffice/include/svl/whichranges.hxx:16, from /home/xisco/libreoffice/include/svl/itemset.hxx:30, from /home/xisco/libreoffice/svl/source/items/itemset.cxx:30: /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘SfxItemPool& SfxPoolItemHolder::getPool() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:64:44: error: ‘isDeleted’ was not declared in this scope 64 | SfxItemPool& getPool() const { assert(!isDeleted() && "Destructed instance used (!)"); return *m_pPool; } | ^~~~~~~~~ /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘const SfxPoolItem* SfxPoolItemHolder::getItem() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:65:50: error: ‘isDeleted’ was not declared in this scope 65 | const SfxPoolItem* getItem() const { assert(!isDeleted() && "Destructed instance used (!)"); return m_pItem; } | ^~~~~~~~~ In file included from /usr/include/c++/12/cassert:44, from /home/xisco/libreoffice/include/o3tl/sorted_vector.hxx:15, from /home/xisco/libreoffice/include/svl/itempool.hxx:30, from /home/xisco/libreoffice/svl/source/items/itemset.cxx:31: /home/xisco/libreoffice/svl/source/items/itemset.cxx: In member function ‘const SfxPoolItemHolder& SfxPoolItemHolder::operator=(const SfxPoolItemHolder&)’: /home/xisco/libreoffice/svl/source/items/itemset.cxx:120:13: error: ‘isDeleted’ was not declared in this scope 120 | assert(!isDeleted() && "Destructed instance used (!)"); | ^~~~~~~~~ /home/xisco/libreoffice/svl/source/items/itemset.cxx:121:21: error: ‘const class SfxPoolItemHolder’ has no member named ‘isDeleted’ 121 | assert(!rHolder.isDeleted() && "Destructed instance used (!)"); | ^~~~~~~~~ /home/xisco/libreoffice/svl/source/items/itemset.cxx: In member function ‘bool SfxPoolItemHolder::operator==(const SfxPoolItemHolder&) const’: /home/xisco/libreoffice/svl/source/items/itemset.cxx:139:13: error: ‘isDeleted’ was not declared in this scope 139 | assert(!isDeleted() && "Destructed instance used (!)"); | ^~~~~~~~~ /home/xisco/libreoffice/svl/source/items/itemset.cxx:140:21: error: ‘const class SfxPoolItemHolder’ has no member named ‘isDeleted’ 140 | assert(!rHolder.isDeleted() && "Destructed instance used (!)"); | ^~~~~~~~~ make[1]: *** [/home/xisco/libreoffice/solenv/gbuild/LinkTarget.mk:337: /home/xisco/libreoffice/workdir/CxxObject/svl/source/items/itemset.o] Error 1 In file included from /usr/include/c++/12/cassert:44, from /home/xisco/libreoffice/include/svl/itemset.hxx:23, from /home/xisco/libreoffice/include/svl/setitem.hxx:25, from /home/xisco/libreoffice/svl/source/items/itempool.cxx:21: /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘SfxItemPool& SfxPoolItemHolder::getPool() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:64:44: error: ‘isDeleted’ was not declared in this scope 64 | SfxItemPool& getPool() const { assert(!isDeleted() && "Destructed instance used (!)"); return *m_pPool; } | ^~~~~~~~~ /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘const SfxPoolItem* SfxPoolItemHolder::getItem() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:65:50: error: ‘isDeleted’ was not declared in this scope 65 | const SfxPoolItem* getItem() const { assert(!isDeleted() && "Destructed instance used (!)"); return m_pItem; } | ^~~~~~~~~ make[1]: *** [/home/xisco/libreoffice/solenv/gbuild/LinkTarget.mk:337: /home/xisco/libreoffice/workdir/CxxObject/svl/source/items/itempool.o] Error 1 In file included from /usr/include/c++/12/cassert:44, from /home/xisco/libreoffice/include/svl/whichranges.hxx:16, from /home/xisco/libreoffice/include/svl/itemset.hxx:30, from /home/xisco/libreoffice/include/svl/itemprop.hxx:26, from /home/xisco/libreoffice/svl/source/items/itemprop.cxx:23: /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘SfxItemPool& SfxPoolItemHolder::getPool() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:64:44: error: ‘isDeleted’ was not declared in this scope 64 | SfxItemPool& getPool() const { assert(!isDeleted() && "Destructed instance used (!)"); return *m_pPool; } | ^~~~~~~~~ /home/xisco/libreoffice/include/svl/itemset.hxx: In member function ‘const SfxPoolItem* SfxPoolItemHolder::getItem() const’: /home/xisco/libreoffice/include/svl/itemset.hxx:65:50: error: ‘isDeleted’ was not declared in this scope 65 | const SfxPoolItem* getItem() const { assert(!isDeleted() && "Destructed instance used (!)"); return m_pItem; } | ^~~~~~~~~ make[1]: *** [/home/xisco/libreoffice/solenv/gbuild/LinkTarget.mk:337: /home/xisco/libreoffice/workdir/CxxObject/svl/source/items/itemprop.o] Error 1 make: *** [Makefile:290: build] Error 2 Change-Id: I0f61738d4afbdfc06b372d6c5e5fff6f9f9f4e65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161142 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit e9e3576ada06d53de12efed041fb309fe5388e01) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161214
2023-12-22sw: fix another null deref in a11y checkXisco Fauli
similar to author Caolán McNamara <caolan.mcnamara@collabora.com> 2023-12-21 16:47:18 +0000 committer Caolán McNamara <caolan.mcnamara@collabora.com> 2023-12-21 21:15:03 +0100 commit ba712e9a35179c480cdc6f9d600d79040a273d53 (patch) tree 88e237265eb6ce884d2807b4c178a761d4c73956 parent 8cd01e5278b2be25a1186139e431591a85a5080f (diff) crashreporting: apparent null deref in a11y check Change-Id: I3fb6a916fcbcce4b599a925dcc7d39a12e60a972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161149 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit ca4aa82e2a0a97a63f51820247aa4e59e645992a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161166
2023-12-22Remove DeleteItemOnIdlexArmin Le Grand (allotropia)
There are some CrashReports in 7.6 which have DeleteItemOnIdle on the stack, but there is nothing reproducable. So I took a look... I first thought it's a MCGR regression, due to classes on the stack. But the Item involved is just random, can happen with any Item. Then I thought it may have to do with ITEM refactorings, but it happens with DeleteItemOnIdle involved, so also not the case. I already saw DeleteItemOnIdle when doing these and qualified as 'hack' in the way. already It is only on Windows and DeleteItemOnIdle is involved. This again (took a deeper look now) is an old hack to keep an SfxPoolItem 'alive' for some 'time'. For that, it triggers an async reschedule which then deletes the Item when being called. If the Item will be used after that is pure coincidence - seems to work in most cases. It seems as if for Windows the timing slightly changed for some scenarios, so a reschedule is too early. This can happen with this hack anytime. DeleteItemOnIdle is used in scenarios where SfxPoolItem* is e.g. returned, but is *not* anchored, so e.g. not member of an SfxItemSet. Or in short: Lifetime is not safe. DeleteItemOnIdle exists since 1st import, but was changed to AsyncEvent ca. 4 months ago (see 57145acf9ec47c23e307b7a5c0029d21d937cc35), so that may have caused it. It is possible that these errors happen on Windows since then. Before something more complicated was used to delete it late, but surely also not really safe. Due to ITEM refactor I have the knowledge/tooling to solve this. It will not be a 1-5 lines fix, but it is a hack and in the way for further ITEM refactor anyways. What we have nowadays is a SfxPoolItemHolder -> it's like an SfxItemSet for a single Item. It safely holds/ controls the lifetime of an SfxPoolItem. It is already used in quite some places. It helps to solve many hacks, also the ones putting Items directly to the Pool - due to there never was an alternative for that. In principle the ItemPool/ItemSet/Item paradigm was never complete without SfxPoolItemHolder. Thus I started to fix that (and remove that hack for good, sooo many changes over the years, sigh), but as said is not straightforward. Will have to change retvals of involved stuff to SfxPoolItemHolder - it's just two pointers and designed to be copied (one is a Pool, needed to cleanup when destructing). CopyConstruct/destroy just counts the RefCnt up/down, so cheap. 1st version compiling, let's check on gerrit... Corrected one error in QueryState for securitypage, also added some security features/asserts. Change-Id: Ida49fd35ca88ead84b11d93e18b978cb9e395090 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161083 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 789a737ac92c4f2b0eb9820b99c43cc8253c8b29) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161158 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-22tdf#156820 Fix crash in custom color pickerNoel Grandin
which requires (*) keeping ColorPicker alive during the runAsync in ColorPicker::startExecuteModal (*) keeping the PaletteManager alive during the ExecuteAsync in PaletteManager::PopupCOlorPicker Noting that MattK debugged the cause of this. Change-Id: I07efe8e6514f8882b1347c79c6150578c234bb9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161054 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 78ccae0d42d168f845ddbd7cb694d80dfb04f84d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161161 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-22Revert "tdf#100584 - Arrange sheets in the tab bar depending on the RTL ↵Andreas Heinisch
settings" This reverts commit be86c8f2432623fdb8ed4f22ca08c35121fd8bec. Reason for revert: To many regressions. Change-Id: Id3fb8dc5d4edb84c0008b7834a80887aaa7d9f83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161154 Tested-by: Andreas Heinisch <andreas.heinisch@yahoo.de> Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de> (cherry picked from commit 3430a2c639a9f714259f9d319515464a653d21ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161159 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-22tdf#154044: Also store default column data, when copying to Undo documentMike Kaganski
And restore from it un Undo. Change-Id: I3e14b345cff25068d0555c5bceb4d6e97ce7cf76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161127 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 36b7ae36715cbf47b451e41e47aebe28cf594bd8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161160 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21Revert "tdf#100584, tdf#157784 - Arrange sheets depending on the RTL settings"Andreas Heinisch
This reverts commit 4f1b3c16f5530a2a190cab07c07c7bf63acf42c7. Reason for revert: To many regressions. Change-Id: I7352bb3c192d5e6c72e95c387ee551764007e97b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161152 Tested-by: Andreas Heinisch <andreas.heinisch@yahoo.de> Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de> (cherry picked from commit 19e856aa1ade6686fa495e57386b81cabae47495) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161157 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2023-12-21cid#1559856 Dereference after null checkCaolán McNamara
we check for a null pOldSh earlier, so logically we need to check here too, or drop the other null check Change-Id: I8a9110a9d1ee753f523101862fa62e20760bdb1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161156 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2023-12-21crashreporting: apparent null deref in a11y checkCaolán McNamara
svl/source/items/itemset.cxx:801 svl/source/items/itemset.cxx:796 sw/source/core/access/AccessibilityCheck.cxx:1193 sw/source/core/access/AccessibilityCheck.cxx:1184 sw/source/core/access/AccessibilityCheck.cxx:1562 sw/source/core/access/AccessibilityCheck.cxx:1552 sw/source/core/txtnode/OnlineAccessibilityCheck.cxx:134 cppu/source/uno/copy.hxx:288 cppu/source/uno/any.cxx:72 cppu/source/typelib/typelib.cxx:1328 cppu/source/typelib/typelib.cxx:2169 Change-Id: I91a83ffb9f1912dd9736e3d6a194f63475f63b99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161109 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2023-12-21bump product version to 24.2.0.1.0+Xisco Fauli
Change-Id: Ia556c2be1b2c3896a72cf89cd9ad9087b1df4010
2023-12-21update creditsXisco Fauli
Change-Id: I147a1e96e4c2fc855f66168c7633d254fd9d6c19 (cherry picked from commit 4fcba272103d51a8025d56ac6cf71cc85f736431)
2023-12-21crash when one user deletes a chart another has a property dialog open forCaolán McNamara
Insert a chart, user #1 select it, user #2 select it. User #1 double click it, double click again the legend to get dialog to edit it. User #2 delete chart, User #1 'ok' #0 0x00007f5365797d59 in osl::Mutex::acquire (this=<optimized out>) at include/osl/mutex.hxx:63 #1 osl::ClearableGuard<osl::Mutex>::ClearableGuard (t=..., this=0x7ffc7ffcccf0) at include/osl/mutex.hxx:182 #2 apphelper::LifeTimeGuard::LifeTimeGuard (rManager=..., this=0x7ffc7ffcccf0) at chart2/source/inc/LifeTime.hxx:175 #3 chart::ChartModel::lockControllers (this=0x0) at chart2/source/model/main/ChartModel.cxx:415 #4 0x00007f53658375ab in chart::ControllerLockGuardUNO::ControllerLockGuardUNO (this=this@entry=0x7ffc7ffcce80, xModel=...) at chart2/source/tools/ControllerLockGuard.cxx:34 #5 0x00007f5364df5f34 in chart::ChartController::executeDlg_ObjectProperties_withoutUndoGuard (this=<optimized out>, rObjectCID=..., bSuccessOnUnchanged=<optimized out>) at chart2/source/controller/main/ChartController_Properties.cxx:797 #6 0x00007f5364df7a5e in chart::ChartController::executeDlg_ObjectProperties (this=0x7f535401f310, rSelectedObjectCID=...) at chart2/source/controller/main/ChartController_Properties.cxx:707 #7 0x00007f5364e0f497 in chart::ChartController::execute_MouseButtonUp (this=<optimized out>, rMEvt=...) at chart2/source/controller/main/ChartController_Window.cxx:924 #8 0x00007f53760d61dc in (anonymous namespace)::LOKPostAsyncEvent (pEv=0x55e2f1b93db0) at sfx2/source/view/lokhelper.cxx:893 #9 0x00007f53760d0977 in LokChartHelper::postMouseEvent (this=<optimized out>, nType=1, nX=<optimized out>, nY=<optimized out>, nCount=2, nButtons=1, nModifier=0, fScaleX=0.083333333333333329, fScaleY=0.083333333333333329) at sfx2/source/view/lokcharthelper.cxx:294 just hold a reference to the chart the dialog operates on Change-Id: I3b05d1fc12e4df899c1a996f1029f9d3d62e87ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161099 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 8ed865ffc151c6778f122b4e83b46a28f26ebe5e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161106 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21Windows MSI custom action for --enable-online-update-marStephan Bergmann
...which needs to call update_service.exe with "install" (resp. "uninstall") and needs to create (resp. delete) a registry entry containing the issuer and name of the certificate with which the updater.exe is signed (which is required by one of the many sanity and security checks performed by update_service.exe before it will actually do an automatic update). (The issuer and name of the certificate are for now hardcoded to the values used by TDF when signing its Windows builds.) (gid_Customaction_uninstall_updateservice needs to run rather early, when update_service.exe has not yet been removed, so I rather randomly picked "MigrateFeatureStates" as the point where to run it.) Change-Id: I6e0f62ec3e51d74d4a526a490badc7c14ebe99ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161102 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2023-12-21Update git submodulesAleś Bułojčyk
* Update dictionaries from branch 'libreoffice-24-2' to 8bc24d791923a19664dcce3f082f5af3b9c8b849 - Belarusian hunspell dictionary update Change-Id: I3d2a0f62fe59f46f201a4c7d596a22fd04efe017 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/159516 Tested-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 15c78fe07964b0457639ff02cd8c15d0d2d844b6) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/161108
2023-12-21external/lcms2: fix lcms2-2.4-windows.patchTaichi Haradaguchi
fix typos and macros in code. Change-Id: I0886f3d95d87be70be1e7e6a220617f728fe6653 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161056 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 324a12413f28ca506487f677d68b840529130aef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161091 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21Related tdf#158739: blacklist Nvidia RTX 4050 for Skia hardware renderingJulien Nabet
Change-Id: I0a6795fafed04e3061cb660736234d6f04eb8872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161032 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit bc00fb6de3ffd3949a3cdb524f49dac7e32258a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161021 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21Related: tdf#155266 stop delaying painting timer while swipingPatrick Luby
After fixing several flushing issues in tdf#155266, scrollbars still will not redraw until swiping has ended or paused when using Skia/Raster or Skia disabled. So, stop the delay by only including NSEventMaskScrollWheel if the current event type is not NSEventTypeScrollWheel. Change-Id: I9348e5a38b4d0fedbf424b92a71eed25280fc21f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161075 Tested-by: Jenkins Reviewed-by: Patrick Luby <plubius@libreoffice.org> (cherry picked from commit 9f92a39234dfae40fe19ab6fa47caf8b21dd8847) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161093 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21tdf#158762 RTF writerfilter: fix list importOliver Specht
While importing the properties NumberingRules and NumberingStyleName interfere with each other. Avoid overwriting NumberingRules with an invalid NumberingStyleName. Regression from 588ff9a228f4894142264c68392ed1e9800a4d7d Change-Id: I706ea514da43faae0fdb9a2c0d4f5b1928ef55f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160967 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit fad76223d1cff3746a5d2e4ce56b93ecd1c80f61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161092
2023-12-21tdf#158044 writerfilter: handle toggle properties in import/exportOliver Specht
DOCX has some odd properties (bold, italic, shadowed, hidden ...), which switch on/off if they are applied multiple times, e.g. with paragraph and character styles. To fix that, a hard attribute has to switch off the attribute in that occasion on import and on export a hard attribute switches it on in Word. Includes partial fix for tdf#154370. Change-Id: Ie4c317cf9b7d02efd89b9d6a9996143585d7e937 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160343 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 9e127010a86b3521c803ac86c0b5f58dc8e2966b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161018
2023-12-21tdf#158785 partial revert "enable hyperlink to be detectedJustin Luth
... at the end of text" This reverts lpranam's 7.2.0 regressive commit 3233db0913193855285e1f56492d4617368441b6. The character after a hyperlink should not offer to CTRL-click or jump to the hyperlink target. make CppunitTest_sw_uiwriter9 CPPUNIT_TEST_NAME=testTdf158785 Change-Id: I3f5398cc3a4f29ddf1c50764c311046713d39439 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161042 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit 57cdbd3b8195a6dcf5a5d35d99d3801c419d56a6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161097
2023-12-21Update git submodulesStéphane Guillou
* Update helpcontent2 from branch 'libreoffice-24-2' to 3c6d3a4e3dbc6ab35d76d43032114a637d9288d6 - tdf#156156: add Inspector and Functions sidebar decks help button's HID Change-Id: I2c149959d2c0bcdc4aa98777b759012fe490637b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161010 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 8d2a9b80fbb89596185c5b6863713eb696af7140) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161100
2023-12-21xmlsecurity: fix AES-GCM code to build with NSS < 3.52Michael Stahl
(regression from commit f0fda7ad2236f478fea396a23d4f982e5fc37e68) Change-Id: I42fda00eb37fb1939013b21158c931d47e4e8486 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161117 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 9276d5338ef04209b007bbc705e4c023cf181456) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161096
2023-12-21Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-24-2' to 21fad4fcec07cef0c0385cd8b0531233b716f237 - update translations for master/24.2.0 RC1 and force-fix errors using pocheck Change-Id: I3a90b2320a21d218eeef7bdb8168b4e634304f78 (cherry picked from commit 4eb96d17e8d53f48a7709ae657534cc451c7e4c8)
2023-12-21tdf#158794: do not try to insert DDE table into footnotes / endnotesMike Kaganski
Until tdf#76007 is fixed, of course. Change-Id: Iad7fb0de679e024a8cebdd005ac5a66af3ace163 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161078 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 3a33a97d2358a7ad2e67c01edc1fca29d1b7041c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161090 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21tdf#158556: provide objects anchored to node as a hidden propertyMike Kaganski
This introduces a hidden property of SwXParagraph, named OOXMLImport_AnchoredShapes. Testing on my system, starting the main process first, then launching another one like time soffice path/to/bugdoc.docx ... so that it only measures time spent in import, gave the following figures: LibreOffice 7.5.0.3 (TDF build): real 1m49.016s user 0m0.000s sys 0m0.000s LibreOffice 7.6.0.3 (TDF build): real 8m37.386s user 0m0.000s sys 0m0.000s Current master (my no-debug build): real 10m6.776s user 0m0.000s sys 0m0.000s Current master with this patch (my no-debug build): real 5m41.524s user 0m0.000s sys 0m0.015s Indeed, it is not as fast as it used to be; and the fix doesn't really remove the quadratic complexity, just uses faster iteration. If there is a way to directly list objects anchored to a given paragraph, rather than iterating over all objects checking their anchors, that would get much faster, but that would be a rather large change. Change-Id: Ie50515815e85fdce498d065185199c9b31d95794 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160813 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit dcae6615ed254cf7884fa6415f64561f85b93588) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160807 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21tdf#68364 - Don't assume a database if only two dots are presentAndreas Heinisch
Additionally, a database table name (database.table.column) has to be retrieved from the database to be valid. Change-Id: I8949ae61d96043412425d634763d2ea33ce6a0f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160910 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de> (cherry picked from commit 74f25206bc5a1a36b85683555cb27179e5da3275) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161094 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-21tdf#158375: adapt UI when DDE is disabled via DisableActiveContentSarper Akdemir
When DisableActiveContent is set, provide now non-functional areas meaningful error messages / popup dialogs. Change-Id: I34bffee10fb0ba5c0194193f3d3d81b93d7dbd26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160923 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins (cherry picked from commit b693fba185df86fba6389ed564a12c0afeb33778) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161095 Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-12-21tdf#158375: disable DDE when DisableActiveContent is setSarper Akdemir
Change-Id: I167f6ea5d740b5a53cd02a9b865e65ff980a8877 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160922 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins (cherry picked from commit 21f8e08c60cde2599f45b9e02c2b7d0cead2f625) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161029 Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-12-21package: ODF encryption: fix 2 GPG problemsMichael Stahl
1. ManifestImport should attach KeyInfo to the first file-entry, not to a "/" entry which may not exist or may be preceded by another file-entry which requires the KeyInfo to decrypt (regression from commit 91f35f22f0447769c08ca89e27a39b40df18fffa) 2. manifest:key-size on manifest:key-derivation is unfortunately specified to have a default value of 16, but with AES256 the actual size is 32, and for GPG the ManifestExport forgot to export it Change-Id: I05dd2c9e219ba7f20ba33bf0b35d47a9e3df74cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161072 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2c0f520c03941f6ec09c8a52bd2b2bd38ba2b9a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161025
2023-12-21tdf#158375: adapt UI when embedded content is disabled via optionSarper Akdemir
When DisableActiveContent is set, embedded active content is disabled (e.g. OLE). Therefore the existing ui insertion bits don't function either. Disable them with a warning pop-up hinting "Active content is disabled." Change-Id: I14984684f22df6aff81af79d5a15589b5cae75fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161055 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 7bb50fd2398220c3b162e7242c1cc8d6c4c31463) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161028 Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-12-21tdf#158375: further disable embedded objectsSarper Akdemir
there was the possibility of constructing an OOoEmbeddedObjectFactory or OleEmbeddedObjectFactory directly instead of UNOEmbeddedObjectCreator. So disable all createInstance calls for them too. Securing there won't be active embedded objects. Change-Id: Ib47ad920d4951790c12d1a8587505cab2f1e126d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160921 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 488fa4a226b5250379538123e485c8c08dd2092a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161027 Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-12-20Update --enable-online-update-mar server URLStephan Bergmann
...after consultation with hostmaster@documentfoundation.org about an appropriate URL Change-Id: Ie8214081b68fb14f1a7824ea7cc2301abe8c1642 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161070 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 0d036d22a54234c2b9283ad2e9f37cca7513d50f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161026
2023-12-20Update git submodulesMartin Srebotnjak
* Update translations from branch 'libreoffice-24-2' to 7186dfba8effe91ac5b532c343422a87f78ebe59 - Updated Slovenian translation Change-Id: I4abd1636021dabc93c91f1c51d3f8b0aadbb320b
2023-12-20tdf#105844 offapi,package,sfx2: use Argon2 for wholesome ODF encryptionMichael Stahl
https://www.rfc-editor.org/rfc/rfc9106.html * add css::xml::crypto::KDFID constant group * add "KeyDerivationFunction" to setEncryptionAlgorithms sequence * Argon2 is used by default for wholesome ODF encryption, but $LO_ARGON2_DISABLE can be set to use PBKDF2 * extend various structs in package * use 3 new ODF attributes "loext:argon2-iterations" "loext:argon2-memory" "loext:argon2-lanes" to store the arguments * use this URL for now: "urn:org:documentfoundation:names:experimental:office:manifest:argon2id" * use default arguments according to second recommendation from "7.4. Recommendations" of RFC9106; 64 MiB RAM should hopefully not be too much even for 32 bit builds Change-Id: I683118cc5e0706bd6544db6fb909096768ac9920 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161009 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2f512aaa6c39390a5a0eb1d1e37f070127d068a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161024
2023-12-20Resolves: tdf#158332 'fake' keystroke exits presentationCaolán McNamara
the fake keystroke is to make tooltips go away before menus which used to be a problem versions of gtk3 < 3.24 that resultsed in no menus appearing. Our min is still 3.18 so technically we need to retain that until bumping past that as baseline. Change-Id: I94aa309665c50c8ca310285d1e691030f443934a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161081 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2023-12-20Revert "updater: check every 12 hours for updates for now"Stephan Bergmann
This reverts commit bb5622adc5db348efcc9a6f41d19de9f00a367dd, going back to a less aggressive 7 day period for now. Change-Id: I439a49f3ca6761ef17ca2b92d395b0de5c400197 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161050 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 9f909a9692d3a9a4371b4abb106defd83d28a6f3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161020
2023-12-20Set --with-online-update-mar-channel for distro-configs/LibreOfficeWin64.confStephan Bergmann
(Somewhat randomly setting it to the same name that is used, via -DMAR_CHANNEL_ID=\"LOOnlineUpdater\" in external/onlineupdate/Executable_mar.mk, as the default channel name in the mar executable tool that we build.) Change-Id: Ia77e3e841139947dad894efa81f011cafd6c7539 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161049 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 535a03cb946d48c91863943665b01123ac23ba0a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161019
2023-12-20tdf#142695 Update tooltips for tools in Draw/ImpressMatt K
This change simply updates the tooltips for tool icons in Draw/Impress to inform the user that they can double-click the icon to continue using that specific action. Change-Id: I516cf9f110bd3c7dcb1545989b86155cc84617f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160555 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 5b06b879916cd1682afd40201d6704711f909ff9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160645 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-12-20tdf#123864 gtk3 a11y: Consider states when mapping BUTTON_DROPDOWNMichael Weghorn
Take the checkable state into account when mapping the `AccessibleRole::BUTTON_DROPDOWN` role. There is no direct ATK equivalent for `AccessibleRole::BUTTON_DROPDOWN`. Don't always use ATK_ROLE_PUSH_BUTTON, but use ATK_ROLE_TOGGLE_BUTTON when the button is CHECKABLE, i.e. it can be toggled. With this in place, Orca now announces the state of the underline button (on/off) when using the gtk3 VCL plugin. Related Orca source code that requires the toggle button role: [1] The state is not announced when using the qt6 VCL plugin yet, and Qt currently doesn't have a toggle button role, so that would have to be added there first to do something similar there. For gtk4, mapping could probably be done similarly, but more is missing for Orca to announce things in custom widgets (e.g. event handling), so leave that for later. [1] https://gitlab.gnome.org/GNOME/orca/-/blob/b80bb951a651f5f12a5ddfb2a5b1c151568d045b/src/orca/scripts/apps/soffice/speech_generator.py#L177 Change-Id: If69e08d2e4939cc709d44e89cc2fd1d01691a70b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160904 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161039
2023-12-20tdf#123864 a11y: Evaluate checkable/toggle flag for more toolbar itemsMichael Weghorn
commit 4342408a8359e590f57b016baaf7d8dcfdebdbd4 Author: Carsten Driesner <cd@openoffice.org> Date: Thu May 6 18:15:21 2010 +0200 fwk142: #i104293 Use Commands.xcu files to mark commands which support a toggle state introduced a `UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON` state to mark commands that can be toggled, see `framework/inc/properties.h`. Despite that one being set for the `.uno:Underline` command in `officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu`, the underline button in Writer's formatting toolbar would not expose the CHECKABLE a11y state even after commit 78241a40628e5721aa50cb0fa13a63333343f766 Author: Michael Weghorn <m.weghorn@posteo.de> Date: Mon Dec 18 08:48:12 2023 +0100 tdf#123864 a11y: Handle new CHECKABLE state in misc places because the state set in the .xcu file was only applied in `ToolBarManager::CreateControllers` in the code path where no controller is set. There seems to be no particular reason for that, so move this out of that block so this gets run for other items, too. With this in place, the underline button in Writer's formatting toolbar now has the checkable AT-SPI state when using the gtk3 VCL plugin. (Orca still doesn't announce the button as checked when it is, despite the checked state also being set then, but that's another aspect that will be addressed in a separate commit.) Change-Id: Ib9200077a95feea3ce7c0380b9b8f31c96632223 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160903 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161038
2023-12-20tdf#123864 a11y: Handle new checkable state for VCLXAccessibleMenuItemMichael Weghorn
Add reporting for the new CHECKABLE a11y state introduced in commit d6c6472bbe1c90b733a4d69c4c8528f4de3750d3 Author: Michael Weghorn <m.weghorn@posteo.de> Date: Mon Nov 13 15:53:44 2023 +0100 tdf#123864 a11y: Add new AccessibleStateType::CHECKABLE for `VCLXAccessibleMenuItem`. `MenuItemData::HasCheck` looks like it already provides what's needed to say whether an item is checkable, therefore add a `Menu::IsItemCheckable` that makes use of this and and a `VCLXAccessibleMenuItem::IsCheckable` that makes use of that in turn. Extend `VCLXAccessibleMenuItem::FillAccessibleStateSet` to use the latter to report the CHECKABLE state accordingly. Change-Id: Id23196ef2527a71a338102a5143a8bd6fd41db84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160902 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161037
2023-12-20argon2: oops, forgot to build static lib with -fPICMichael Stahl
... and Julien Nabet reports that Debian's default shell dash doesn't have "time", oddly enough. Change-Id: I82734bdf9e943522471c4c9189fac463bca2a3aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161008 Reviewed-by: René Engelhard <rene@debian.org> Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit fc5c81ced846adae2dbaccf78105d47b01d92269) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161016
2023-12-20related tdf#111969 fix smart tags job not being fired, due to typoJustin Luth
This fixes quikee's 7.5 regression commit 01396925b76011ffccb6eea40956a22d58de6f17 If this is a help document, we don't want to run smart tags, not the other way around. It was correct originally - assuming this was just a typo when the tests were pulled out into a function. Change-Id: Ie21ed256539ce242a7892c1ddc1556319fc45310 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161006 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit 2c92838583d59c543be136516db3de24b1613c93) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161015 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-12-20tdf#131575: in repair mode, match names ASCII case-insensitivelyMike Kaganski
It would work for the bugdoc in tdf#131575; but not if the wrong case is the only problem in the package, because then there would be no repairment mode active. An alternative could be to use case insensitive match always, but that looks wrong. Change-Id: Ie405d37e1dc639482bd2608e4479de5b707a07d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160761 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160783
2023-12-20Related: tdf#76115 Also pass RepairPackage to FilterDetectMike Kaganski
And drop the default argument value from ZipStorage ctor. Always pass it explicitly. Change-Id: I8bcf78dc4db7763567f9d6873841d75c328ede7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160760 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160782 Tested-by: Jenkins
2023-12-20tdf#76115: pass RepairPackage property from media descriptor to ZipStorageMike Kaganski
See commit 86c682273d907c77404637c89e584047de1c1099. Change-Id: I51a3beb00f635554ac73cc9ea957e18fb8e84349 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160757 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160781
2023-12-20tdf#123864 a11y: Handle new CHECKABLE state in misc placesMichael Weghorn
Add reporting/handling of the CHECKABLE a11y state added in commit d6c6472bbe1c90b733a4d69c4c8528f4de3750d3 Author: Michael Weghorn <m.weghorn@posteo.de> Date: Mon Nov 13 15:53:44 2023 +0100 tdf#123864 a11y: Add new AccessibleStateType::CHECKABLE in various places where it seems pretty straightforward. `VCLXAccessibleMenuItem` is a bit more complex and will be handled separately. Change-Id: I212b8439609d34410413959973163aa7d809cbf1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160901 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161036
2023-12-20Improve --enable-online-update-mar Windows MOZ_MAINTENANCE_SERVICE featureStephan Bergmann
To get the MOZ_MAINTENANCE_SERVICE mode going at all, update.status needs to contain a "pending-service" token. For Mozilla, code in its toolkit/mozapps/update/UpdateService.sys.mjs takes care of writing that. For us, lets always write that in update_checker() (even on Linux, where it's apparently harmless). Then, the MOZ_MAINTENANCE_SERVICE code is rather picky with its various sanity checks: Among other things, it expects argv[0] to be a full path to the updater executable, and it expects the update.mar (and its status and log files) to be in a directory hierarchy named updates/0/ rather than patch/. So get all that fixed in desktop/source/app/updater.cxx. And patch in external/onlineupdate/lo.patch where it expects to find the updater executable (just updater.exe vs. our program/updater.exe). And we shouldn't interfere with the upstream Mozilla maintenance service, so also rename that in external/onlineupdate/lo.patch. And `update_service install` wants to read version resources from the update_service.exe, so provide that (via gb_Executable_add_default_nativeres). Also, `update_service install` wants to read a MozillaMaintenanceDescription value from an updater.ini, so provide one (with contents of that value inspired by Mozilla's browser/locales/en-US/updater/updater.ini). As we now have an updater.ini anyway (and which apparently works fine with Unix line ends on both Linux and Windows), also use it on Linux and drop the onlineupdate/source/update/updater/progressui_gtk.cpp again from external/onlineupdate/lo.patch. And update external/onlineupdate/README.md how to manually execute that test against an updater.ini. Change-Id: I0e3e5e5311be61e1224cda700af2e5d751113a99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160996 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 290f8f908dc8178c8bc34a8bf909246f591a13aa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161014
2023-12-20tdf#154864 Changing starting number of numbered list does nothingNoel Grandin
regression from commit cd3c16fbcb4f8e5e4c4448bc7cda96e8476d6aec Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Fri Oct 14 15:14:13 2022 +0200 tdf#129101 CTRL+A & Cut very slow avoid repeated invalidation of number tree, shaves 90% time off The problem is that, after the above change, InvalidateListTree is not called late enough to force invalidation of all necessary stuff. So simply delay that until we do re-validation in SwNumRule::Validate. Change-Id: I796cc34fe7d66d4876ee06286a8af7029a759eca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160974 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 62afdd6f82c51cee330b278518622eaf1776e2c4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161011
2023-12-19Update git submodulesStéphane Guillou
* Update helpcontent2 from branch 'libreoffice-24-2' to c85f8568c91481d09e5adbed8d961df58843dad5 - tdf#156156: add Accessibility Check sidebar deck help button's HID Change-Id: I6a0196a8f2d34dafd224ee5a4780c2ed1b97fbe9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160944 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 64d940a42d41a4b77deacbfdb344cecf94975cf4) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160949