10 files changed, 1 insertions, 52 deletions
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 2410dc77ed89..7b6c7158f921 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -626,14 +626,6 @@ void OImageControlModel::doSetControlValue( const Any& _rValue )
     }
 }
 
-// OComponentHelper
-
-void SAL_CALL OImageControlModel::disposing()
-{
-    OBoundControlModel::disposing();
-}
-
-
 void OImageControlModel::resetNoBroadcast()
 {
     if ( hasField() )          // only reset when we are connected to a column
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index 6c3b4326f1a1..60a9a3310bc9 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -81,9 +81,6 @@ public:
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
 
-    // OComponentHelper
-    virtual void SAL_CALL disposing() override;
-
     // XPersistObject
     virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 2f9c0ff25f7c..a70f2cf25e78 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -170,11 +170,6 @@ namespace frm
         return aSupported;
     }
 
-    void SAL_CALL ONavigationBarModel::disposing()
-    {
-        OControlModel::disposing( );
-    }
-
     OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException, std::exception )
     {
         return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 7bd2e754115f..536a1ca046db 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -83,9 +83,6 @@ namespace frm
         // XTypeProvider
         DECLARE_XTYPEPROVIDER()
 
-        // OComponentHelper
-        virtual void SAL_CALL disposing() override;
-
         // XPersistObject
         virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override;
         virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 3b50a096fbf3..c2a02ddb24f1 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -132,12 +132,6 @@ namespace frm
     IMPLEMENT_DEFAULT_CLONING( OScrollBarModel )
 
 
-    void SAL_CALL OScrollBarModel::disposing()
-    {
-        OBoundControlModel::disposing();
-    }
-
-
     void OScrollBarModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel )
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index ee0b2b70e581..a228a41eb4ce 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -70,9 +70,6 @@ namespace frm
         virtual css::uno::Any   translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const override;
         virtual css::uno::Any   translateControlValueToExternalValue( ) const override;
 
-        // XCoponent and related helpers
-        virtual void SAL_CALL disposing() override;
-
         // prevent method hiding
         using OBoundControlModel::disposing;
         using OBoundControlModel::getFastPropertyValue;
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 6c71bf98e2bf..a2b551d73711 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -86,12 +86,6 @@ namespace frm
     IMPLEMENT_DEFAULT_CLONING( OSpinButtonModel )
 
 
-    void SAL_CALL OSpinButtonModel::disposing()
-    {
-        OBoundControlModel::disposing();
-    }
-
-
     void OSpinButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel )
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 886c79782cf0..a93f7326c5f4 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -71,9 +71,6 @@ namespace frm
         virtual css::uno::Any   translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const override;
         virtual css::uno::Any   translateControlValueToExternalValue( ) const override;
 
-        // XCoponent and related helpers
-        virtual void SAL_CALL disposing() override;
-
         // prevent method hiding
         using OBoundControlModel::disposing;
         using OBoundControlModel::getFastPropertyValue;
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 6ec032d2e381..205c86edf96e 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -500,20 +500,6 @@ namespace frm
     }
 
 
-    void SAL_CALL ORichTextModel::write(const Reference< XObjectOutputStream >& _rxOutStream) throw ( IOException, RuntimeException, std::exception)
-    {
-        OControlModel::write( _rxOutStream );
-        // TODO: place your code here
-    }
-
-
-    void SAL_CALL ORichTextModel::read(const Reference< XObjectInputStream >& _rxInStream) throw ( IOException, RuntimeException, std::exception)
-    {
-        OControlModel::read( _rxInStream );
-        // TODO: place your code here
-    }
-
-
     RichTextEngine* ORichTextModel::getEditEngine( const Reference< XControlModel >& _rxModel )
     {
         RichTextEngine* pEngine = nullptr;
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index f3ed47408040..efea6024df6f 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -112,7 +112,7 @@ namespace frm
         virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override;
 
         // XPersistObject
-        DECLARE_XPERSISTOBJECT()
+        virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override;
 
         // XTypeProvider
         DECLARE_XTYPEPROVIDER()