summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-06CppunitTest_desktop_lib: adjust asserts so this works againcib-6.4-22Miklos Vajna
Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990 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> (cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a)
2023-12-06No FrameWeld yet on ViewFrameThorsten Behrens
This was only added via https://gerrit.libreoffice.org/c/core/+/113795 Change-Id: Ibe7c57c83a5c6fe0fd3b6f8e7682811e3549e0bd
2023-12-06Fix build for gcc13Thorsten Behrens
This was part of the following commit: Author: Stephan Bergmann <sbergman@redhat.com> Date: Mon May 23 10:21:54 2022 +0200 Missing #include <stdint.h> in various external code ...which is a problem presumably since GCC 13 trunk <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1> "libstdc++: Avoid including <cstdint> for std::char_traits". (All the broken C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I deemed it more appropriate to include <stdint.h> rather than <cstdint>.) Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Plus the gist of this one: Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Nov 3 14:10:31 2020 +0000 presumably 'true' is sufficient in all cases Change-Id: I9366193085a4c46ef64f0a9660e51b8678ca35f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105252 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Change-Id: Iae063b6270dfe60cebe27833b1a22f7af1fc312c
2023-12-06i18n: fix build with Boost 1.81.0Đoàn Trần Công Danh
Boost.Locale since 1.81.0 switch to enum classes for facet type [1]. Switch our resource manager accordingly. 1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1 Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343 Reviewed-by: Heiko Becker <heirecka@exherbo.org> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-12-06Bump version to 6.4.0.22Thorsten Behrens
Change-Id: Ife20720d3cd9725a5bf40e4f1433261b790231cf
2023-12-06we can have just one LoadURL for writerCaolán McNamara
Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)
2023-12-06combine these hyperlink dispatchers into one callCaolán McNamara
Conflicts: sw/source/uibase/shells/drwtxtex.cxx sw/source/uibase/wrtsh/wrtsh2.cxx Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb)
2023-12-06reuse AllowedLinkProtocolFromDocument in writerCaolán McNamara
Conflicts: sw/source/uibase/wrtsh/wrtsh2.cxx Change-Id: Iacf5e313fc6ca5f7d69ca6986a036f0e1ab1f2a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159488 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 32535dfa82200b54296838b52285c054fbe5e51d)
2023-12-06check earlier on loading ole objects if parent doc is untrusted refererCaolán McNamara
Conflicts: embeddedobj/source/commonembedding/persistence.cxx Change-Id: Ib1169d5c40ca87f789c71b48124754e073895fcd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158054 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 7273de2730022deb37a8c7f2fedbe7fc4551f9b5)
2023-12-06retain Referer information available in OCommonEmbeddedObject ctorCaolán McNamara
Conflicts: embeddedobj/source/commonembedding/persistence.cxx svx/source/unodraw/unoshap4.cxx Change-Id: I2cb901e81de3b7db73cd2088348ddad46ae603dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158052 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 267be127f2899f2e1b1f15b5a06707a9b83fcab4)
2023-12-06add referer to ole objectsCaolán McNamara
so we can identify what document is requesting their contents extends: commit 5668e73beb30b95abc6520b7432c54972ca3ab2c Date: Wed Nov 20 14:43:45 2013 +0100 avmedia: Implement "block untrusted referer links" feature See f0a9ca24fd4bf79cac908bf0d6fdb8905dc504db "rhbz#887420 Implement 'block untrusted referer links' feature" for details. This adds some further /*TODO?*/ comments, and one known problem (marked /*TODO!*/) is that movies/sounds are not blocked during a slideshow presentation. to these objects too, namely OLE2Shape and derivatives AppletShape, FrameShape and PluginShape so in paranoid mode we won't load the contents of such objects from documents considered "untrusted". Conflicts: include/svx/unoshape.hxx reportdesign/source/core/sdr/ReportDrawPage.cxx svx/source/unodraw/shapeimpl.hxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoshap4.cxx xmloff/source/draw/ximpshap.cxx Change-Id: I6d988035d0cd09fd3fade5f6885fe336c95579ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156598 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 125cf1525361c6cd699574f60b4cf12868188568)
2023-11-24tdf#148389 sw: fix Delete Undo/Redo of bookmark positionsMichael Stahl
The main problem is that in SwUndoSaveContent::DelContentIndex() if the selection start/end is equal to the bookmark start/end, the bookmark is not deleted and no SwHistoryBookmark is created, hence on Undo the bookmark positions are not restored. Since deleting bookmarks in more situations might cause user complaints, let's just extend the creation of SwHistoryBookmark to these cases, which means we need to take care both here and in SwHistoryBookmark::SetInDoc() that there is now a situation where all bookmark positions are saved and restored but the bookmark still exists in the document because it wasn't deleted. The next problem is that using Backspace/Delete keys sets the ArtificialSelection flag which is stored in SwUndoDelete, but when used multiple times the SwUndoDelete::CanGrouping() extends an existing SwUndoDelete, and if it previously would not delete a bookmark, the extended range might fully contain the bookmark and thus delete it on Redo, so check if there are saved bookmark positions and prevent grouping in that case. Another problem is then that SwUndoDelete::RedoImpl() deletes the bookmark anyway, as already indicated with a FIXME comment. This can be prevented by passing the now-existing m_DeleteFlags into DelBookmarks() from DeleteRangeImplImpl(). Change-Id: Id5eb1a58927aaa6e7e8b75be82d7f854d8057cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159875 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 57974af130e7421da6b07589d4a63a754b757ad6)
2023-11-24reuse AllowedLinkProtocolFromDocument in impress/drawCaolán McNamara
Change-Id: I73ca4f087946a45dbf92d69a0dc1e769de9b5690 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159843 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit f0942eed2eb328b04856f20613f5226d66b66a20) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159759 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159884 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-11-24reuse AllowedLinkProtocolFromDocument in writerCaolán McNamara
reorg calc hyperlink check to reuse elsewhere Change-Id: I20ae3c5df15502c3a0a366fb4a2924c06ffac3d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159487 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit e6a7537762e19fde446441edd10d301f9b37ce75) reuse AllowedLinkProtocolFromDocument in writer Change-Id: Iacf5e313fc6ca5f7d69ca6986a036f0e1ab1f2a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159488 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 32535dfa82200b54296838b52285c054fbe5e51d) combine these hyperlink dispatchers into one call Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb) we can have just one LoadURL for writer Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159858 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit e32b8601dbd63cf01497889601d6c9c1241106d6)
2023-11-24default to ignoring libreoffice special-purpose protocols in calc hyperlinkCaolán McNamara
Change-Id: Ib9f62be3acc05f24ca234dec0fec21e24579e9de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158911 Tested-by: Jenkins Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit b6062623b4d69c79e90e9365ac7c5e7f11986793) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159045 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 672716d09c54cb6fdd59baa7da4b8393cf104cd2)
2023-11-24warn about exotic protocols as wellCaolán McNamara
Change-Id: I50dcf4f36cd20d75f5ad3876353143268740a50f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151834 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 1305f70cff8a81a58a5a6d9c96c5bb032005389e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159034 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2e1bcbb550d54278b366ec619cc5280d44d6aba4)
2023-11-24add some protocols that don't make sense as floating frame targetsCaolán McNamara
Change-Id: Id900a5eef248731d1184c1df501a2cf7a2de7eb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158910 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 11ebdfef16501c6d35c3e3d0d62507f706557c71) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158900 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bab433911bdecb344f7ea94dbd00690241a08c54)
2023-11-24escape url passed to gstreamerCaolán McNamara
Change-Id: I3c93ee34800cc8563370f75ef3ef6f8a9220e6ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158894 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit f41dcadf6492a6ffd32696d50f818e44355b9ad9)
2023-11-24sd: remote: check that received commands have expected argumentsMichael Stahl
Change-Id: If4b5fe0362a40d14d68829bffb79f91ae9745835 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159590 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 8d87164becccc230e1e0ad5ac51bf645744165a2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159578 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 99b8559471c4429df70803cdb358da41888f8d03)
2023-11-24ofz#64106 Null-dereference READCaolán McNamara
Change-Id: Ie279f9f54fa6cc7fcc6add9b737d2c5dc248a236 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159349 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 9fc42afd17e9115b488401f64804479e7a76a300)
2023-11-24null-deref seen in ScTabView::UpdateEditViewCaolán McNamara
#0 0x00007f2bcc41df63 in ScViewData::GetCurYForTab (this=this@entry=0x3502d0b8, nTabIndex=nTabIndex@entry=6) at libreoffice/sc/source/ui/view/viewdata.cxx:1443 #1 0x00007f2bcc3ebf02 in ScTabView::UpdateEditView (this=this@entry=0x3502d0b0) at libreoffice/sc/source/ui/view/tabview3.cxx:2185 #2 0x00007f2bcc3ec636 in ScTabView::UpdateFormulas (this=this@entry=0x3502d0b0, nStartCol=nStartCol@entry=-1, nStartRow=nStartRow@entry=-1, nEndCol=nEndCol@entry=-1, nEndRow=nEndRow@entry=-1) at libreoffice/sc/source/ui/view/tabview3.cxx:2327 #3 0x00007f2bcc40735c in ScTabViewShell::Notify (this=0x3502cf20, rBC=..., rHint=...) at libreoffice/sc/source/ui/view/tabvwsh5.cxx:216 #4 0x00007f2bdc1885a9 in SfxBroadcaster::Broadcast (this=this@entry=0x31e31430, rHint=...) at libreoffice/svl/source/notify/SfxBroadcaster.cxx:40 #5 0x00007f2bcc022e6d in ScDocShell::PostDataChanged (this=this@entry=0x31e31430) at libreoffice/sc/source/ui/docshell/docsh3.cxx:95 #6 0x00007f2bcc0101aa in ScDocShell::SetDocumentModified (this=0x31e31430) at libreoffice/sc/source/ui/docshell/docsh.cxx:3015 #7 0x00007f2bcc010df3 in ScDocShellModificator::SetDocumentModified (this=this@entry=0x7fff2d168da0) at libreoffice/sc/source/ui/docshell/docsh.cxx:3330 #8 0x00007f2bcc040c1a in ScDocShell::MoveTable (this=this@entry=0x31e31430, nSrcTab=<optimized out>, nDestTab=<optimized out>, bCopy=bCopy@entry=false, bRecord=bRecord@entry=false) at libreoffice/sc/source/ui/docshell/docsh5.cxx:1010 #9 0x00007f2bcc441a41 in ScViewFunc::MoveTable (this=this@entry=0x333d0fe0, nDestDocNo=nDestDocNo@entry=0, nDestTab=nDestTab@entry=7, bCopy=bCopy@entry=false, pNewTabName=pNewTabName@entry=0x7fff2d169068) at libreoffice/sc/source/ui/view/viewfun2.cxx:3117 #10 0x00007f2bcc418459 in ScTabViewShell::ExecuteTable (this=0x333d0e50, rReq=...) at libreoffice/sc/source/ui/view/tabvwshf.cxx:593 #11 0x00007f2bdbd3d96f in SfxDispatcher::Call_Impl (this=this@entry=0x33379ed0, rShell=..., rSlot=..., rReq=..., bRecord=<optimized out>) at libreoffice/sfx2/source/control/dispatch.cxx:254 #12 0x00007f2bdbd427ee in SfxDispatcher::Execute_ (this=this@entry=0x33379ed0, rShell=..., rSlot=..., rReq=..., eCallMode=eCallMode@entry=SfxCallMode::RECORD) at libreoffice/sfx2/source/control/dispatch.cxx:753 #13 0x00007f2bdbd45a33 in SfxDispatcher::Execute (this=0x33379ed0, nSlot=<optimized out>, nCall=nCall@entry=SfxCallMode::RECORD, pArgs=pArgs@entry=0x7fff2d1694a0, pInternalArgs=pInternalArgs@entry=0x7fff2d169460, nModi=nModi@entry=0) at libreoffice/sfx2/source/control/dispatch.cxx:813 #14 0x00007f2bdbd83c0f in SfxDispatchController_Impl::dispatch (this=<optimized out>, aURL=..., aArgs=..., rListener=...) we have nulls in here for hidden sheets Change-Id: I8f1295e67552f3ec9306a031aaecd0838e18d98d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158502 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit ce8920448c05594f37f09c7a42ae3f3c7ccb7a1e)
2023-11-24crash seen in Window::ImplTrackTimerHdlCaolán McNamara
#0 vcl::Window::ImplTrackTimerHdl (this=0x3403b0a0, pTimer=<optimized out>) at libreoffice/vcl/source/window/window2.cxx:231 #1 0x00007f2bdd31f5e7 in Scheduler::CallbackTaskScheduling () at libreoffice/vcl/source/app/scheduler.cxx:485 #2 0x00007f2bdd4e5176 in SalTimer::CallCallback (this=<optimized out>) at libreoffice/vcl/inc/saltimer.hxx:54 #3 SvpSalInstance::CheckTimeout (this=this@entry=0x261ef40, bExecuteTimers=bExecuteTimers@entry=true) at libreoffice/vcl/headless/svpinst.cxx:212 #4 0x00007f2bdd4e713d in SvpSalInstance::ImplYield (this=this@entry=0x261ef40, bWait=bWait@entry=true, bHandleAllCurrentEvents=bHandleAllCurrentEvents@entry=false) at libreoffice/vcl/headless/svpinst.cxx:453 #5 0x00007f2bdd4e74a0 in SvpSalInstance::DoYield (this=0x261ef40, bWait=<optimized out>, bHandleAllCurrentEvents=<optimized out>) at libreoffice/vcl/headless/svpinst.cxx:525 Change-Id: I66ec56603aeb8a7fe855253b961dafb0bc7b875e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158441 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 455a1775ccef305cfb96cc5f67c8ee47b7f3a2ae)
2023-11-24crashreporting: svx::SentenceEditWindow_Impl::CreateSpellPortions()Caolán McNamara
cui/source/dialogs/SpellDialog.cxx:2005 aRet[ aRet.size() - 1 ].sText += aLeftOverText; presumably aRet is empty() here a) don't bother appending if aLeftOverText is empty() b) don't crah if aRet is empty() and aLeftOverText is not Change-Id: Ie9a9585f572d8afb17183b479fb6f2cce5952aa7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158124 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit e7e5b43c4906d9f0e199f689addc29aa98916e6e)
2023-11-24ofz#63295 Null-dereference READCaolán McNamara
Change-Id: Ib8bfa814099c1c1f3d65b18026ea812c80b6e9c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158058 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 00904f994a2f03638ec7f284396aeb730746e68d)
2023-11-24make CppunitTest_framework_dispatch reliableCaolán McNamara
the appearance of 2 interceptions is reproducible for me on linux with make CppunitTest_framework_dispatch VALGRIND=memcheck 1st time #1 (anonymous namespace)::MyInterceptor::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/qa/cppunit/dispatchtest.cxx:139 #2 non-virtual thunk to (anonymous namespace)::MyInterceptor::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/qa/cppunit/dispatchtest.cxx:0 #3 framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/dispatch/interceptionhelper.cxx:87 #4 non-virtual thunk to framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/dispatch/interceptionhelper.cxx:0 #5 (anonymous namespace)::XFrameImpl::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/services/frame.cxx:2329 #6 non-virtual thunk to (anonymous namespace)::XFrameImpl::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/services/frame.cxx:0 #7 framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at core/framework/source/services/dispatchhelper.cxx:110 #8 non-virtual thunk to framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at core/framework/source/services/dispatchhelper.cxx:0 #9 unotest::MacrosTest::dispatchCommand(com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at core/unotest/source/cpp/macros_test.cxx:94 #10 (anonymous namespace)::testInterception::TestBody() at core/framework/qa/cppunit/dispatchtest.cxx:172 2nd time #1 (anonymous namespace)::MyInterceptor::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/qa/cppunit/dispatchtest.cxx:139 #2 non-virtual thunk to (anonymous namespace)::MyInterceptor::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/qa/cppunit/dispatchtest.cxx:0 #3 framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/dispatch/interceptionhelper.cxx:87 #4 non-virtual thunk to framework::InterceptionHelper::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/dispatch/interceptionhelper.cxx:0 #5 (anonymous namespace)::XFrameImpl::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/services/frame.cxx:2329 #6 non-virtual thunk to (anonymous namespace)::XFrameImpl::queryDispatch(com::sun::star::util::URL const&, rtl::OUString const&, int) at core/framework/source/services/frame.cxx:0 #7 SfxStateCache::GetSlotServer(SfxDispatcher&, com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider> const&) at core/sfx2/source/control/statcach.cxx:263 #8 SfxBindings::UpdateSlotServer_Impl() at core/sfx2/source/control/bindings.cxx:1083 #9 SfxBindings::NextJob_Impl(Timer const*) at core/sfx2/source/control/bindings.cxx:1254 #10 SfxBindings::NextJob(Timer*) at core/sfx2/source/control/bindings.cxx:1222 #11 SfxBindings::LinkStubNextJob(void*, Timer*) at core/sfx2/source/control/bindings.cxx:1219 #12 Link<Timer*, void>::Call(Timer*) const at core/include/tools/link.hxx:111 #13 Timer::Invoke() at core/vcl/source/app/timer.cxx:76 #14 Scheduler::CallbackTaskScheduling() at core/vcl/source/app/scheduler.cxx:480 #15 SalTimer::CallCallback() at core/vcl/inc/saltimer.hxx:55 #16 SvpSalInstance::CheckTimeout(bool) at core/vcl/headless/svpinst.cxx:161 #17 SvpSalInstance::ImplYield(bool, bool) at core/vcl/headless/svpinst.cxx:399 #18 SvpSalInstance::DoYield(bool, bool) at core/vcl/headless/svpinst.cxx:471 #19 ImplYield(bool, bool) at core/vcl/source/app/svapp.cxx:377 #20 Scheduler::ProcessEventsToIdle() at core/vcl/source/app/svapp.cxx:407 #21 unotest::MacrosTest::dispatchCommand(com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at core/unotest/source/cpp/macros_test.cxx:95 #22 (anonymous namespace)::testInterception::TestBody() at core/framework/qa/cppunit/dispatchtest.cxx:172 setting bold/italic will invalidate the slot for the property and timer starts to update the normal listeners to those properties which might kick in on a slower run. Change-Id: Ib37e61c0fbed463f8974d476158e54a0160a2c92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157798 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 30c582a7202b1403e260af933258d456e7280a19)
2023-11-24tdf#154142 null-deref in SfxUndoManager::SetMaxUndoActionCountCaolán McNamara
Change-Id: I09cfbccb5f2ffa009a3e40157c9373b7e10864dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157764 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 6cfd36a392ec3710304ff3df3cb0f42e0d8b53d9)
2023-11-24ofz#62688 Null-dereference READ in SwRubyPortion::SwRubyPortionCaolán McNamara
seen with fodt2pdf fuzzer Change-Id: If761f5ecc473f4c936db82f3fcb7dd891e82573f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157243 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit cc564cea7eda29ed7e98ea27056f3ab57a6e2027)
2023-11-24crashreporting: apparent null deref at SwFEShell::IsShapeDefaultHoriTextDirR2LCaolán McNamara
https: //crashreport.libreoffice.org/stats/crash_details/73028951-19a0-409b-89d2-a080495df925 Change-Id: I440465a3c7d5b98ecdd1c5f1973a2b8f64d6772e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156931 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 105d1c010c4dc3caedf66a2080045c9c5f6fb9e3)
2023-11-24-Werror=dangling-referenceStephan Bergmann
In <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d2249cd9adf5ae638577139177a50f7e62d8abd9> "c++: Implement -Wdangling-reference [PR106393]" grew a new warning, included in -Wall, and based on some more-or-less shaky heuristics, that warns about "possibly dangling reference to a temporary". It produces quite a number of false positives, but for these uses of SfxItemSet::Get it does look plausible that the returned item references could, at least in theory, point at data that is destroyed along with the temporary SfxItemSet. Change-Id: I11afc4512db488f73170c6cfa706e9e094209550 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142217 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e0121b2478526d803681d57d59af0cbf9cf602b4) (cherry picked from commit 6231cbaf9dfc558cf7238b976970c86955e27f35)
2023-11-24python3: name gdb pretty-printer after .so, not .binMichael Stahl
So it works not only with instdir/program/python but also with soffice in-process python. Change-Id: I5c3643ef4a7ca0f25df3c6f51d11ff98c27f4bd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159148 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a2fabc78a4ba12ad8df6b040783be0fa22aefa54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159049 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit c4a57f59d56312bbdcb507ecbf13b75c6c6db1dc)
2023-11-24Update git submodulesMichael Stahl
* Update translations from branch 'distro/cib/libreoffice-6-4' to 24a3d3dac0d23c65e9586e13fe6b2c983e1aacb3 - add translation for tdf#128969 Change-Id: I03506d313f789f432f240d543dac9aa313e979f8
2023-10-11Bump version to 6.4.0.21cib-6.4-21Thorsten Behrens
Change-Id: I271f0093fcaebec9ca9272c4a6aed46dfeba4010
2023-10-11curl: fix socks return error if hostname too long for remote resolveThorsten Behrens
This fixes https://curl.se/docs/CVE-2023-38545.html Change-Id: Id70486c8ec4e7754e7a07d81b22702e435ce6727
2023-10-10sw: SwTbxAutoTextCtrl should sort groups by titleMichael Stahl
Change-Id: I2134492fd681393da6f4fc29aec95117145e8e97 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157735 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 07e46bb789915b8046b192b2bd6389e9ef5cb5ce)
2023-10-09Resolves: rhbz#1893846 if last close had insert, index dialog openCaolán McNamara
when starting a new writer document Change-Id: I83131c01aa53208a321abade48d48a6f7965d0ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105201 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 32f81b3a974737def611db36812225570e5d42be)
2023-09-28Fix curl proxy access for non-authenticated proxyNoel Grandin
If rSession.m_Proxy.aName is a simple host-name, the CurlUri constructor will fail with CURLUE_BAD_SCHEME, so just ignore the error here, we only care about parsing out the username/password Change-Id: Iec2d6e7315a5899ddddf6120a43199b75bf62db2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155834 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 9b30b4b1678e8be15ba51d236bd9a3e693d8d3d6)
2023-09-26poppler: upgrade to release 23.09.0Michael Stahl
Fixes CVE-2023-34872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157253 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 6d1c0e802eaefa1c42051c1456be61cef2dc2e86) Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
2023-09-26poppler: upgrade to release 23.06.0Taichi Haradaguchi
Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of some code that requires NSS or GPGMEPP. Update external/poppler/inc/pch/precompiled_poppler.hxx. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157252 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 038bd4f5bd878bedda8cfee9cad2c28dba482d79) Change-Id: I5e61371776c64962452022516446b5079c3840e2
2023-09-26poppler: upgrade to release 23.03.0Taichi Haradaguchi
* Upgrade poppler-data to 0.4.12 * Update poppler-config.patch.1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251 (cherry picked from commit 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08) Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f
2023-09-26poppler: upgrade to release 22.12.0Taichi Haradaguchi
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143977 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1ec7f8b5b21bf74f684095b97a2b9900a71a0979) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144066 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit b0c879d8f43f3266ce33eb5f20c08cf33c9734aa) fix poppler build * Update POPPLER_VERSION in poppler-config.patch.1 Change-Id: Iba770e6a3036a091925997025d4528f1d855da5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149795 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 36034a942ad90e9bde04b5d4172e5541bbc58563)
2023-09-26libtommath: upgrade to release 1.2.1Michael Stahl
Fixes CVE-2023-36328. Change-Id: I1193f5df789c7dd10855e35936fc2697697c464e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157246 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3daab618c759be2b93ad337061ef347c76229a22) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157249 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 00839def1c1d28067653a738e04d586bb9778433)
2023-09-26LibTomMath: upgrade to release 1.2.0Taichi Haradaguchi
* external/libtommath/clang-cl.patch: removed "typedef unsigned __int128 mp_word" from tommmath.h * external/libtommath/libtommath-msvc.patch: fixed upstream Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157248 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c2f87ac01cad03e286ebb304a32b785f1dac7b60)
2023-09-20tdf#157129 sw: fix wrong cursor position after pasteMichael Stahl
This asserts in SwUndoInserts::UndoImpl(): index.cxx:234: virtual SwContentIndexReg::~SwContentIndexReg(): Assertion `!m_pFirst && !m_pLast && "There are still indices registered"' failed. Because there is a bookmark still registered, because the content was inserted wrongly into a fly frame that contains a SwGrfNode, because earlier the cursor was in a hidden text node and SwCursorShell::UpdateCursorPos() moved it into an as-char anchored image. UpdateCursorPos() should put the cursor only onto a text node. (somehow regression from commit bb733957dd39e6f0b9d80bb59eb0177188794797) Change-Id: If00d1e09a612849a44bb3e2d3bd7bac6fa9ac05f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157071 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b20ca8d951e8205c8b963c6b7407f984053b4094)
2023-08-31tdf#156835 - FILEOPEN XLSX: add SHA-384 encryption support for ooxml importBalazs Varga
Password protected file with SHA-384 encryption does not open before this patch. cherry-picked from: 9254fbce6b9e20a75aa2a379bcf2fc9dc41a5b44 Change-Id: I482233f788b8e9da210ad6d2a6c4ece18d05d248 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156282 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156309 Tested-by: Balazs Varga <balazs.varga.extern@allotropia.de> Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
2023-08-28python3: upgrade to release 3.8.18cib-6.4-20Michael Stahl
Fixes CVE-2023-40217 Change-Id: Ie08af471009b7f5c42aa6875dd4f9d886ad1d617 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156183 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c1586ef57b5770f80ef200ab38ff4538c2dfb145)
2023-08-28svx: fix buildMichael Stahl
Change-Id: I900db1675c110568bc33e4e21babae55a941a626
2023-08-24Reset buffered GridOffset(s) for suspicious valuesArmin Le Grand (allotropia)
Huge offsets of GridOffset(s) are a hint for error -> usually the conditions for calculation have changed. E.g. - I saw errors with +/-5740, that was in the environment of massive external UNO API using LO as target. If condtions for this calculation change, it is usually required to call - ViewObjectContact::resetGridOffset(), or - ObjectContact::resetAllGridOffsets() or - ScDrawView::resetGridOffsetsForAllSdrPageViews() as it is done e.g. when zoom changes (see ScDrawView::RecalcScale()). Theoretically these resets have to be done for any precondition changed that is used in the calculation of that value (see ScDrawView::calculateGridOffsetForSdrObject). This is not complete and would be hard to do so. Since it is just a buffered value and re-calculation is not expensive (linear O(n)) we can just reset suspicious values here what fixes the problem. Hopefully - when that non-linear ViewTransformation problem for the calc-view gets solved one day - all this can be removed again. For now, let's just reset here and force re-calculation. Added a SAL_WARN to inform about this, too. Change-Id: I09137f7703fd00c2351a288a40bf87a2691ba6e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155983 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
2023-08-03tdf#156546 sw: fix infinite loop in SwUndoInsert::RedoImpl()Michael Stahl
The problem is that SwUndoSaveContent::MovePtBackward() sets the point of a shell cursor to the document body's start node, which is not a valid position for a shell cursor; FindParentText() then loops forever. The purpose of this appears to be to move the point temporarily somewhere where subsequent inserting operations won't move it further, so that it can be restored to the start of the inserted stuff. Refactor a bit to use a temporary SwNodeIndex instead, which should work as nothing should delete the node it's pointing to. (regression from commit d81379db730a163c5ff75d4f3a3cddbd7b5eddda) Change-Id: I471bcced1741c77c07239ed124d4fd39ff7a7515 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155227 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2d96d69322ac18f53668b75397c8587f94cd043b)
2023-08-03tdf#146258 sw: invalidate section frame for new text frame at startMichael Stahl
SwFlowFrame::CalcUpperSpace() uses the first text frame inside to compute the upper margin of section frames. Before commit 69d2d24b3579ad21fb1ba2746f81a02f8bbfb984 this was working because a temporary SwTextFrame for the new SwTextNode was created and then deleted again, but while it was alive the SvULSpace item was copied and then it invalidated the section frame: 1 SwFrame::InvalidatePrt_() 2 SwContentFrame::Modify() at libreoffice-6-1/sw/source/core/layout/wsfrm.cxx:2336 3 SwTextFrame::SwClientNotify() ... 7 SwTextNode::Modify() 8 SwContentNode::SetAttr() 9 SwTextNode::SetAttr() 10 SwAttrSet::CopyToModify() 11 SwTextNode::CopyText() 12 SwTextNode::CopyText() 13 SwTextNode::MakeCopy() 14 SwNodes::CopyNodes() 15 sw::DocumentContentOperationsManager::CopyWithFlyInFly() 16 SwIntrnlSectRefLink::DataChanged() Now however nothing invalidates the section frame, so do it in InsertCnt_(), hopefully it works for columned sections too. (regression from commit 166b5010b402a41b192b1659093a25acf9065fd9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154594 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 34b607bb455bd30d3adf8e3f72182c7cc4d062ee) [commit 34b607bb455bd30d3adf8e3f72182c7cc4d062ee used wrong issue id] Change-Id: I339286ac37c9ee9a0bef730a73215bc139386514 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154614 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit b81829dc7aa94e92818d2545cd28f1ef6c298395)
2023-08-03tdf#153319 sw: don't move footnotes to follow if portions in masterMichael Stahl
SwTextFrameBreak::IsInside() may be called in different situations, during formatting it should be possible to move the footnotes, but when called from SwTextFrame::CalcPreps() this is problematic as it does not format the lines, it iterates over existing lines. The problem is that the footnote frame is moved to the follow's page, but the footnote portion remains on the master, and then the follow is joined while the footnote frame's mpReference still points to it. (regression from commit 391613785ae6fbb735cf7a86ea2f6a93161a8769) Change-Id: I4290dcd242a7f5292ad4f50c1407c9cd88e80a6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154557 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 7e9b2b71db72b8c4c9c6ca83d08d3b6b05775ac8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154545 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit f70f822532d96feebd24645009f0368405dac9e4)
generated by cgit (git 2.34.1) at 2024-06-29 02:57:50 +0000