[Libreoffice-commits] core.git: sw/source

[Douglas Mencken]

 sw/source/filter/ww8/wrtww8.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06a0f80114c92de9d113fd75c3250fbd44752a39
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Wed Apr 6 10:04:04 2016 -0400

    drop double check of the same
    
    Change-Id: I552b53b18f2b05f71fb9ebf60912c9e8ca1d156c
    Reviewed-on: https://gerrit.libreoffice.org/23861
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 81a9f2d..a872f68 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3735,13 +3735,13 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
     const ::sw::mark::IFieldmark* pFieldmark = &rFieldmark;
     const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark );
 
-    OSL_ENSURE(rFieldmark.GetFieldname() == ODF_FORMTEXT ||
-                rFieldmark.GetFieldname() == ODF_FORMDROPDOWN ||
-                rFieldmark.GetFieldname() == ODF_FORMCHECKBOX, "Unknown field type!!!");
     if ( ! ( rFieldmark.GetFieldname() == ODF_FORMTEXT ||
                 rFieldmark.GetFieldname() == ODF_FORMDROPDOWN ||
                 rFieldmark.GetFieldname() == ODF_FORMCHECKBOX ) )
+    {
+        SAL_WARN( "sw.ww8", "unknown field type" );
         return;
+    }
 
     int type = 0; // TextFieldmark
     if ( pAsCheckbox )