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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpproplist.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 07cef793f3cbe8bdada82c76e13e3ec1a7c3332d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 13 16:17:30 2015 +0000

    protect both EnumNamedProperty branches the same way
    
    Change-Id: I93669a6460806c1d4c35669a639667b0c6f3f4ab
    (cherry picked from commit a065eda2383e8d2d8de3cf0a280f6699c05da425)

diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index a0a59f1..119179e 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -127,11 +127,10 @@ OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value)
             value = pElement->GetValue().str();
             name  = pElement->GetName().str();
             pElement = pElement->GetNext();
-            return  pElement->GetName().str();
+            if(pElement)
+                return  pElement->GetName().str();
         }
-        else
-            return OUString("");
-
+        return OUString("");
     }
     else
     {