Replaced diagnore ENSURE_OR_CONTINUE with regular code.

2 files changed, 11 insertions, 3 deletions

diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 0d6a1713d121..fcc3efaefa53 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -500,8 +500,11 @@ namespace xmloff
                 // let the factory provide the concrete handler. Note that caching, if desired, is the task
                 // of the factory
                 PPropertyHandler handler = (*propDescription->factory)( propDescription->propertyId );
-                ENSURE_OR_CONTINUE( handler.get() != NULL,
-                    "OControlExport::exportGenericHandlerAttributes: invalid property handler provided by the factory!" );
+                if ( !handler.get() )
+                {
+                    SAL_WARN( "xmloff.forms", "OControlExport::exportGenericHandlerAttributes: invalid property handler provided by the factory!" );
+                    continue;
+                }
 
                 ::rtl::OUString attributeValue;
                 if ( propDescription->propertyGroup == NO_GROUP )
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index c8d878bf935a..8291d0309183 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -245,7 +245,12 @@ namespace xmloff { namespace metadata
             {
                 const PropertyGroup propGroup = group->second;
                 const IndexedPropertyGroups::const_iterator groupPos = rPropertyGroups.find( propGroup );
-                ENSURE_OR_CONTINUE( groupPos != rPropertyGroups.end(), "getPropertyGroupList: inconsistency!" );
+                if( groupPos == rPropertyGroups.end() )
+                {
+                    SAL_WARN( "xmloff.forms", "getPropertyGroupList: inconsistency!" );
+                    continue;
+                }
+
                 o_propertyGroups.push_back( groupPos->second );
             }
         }