mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS hb02 (1.49.30); FILE MERGED

Browse Source 
2007/02/06 10:30:25 hbrinkm 1.49.30.3: RESYNC: (1.49-1.50); FILE MERGED
2007/02/01 12:09:40 fs 1.49.30.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:28 fs 1.49.30.1: changed handling of properties in the course of #i74051#
This commit is contained in:
Oliver Bolte
2007-03-09 12:29:22 +00:00
parent 2525f75198
commit 2039eeef18
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
forms/source/component/ListBox.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: ListBox.cxx,v $
*
* $Revision: 1.50 $
* $Revision: 1.51 $
*
* last change: $Author: vg $ $Date: 2007-01-15 13:47:04 $
* last change: $Author: obo $ $Date: 2007-03-09 13:29:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -468,27 +468,9 @@ namespace frm
}
//------------------------------------------------------------------------------
Reference<XPropertySetInfo> SAL_CALL OListBoxModel::getPropertySetInfo() throw(RuntimeException)
{
Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
//------------------------------------------------------------------------------
cppu::IPropertyArrayHelper& OListBoxModel::getInfoHelper()
{
return *const_cast<OListBoxModel*>(this)->getArrayHelper();
}
//------------------------------------------------------------------------------
void OListBoxModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
void OListBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 7, OBoundControlModel )
RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST );
// we want to "override" this property
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID);
DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND);
@@ -499,6 +481,15 @@ namespace frm
END_DESCRIBE_PROPERTIES();
}
//------------------------------------------------------------------------------
void OListBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
{
OBoundControlModel::describeAggregateProperties( _rAggregateProps );
// superseded properties:
RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST );
}
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException)
{