[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

[Julien Nabet (via logerrit)]

 sw/source/core/frmedt/feshview.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c31d7e13c73c82dab9c784bfa4eb68f3ebd84b9f
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Jun 12 10:09:49 2022 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jun 16 21:13:29 2022 +0200

    tdf#149524: fix crash in Writer after a label has just been created
    
    see bt here:
    https://bugs.documentfoundation.org/attachment.cgi?id=180683
    
    Change-Id: Iba461ffe65392a7e0e779f68d1f0737a444ae724
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135675
    Tested-by: Jenkins
    Tested-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit d9f716c48085ed46c1af31244583d67882cc94ec)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135993

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 464cd46412b6..8369004ac3c5 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1865,8 +1865,8 @@ bool SwFEShell::EndCreate( SdrCreateCmd eSdrCreateCmd )
 
 bool SwFEShell::ImpEndCreate()
 {
-    OSL_ENSURE( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 
1,
-            "New object not selected." );
+    if (Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 0)
+        return false;
 
     SdrObject& rSdrObj = 
*Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();