[Libreoffice-commits] .: sw/inc sw/source

[Noel Power]

 sw/inc/unocoll.hxx                 |    4 +---
 sw/source/core/unocore/unobkm.cxx  |    2 +-
 sw/source/core/unocore/unocoll.cxx |    4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 64dfad8e06436178e4d5ef2ebba840ecb6ba230d
Author: Noel Power <noel.power at novell.com>
Date:   Thu Feb 24 09:47:18 2011 +0000

    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

diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 14ddbc0..7abf9d7 100644
--- a/sw/inc/unocoll.hxx
+++ b/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
 
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index e78a8c9..f14890b 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/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;
 
 }
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index e33b3ee..e508e75 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/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);