diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-08 11:02:08 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-07-09 17:21:45 +0000 |
| commit | 7294c12893cbc9d9e4779e8dac7ad69b617adf47 (patch) | |
| tree | db403ca3042fdc8b3965f0d2e699a05a9c24f24d | |
| parent | a8dfe59acbd061a8d446177a3c97a3028c95ebde (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
Reviewed-on: https://gerrit.libreoffice.org/16852
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 8f2d3a2f2c11..90498830905e 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() ); } |