diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-08 11:02:08 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:55:51 +0200 |
| commit | 0637d12ac87e5029beefa6f1670869b0358a7ce7 (patch) | |
| tree | f72aa0cb30bcb9203c1446090681e18c8edec8f9 /sd/source/ui | |
| parent | 21ed71922b8c5ca9c879f937ecf84db46a3317f3 (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
(cherry picked from commit 737e392537d909f7915fb071230cc59ee1ff51e6)
Reviewed-on: https://gerrit.libreoffice.org/16850
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sd/source/ui')
| -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 da621f689b55..41334c74c5c9 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() ); } |