summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-08 11:02:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-07-08 11:36:49 +0100
commit737e392537d909f7915fb071230cc59ee1ff51e6 (patch)
treeb89576794172563dbe43c621fb142eb84964c507 /sd
parent815fe9110897d5d8c122a5743e3765b67013dd8b (diff)
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
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/app/sdmod2.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 35ff9ceb33a8..a69beb88c18c 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() );
}