[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpgrfobj.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3c913a2958e4e984a829a60a668d6c0fb54d3aa
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sat Dec 12 21:02:44 2015 +0000

    guard against empty XFDrawObjects
    
    Change-Id: I9deb28a3a5420a43f8604a56145c8274bb4cc8d9
    (cherry picked from commit e9801b286b7af0a6043a3a70090a49c5959abe16)

diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx 
b/lotuswordpro/source/filter/lwpgrfobj.cxx
index f03a1d6..d81ac1c 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -199,7 +199,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
             pCont->Add(iter->get());
         }
     }
-    else if (this->IsGrafFormatValid())
+    else if (this->IsGrafFormatValid() && !m_vXFDrawObjects.empty())
     {
         XFImage* pImage = 
static_cast<XFImage*>(m_vXFDrawObjects.front().get());
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits