Kaydet (Commit) 737e3925 authored tarafından Caolán McNamara's avatar Caolán McNamara

fix crash on loading presentation with page name field

regression from

commit 42b521f8
Date:   Wed Apr 22 23:31:43 2015 +0200

    tdf#88056: Implement ODF import/export of page title field

Change-Id: I577a7c52836bbb13cc93910b4458aee5482ffc86
üst 815fe911
...@@ -270,7 +270,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) ...@@ -270,7 +270,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
} }
else 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_SLIDENAME).toString()
: SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() ); : SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment