sd/source/ui/app/sdmod2.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 737e392537d909f7915fb071230cc59ee1ff51e6
Author: Caolán McNamara <caol...@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
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 35ff9ce..a69beb8 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() );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
