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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpobjfactory.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit cacc5bbdb10e5325148a8518fc8da581481429d8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 5 11:54:28 2015 +0100

    these types come directly from the file itself
    
    so while invalid they can appear here
    
    Change-Id: I36d43958bf578e677f216aea09400ab764ed82ae
    (cherry picked from commit aad27e89564752a2bee3da4558f4d276685ba50a)

diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index d72535d..f73f800 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -135,7 +135,7 @@ rtl::Reference<LwpObject> LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj
 {
     rtl::Reference<LwpObject> newObj;
     m_nNumObjs++;
-    assert(type<300);
+    SAL_WARN_IF(type>=300, "lwp", "invalid type: " << type);
     switch(type)
     {
         case VO_DOCUMENT:
@@ -666,7 +666,6 @@ rtl::Reference<LwpObject> LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObj
         default:
         {
             //Unknown object type
-            assert(false);
             newObj = NULL;
             break;
         }