diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:24:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:24:37 +0000 |
| commit | e37046ea8d4d5962fe162702e22d17075aad4159 (patch) | |
| tree | 2bc60182864824e5522670e7b4577aa805545d68 /forms | |
| parent | 4b94691425bd7ab32220f902df3fe0eba986b054 (diff) | |
INTEGRATION: CWS hb02 (1.10.52); FILE MERGED
2007/02/01 12:09:37 fs 1.10.52.3: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 13:55:22 fs 1.10.52.2: consolidated default handling during #i74051#
2007/01/31 10:55:26 fs 1.10.52.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/File.cxx | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 04123bfd0c6b..73fd3af7c3ee 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -4,9 +4,9 @@ * * $RCSfile: File.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:49:08 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:24:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -174,6 +174,18 @@ void OFileControlModel::disposing() } //------------------------------------------------------------------------------ +Any OFileControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const +{ + Any aReturn; + switch ( _nHandle ) + { + case PROPERTY_ID_DEFAULT_TEXT: + return makeAny( ::rtl::OUString() ); + } + return OControlModel::getPropertyDefaultByHandle( _nHandle ); +} + +//------------------------------------------------------------------------------ void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const { switch (nHandle) @@ -212,16 +224,7 @@ sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& } //------------------------------------------------------------------------------ -Reference<XPropertySetInfo> SAL_CALL OFileControlModel::getPropertySetInfo() throw( RuntimeException ) -{ - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; -} - -//------------------------------------------------------------------------------ -void OFileControlModel::fillProperties( - Sequence< Property >& _rProps, - Sequence< Property >& _rAggregateProps ) const +void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel ) DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); @@ -230,12 +233,6 @@ void OFileControlModel::fillProperties( } //------------------------------------------------------------------------------ -::cppu::IPropertyArrayHelper& OFileControlModel::getInfoHelper() -{ - return *const_cast<OFileControlModel*>(this)->getArrayHelper(); -} - -//------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility ! |