diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-19 12:07:57 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-19 12:07:57 +0000 |
commit | a7d6769a60db431c567651bce06ec1854698370b (patch) | |
tree | b87f5cf7db41908b180e6ab0277f4af5b46439aa /forms/source/component/CheckBox.cxx | |
parent | cc31c2cc60d832ea821014e642cdfcdd24c1b413 (diff) |
INTEGRATION: CWS dba05 (1.8.50); FILE MERGED
2003/05/07 07:59:13 oj 1.8.50.1: #i13806# change the property boundfield to be bound
Diffstat (limited to 'forms/source/component/CheckBox.cxx')
-rw-r--r-- | forms/source/component/CheckBox.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 439a4015bb42..79aa39fb0084 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CheckBox.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fs $ $Date: 2002-12-02 09:56:27 $ + * last change: $Author: vg $ $Date: 2003-05-19 13:07:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -205,7 +205,7 @@ void OCheckBoxModel::_propertyChanged(const PropertyChangeEvent& _rEvent) throw( { // as we aren't commitable we have to take care of the field we are bound to ourself osl::MutexGuard aGuard(m_aMutex); - if (m_xField.is() && !m_bInReset) + if (getField().is() && !m_bInReset) { sal_uInt16 nState; @@ -324,7 +324,7 @@ void OCheckBoxModel::fillProperties( DECL_PROP1(TAG, rtl::OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(CONTROLSOURCE, rtl::OUString, BOUND); - DECL_IFACE_PROP2(BOUNDFIELD, XPropertySet, READONLY, TRANSIENT); + DECL_IFACE_PROP3(BOUNDFIELD, XPropertySet, BOUND,READONLY, TRANSIENT); DECL_IFACE_PROP2(CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID); DECL_PROP2(CONTROLSOURCEPROPERTY, rtl::OUString, READONLY, TRANSIENT); FRM_END_PROP_HELPER(); @@ -453,8 +453,8 @@ sal_Bool OCheckBoxModel::_commit() // we're in reset, so this commit means "put the value into the field you're bound to" // 72769 - 08.02.00 - FS - DBG_ASSERT(m_xField.is(), "OCheckBoxModel::_commit : committing while resetting, but not bound ?"); - if (m_xField.is()) + DBG_ASSERT(getField().is(), "OCheckBoxModel::_commit : committing while resetting, but not bound ?"); + if (getField().is()) { try { |