INTEGRATION: CWS hb02 (1.8.52); FILE MERGED

2007/02/01 12:09:38 fs 1.8.52.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:27 fs 1.8.52.1: changed handling of properties in the course of #i74051#

2 files changed, 8 insertions, 38 deletions

diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 89286bede3fa..3af89817b13c 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: GroupBox.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:50:56 $
+ *  last change: $Author: obo $ $Date: 2007-03-09 13:26:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -116,24 +116,9 @@ OGroupBoxModel::~OGroupBoxModel()
 IMPLEMENT_DEFAULT_CLONING( OGroupBoxModel )
 
 //------------------------------------------------------------------------------
-Reference<XPropertySetInfo> SAL_CALL OGroupBoxModel::getPropertySetInfo() throw(RuntimeException)
+void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
 {
-    Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
-    return xInfo;
-}
-
-//------------------------------------------------------------------------------
-cppu::IPropertyArrayHelper& OGroupBoxModel::getInfoHelper()
-{
-    return *const_cast<OGroupBoxModel*>(this)->getArrayHelper();
-}
-
-//------------------------------------------------------------------------------
-void OGroupBoxModel::fillProperties(
-        Sequence< Property >& _rProps,
-        Sequence< Property >& _rAggregateProps ) const
-{
-    OControlModel::fillProperties( _rProps, _rAggregateProps );
+    OControlModel::describeAggregateProperties( _rAggregateProps );
     // don't want to have the TabStop property
     RemoveProperty(_rAggregateProps, PROPERTY_TABSTOP);
 }
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 7fa0781f5888..e2ad60a1c713 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Hidden.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:51:26 $
+ *  last change: $Author: obo $ $Date: 2007-03-09 13:27:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -147,24 +147,9 @@ sal_Bool OHiddenModel::convertFastPropertyValue(
 }
 
 //------------------------------------------------------------------------------
-Reference<XPropertySetInfo> SAL_CALL OHiddenModel::getPropertySetInfo() throw(RuntimeException)
+void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
-    Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
-    return xInfo;
-}
-
-//------------------------------------------------------------------------------
-cppu::IPropertyArrayHelper& OHiddenModel::getInfoHelper()
-{
-    return *const_cast<OHiddenModel*>(this)->getArrayHelper();
-}
-
-//------------------------------------------------------------------------------
-void OHiddenModel::fillProperties(
-        Sequence< Property >& _rProps,
-        Sequence< Property >& _rAggregateProps ) const
-{
-    BEGIN_DESCRIBE_AGGREGATION_PROPERTIES(4, m_xAggregateSet)
+    BEGIN_DESCRIBE_BASE_PROPERTIES(4)
         DECL_PROP2(CLASSID,         sal_Int16,          READONLY, TRANSIENT);
         DECL_PROP1(HIDDEN_VALUE,    ::rtl::OUString,    BOUND);
         DECL_PROP1(NAME,            ::rtl::OUString,    BOUND);