more form field cleanup

sw/inc/unocoll.hxx: removed support for the ODF_FORM_CHECKBOX & ODF_FORM_LISTBOX
services, they aren't needed at all
sw/source/core/unocore/unocoll.cxx; as above
sw/source/core/unocore/unobkm.cxx: minor tweaking to use const_cast

sw/inc/unocoll.hxx

@@ -194,9 +194,7 @@ class SwUnoCollection
 #define SW_SERVICE_VBAOBJECTPROVIDER                    110
 #define SW_SERVICE_VBACODENAMEPROVIDER                  111
 #define SW_SERVICE_VBAPROJECTNAMEPROVIDER               112
-#define SW_SERVICE_ODF_FORM_CHECKBOX                    113
-#define SW_SERVICE_ODF_FORM_LISTBOX                     114
-#define SW_SERVICE_VBAGLOBALS                           115
+#define SW_SERVICE_VBAGLOBALS                           113
 
 #define SW_SERVICE_LAST                 SW_SERVICE_VBAGLOBALS
 

sw/source/core/unocore/unobkm.cxx

@@ -684,7 +684,7 @@ SwXFieldmark::getCheckboxFieldmark()
     ::sw::mark::ICheckboxFieldmark* pCheckboxFm = NULL;
     if ( getFieldType() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX) ) )
         // evil #TODO #FIXME casting away the const-ness
-        pCheckboxFm = (::sw::mark::ICheckboxFieldmark*)(reinterpret_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark()));
+        pCheckboxFm = const_cast<sw::mark::ICheckboxFieldmark*>(reinterpret_cast< const ::sw::mark::ICheckboxFieldmark* >( GetBookmark()));
     return  pCheckboxFm;
 
 }

sw/source/core/unocore/unocoll.cxx

@@ -399,8 +399,6 @@ const ProvNamesId_Type aProvNamesId[] =
     { "ooo.vba.VBAObjectModuleObjectProvider",                SW_SERVICE_VBAOBJECTPROVIDER },
     { "ooo.vba.VBACodeNameProvider",                          SW_SERVICE_VBACODENAMEPROVIDER },
     { "ooo.vba.VBAProjectNameProvider",                       SW_SERVICE_VBAPROJECTNAMEPROVIDER },
-    { "com.sun.star.text.FormFieldmark.ODFFormCheckbox",                    SW_SERVICE_ODF_FORM_CHECKBOX },
-    { "com.sun.star.text.FormFieldmark.ODFFormListbox",                     SW_SERVICE_ODF_FORM_LISTBOX },
     { "ooo.vba.VBAGlobals",                       SW_SERVICE_VBAGLOBALS },
 
     // case-correct versions of the service names (see #i67811)
@@ -563,8 +561,6 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
             xRet =  (cppu::OWeakObject*)pFieldmark;
         }
         break;
-        case  SW_SERVICE_ODF_FORM_LISTBOX:
-        case  SW_SERVICE_ODF_FORM_CHECKBOX:
         case  SW_SERVICE_TYPE_FORMFIELDMARK :
         {
             SwXFieldmark* pFieldmark = new SwXFieldmark(true);