[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - hwpfilter/source

Caolán McNamara caolanm at redhat.com
Thu Feb 22 09:21:35 UTC 2018


 hwpfilter/source/hwpfile.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae9a3581d1d1be4bc4f4da4c57d7449458f256a1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 20 16:26:21 2018 +0000

    forcepoint #1
    
    Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
    
    Change-Id: Ic5e9a9d0f8f8d35cb6b39e68338ba029948a4ce0
    Reviewed-on: https://gerrit.libreoffice.org/50084
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index d58faa569a7b..3fab3a5b3dd4 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -227,7 +227,7 @@ class DLLEXPORT HWPFile
         HWPInfo& GetHWPInfo(void) { return _hwpInfo; }
         HWPFont& GetHWPFont(void) { return _hwpFont; }
         HWPStyle& GetHWPStyle(void) { return _hwpStyle; }
-        HWPPara *GetFirstPara(void) { return plist.front(); }
+        HWPPara *GetFirstPara(void) { return !plist.empty() ? plist.front() : nullptr; }
 
         EmPicture *GetEmPicture(Picture *pic);
         EmPicture *GetEmPictureByName(char * name);


More information about the Libreoffice-commits mailing list