From 3d3a0ece4def020ce0073fc73c50b3982d9fd306 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Fri, 9 Mar 2007 12:35:14 +0000
Subject: INTEGRATION: CWS hb02 (1.7.80); FILE MERGED 2007/02/01 12:09:42 fs
 1.7.80.2: #i74051# split describeFixedProperties in describeFixedProperties
 and describeAggregateProperties 2007/01/31 10:55:31 fs 1.7.80.1: changed
 handling of properties in the course of #i74051#

---
 forms/source/component/spinbutton.hxx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'forms/source/component/spinbutton.hxx')

diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 38bf08fc8c64..4ab8ef10bf43 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: spinbutton.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hr $ $Date: 2006-06-19 12:56:59 $
+ *  last change: $Author: obo $ $Date: 2007-03-09 13:35:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,6 @@ namespace frm
     //= OSpinButtonModel
     //====================================================================
     class OSpinButtonModel   :public OBoundControlModel
-                            ,public ::comphelper::OAggregationArrayUsageHelper< OSpinButtonModel >
     {
     private:
         // <properties>
@@ -74,12 +73,9 @@ namespace frm
         // XPropertyState
         virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const;
 
-        // XPropertySet and related helpers
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
-        ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-        virtual void fillProperties(
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps,
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
+        // OControlModel's property handling
+        virtual void describeFixedProperties(
+            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps
         ) const;
 
         // OPropertySetHelper
@@ -109,7 +105,6 @@ namespace frm
         using OBoundControlModel::disposing;
         using OBoundControlModel::getFastPropertyValue;
 
-        IMPLEMENT_INFO_SERVICE()
     };
 //........................................................................
 } // namespacefrm
-- 
cgit