[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-4' - sw/source
sw/source/core/docnode/node.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bdef2a3eb5a01d0785987170476427df400580b1
Author: Xisco Fauli
AuthorDate: Tue May 23 12:39:50 2023 +0200
Commit: Michael Stahl
CommitDate: Wed May 31 11:18:35 2023 +0200
sw: fix crash in SwNode::GetFlyFormat()
FindFlyFrame() might return nullptr
See
https://crashreport.libreoffice.org/stats/signature/SwNode::GetFlyFormat()
Change-Id: Id99a806e62f03b8912747525c8b0235c1b23232b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152156
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit e518624da1bdad5fcb24feb41349efa4301329e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152210
(cherry picked from commit d995cdd8f67a5015e71c5676e400c79a853a57a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152310
Reviewed-by: Ilmari Lauhakangas
Reviewed-by: Hossein
Tested-by: Michael Stahl
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index c50435e076fb..ced3b00c78eb 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -745,7 +745,7 @@ SwFrameFormat* SwNode::GetFlyFormat() const
if( IsContentNode() )
{
SwContentFrame* pFrame = SwIterator(*static_cast(this)).First();
-if( pFrame )
+if( pFrame && pFrame->FindFlyFrame())
pRet = pFrame->FindFlyFrame()->GetFormat();
}
if( !pRet )
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-4' - sw/source
sw/source/core/crsr/crsrsh.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit c2efddb1839ef5936daf69e62f4b9436c6cd Author: Michael Stahl AuthorDate: Wed May 17 14:49:55 2023 +0200 Commit: Xisco Fauli CommitDate: Tue May 30 21:41:17 2023 +0200 tdf#155346 sw: fix crash from changing modal mode When closing the dialog, UpdateCursor() creates a table cursor for ExtendedSelectedAll() because mbSelectAll isn't set. 1 SwShellTableCursor::SwShellTableCursor 2 SwCursorShell::UpdateCursor 3 SwCursorShell::ShowCursor 4 SwView::ShowCursor 5 SfxViewFrame::Enable 6 SfxViewFrame::Notify 7 SfxBroadcaster::Broadcast 8 SfxObjectShell::SetModalMode_Impl 9 SfxViewFrame::SetModalMode (regression from commit d81379db730a163c5ff75d4f3a3cddbd7b5eddda) Change-Id: Ie73f8e42f764f8041288eb0850721a530d106a0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151880 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 1458d2f935c50ab7f3e2f1277d1bc7d1b5b5f894) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151926 Reviewed-by: Xisco Fauli (cherry picked from commit 9d8d7fc60c345e02e8d73a3c2476c00217066885) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152093 Reviewed-by: Ilmari Lauhakangas Reviewed-by: Hossein Tested-by: Xisco Fauli diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 53ccb4a839d3..03cecdbbd8bf 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2661,6 +2661,8 @@ void SwCursorShell::ShowCursor() if( m_bBasicHideCursor ) return; +comphelper::FlagRestorationGuard g(mbSelectAll, StartsWith_() != StartsWith::None && ExtendedSelectedAll()); + m_bSVCursorVis = true; m_pCurrentCursor->SetShowTextInputFieldOverlay( true ); m_pCurrentCursor->SetShowContentControlOverlay(true);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-4' - sw/source
sw/source/ui/dbui/mmresultdialogs.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 989705cd147fc1a937546da687f164d068fb794e
Author: Noel Grandin
AuthorDate: Thu May 18 15:24:56 2023 +0200
Commit: Xisco Fauli
CommitDate: Tue May 30 16:50:43 2023 +0200
prevent crash in mail merge
seen reports in crashreporter
Change-Id: I10ecac363eea0292f9dc257769da6d060dc350f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151962
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 9efbcce8b3f6f40a2687b9e4892527b6974227b7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151920
Reviewed-by: Xisco Fauli
(cherry picked from commit 94861ae06bf861218080d21fac8ed3835d8809dd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151928
Reviewed-by: Michael Stahl
Reviewed-by: Ilmari Lauhakangas
Tested-by: Xisco Fauli
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 8d733118bbb4..b3404a30231a 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -893,6 +893,12 @@ IMPL_LINK(SwMMResultEmailDialog, SendTypeHdl_Impl,
weld::ComboBox&, rBox, void)
IMPL_LINK_NOARG(SwMMResultEmailDialog, SendAsHdl_Impl, weld::Button&, void)
{
+// work around crash when calling constructor with no active view
+if (!GetActiveView())
+{
+SAL_WARN("sw", "ignoring SendAs button click, because no active view");
+return;
+}
SwMailBodyDialog aDlg(m_xDialog.get());
aDlg.SetBody(m_sBody);
if (RET_OK == aDlg.run())
