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

[Caolán McNamara]

 sd/source/ui/app/sdmod2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 55c5b5db96a48e1733778c78e6701ffb8ff6bc4f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 8 11:02:08 2015 +0100

    fix crash on loading presentation with page name field
    
    regression from
    
    commit 42b521f800a08b11432cf906ce1bdf9fcbfffdeb
    Date:   Wed Apr 22 23:31:43 2015 +0200
    
        tdf#88056: Implement ODF import/export of page title field
    
    Change-Id: I577a7c52836bbb13cc93910b4458aee5482ffc86
    (cherry picked from commit 737e392537d909f7915fb071230cc59ee1ff51e6)
    Reviewed-on: https://gerrit.libreoffice.org/16850
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index da621f6..41334c7 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -270,7 +270,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
             }
             else
             {
-                aRepresentation = ( ( pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
+                DocumentType eDocType = pDoc ? pDoc->GetDocumentType() : DOCUMENT_TYPE_IMPRESS;
+                aRepresentation = ( ( eDocType == DOCUMENT_TYPE_IMPRESS )
                                     ? SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
                                     : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
             }