diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:21:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:21:25 +0000 |
| commit | 46457738d870c76335023d4cdc141eb8f5766ccf (patch) | |
| tree | 364f7926ebe5f801ccd3f2858e633c2a6f47e22a /forms/source/component/Columns.hxx | |
| parent | c36d62a1904bcac58f4cf08c03e71d01ef4a5d38 (diff) | |
INTEGRATION: CWS hb02 (1.10.78); FILE MERGED
2007/01/31 13:55:22 fs 1.10.78.2: consolidated default handling during #i74051#
2007/01/31 10:55:24 fs 1.10.78.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/Columns.hxx')
| -rw-r--r-- | forms/source/component/Columns.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index be3e93d600e6..75519e822225 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -4,9 +4,9 @@ * * $RCSfile: Columns.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:45:58 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:21:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -144,8 +144,7 @@ public: virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() = 0; virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) @@ -155,8 +154,6 @@ public: using OPropertySetAggregationHelper::getFastPropertyValue; // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XCloneable @@ -168,7 +165,7 @@ protected: static void clearAggregateProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& seqProps, sal_Bool bAllowDropDown); static void setOwnProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& seqProps); - virtual OGridColumn* createCloneColumn() const; + virtual OGridColumn* createCloneColumn() const = 0; }; #define DECL_COLUMN(ClassName) \ |