[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sd/source

Caolán McNamara caolanm at redhat.com
Thu Aug 3 22:34:03 UTC 2017


 sd/source/ui/dlg/sdpreslt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b4ebf00d21f6305966c78f82336f9ac76425804
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 3 17:24:32 2017 +0100

    Resolves: tdf#111308 crash after load designs with no design selected
    
    Change-Id: Ia7d5e1d0c4c960700d94cfec01a8a01799f89d9a
    Reviewed-on: https://gerrit.libreoffice.org/40732
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit e325a5442ab350e8eb66458aed98d38ce21aec06)
    Reviewed-on: https://gerrit.libreoffice.org/40750
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 6ee9b9a24b20..3e4f60861fea 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -120,7 +120,7 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
     {
         aLayoutName = maName + "#" + maLayoutNames[ nId - 1 ];
     }
-    else
+    else if (nId)
     {
         aLayoutName = maLayoutNames[ nId - 1 ];
         if( aLayoutName == maStrNone )


More information about the Libreoffice-commits mailing list