commit c8900890ad39e77285d284f5070abfe3661e493f
author Caolán McNamara <caolanm@redhat.com> Sun Sep 20 15:14:18 2020 +0100
committer Caolán McNamara <caolanm@redhat.com> Sun Sep 20 17:22:14 2020 +0200
tree 141818af44f8cbfbbcb233ad3b79091d53e162f6
parent 4487a14e7cce62e4fb6c1ebddac5f3e713c061de

crashtesting: assert on export of ooo123378-1.doc to docx

since...

commit d39651a69d789522b2faffd01879db25354b9a22
Date:   Thu Aug 27 15:13:08 2020 +0300

    sw: additional asserts/warns to diagnose empty style names

though the triggering of undo/redo during layout looks super dubious to me

Change-Id: Ie03fc7c1660a3c4fb77bfc0abb8373a5d5822378
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103073
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/source/filter/ww8/ww8graf.cxx

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index f7a048a..53f9739 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2826,8 +2826,13 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
        MapWrapIntoFlyFormat(pRecord, pRetFrameFormat);

    // Set frame name with object name
    if( pRetFrameFormat /*#i52825# */ && !aObjName.isEmpty() )
        pRetFrameFormat->SetName( aObjName );
    if (pRetFrameFormat /*#i52825# */)
    {
        if (!aObjName.isEmpty())
            pRetFrameFormat->SetName( aObjName );
        if (pRetFrameFormat->GetName().isEmpty())
            pRetFrameFormat->SetName(m_rDoc.GetUniqueDrawObjectName());
    }
    return AddAutoAnchor(pRetFrameFormat);
}