diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-19 12:07:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-19 12:07:44 +0000 |
| commit | cc31c2cc60d832ea821014e642cdfcdd24c1b413 (patch) | |
| tree | c0d0501b348d09f2ad937bcfcab9c7a83b1e9b03 /forms/source/component/ComboBox.cxx | |
| parent | 5bbf80e212322dfeef1e775164cd39da42c01fe7 (diff) | |
INTEGRATION: CWS dba05 (1.18.50); FILE MERGED
2003/05/07 07:59:13 oj 1.18.50.1: #i13806# change the property boundfield to be bound
Diffstat (limited to 'forms/source/component/ComboBox.cxx')
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index beb5e1069ee3..88201c2031f0 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ComboBox.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: fs $ $Date: 2002-12-02 09:56:28 $ + * last change: $Author: vg $ $Date: 2003-05-19 13:07:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -283,7 +283,7 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const // die ListSource hat sich geaendert -> neu laden if (ListSourceType_VALUELIST != m_eListSourceType) { - if (m_xCursor.is() && !m_xField.is()) // combobox bereits mit Datenbank verbunden ? + if (m_xCursor.is() && !getField().is()) // combobox bereits mit Datenbank verbunden ? // neu laden loadData(); } @@ -366,9 +366,9 @@ void OComboBoxModel::fillProperties( DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); DECL_PROP1(CONTROLSOURCE, ::rtl::OUString, BOUND); - DECL_IFACE_PROP2(BOUNDFIELD, XPropertySet, READONLY, TRANSIENT); - DECL_IFACE_PROP2(CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID); - DECL_PROP2(CONTROLSOURCEPROPERTY, rtl::OUString, 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(); } @@ -733,11 +733,12 @@ void OComboBoxModel::loadData() //------------------------------------------------------------------------------ void OComboBoxModel::_loaded(const EventObject& rEvent) { - if (m_xField.is()) + Reference<XPropertySet> xField = getField(); + if (xField.is()) { // jetzt den Key und typ ermitteln - m_xField->getPropertyValue(PROPERTY_FIELDTYPE) >>= m_nFieldType; - m_xField->getPropertyValue(PROPERTY_FORMATKEY) >>= m_nFormatKey; + xField->getPropertyValue(PROPERTY_FIELDTYPE) >>= m_nFieldType; + xField->getPropertyValue(PROPERTY_FORMATKEY) >>= m_nFormatKey; // XNumberFormatter besorgen Reference<XRowSet> xRowSet(rEvent.Source, UNO_QUERY); @@ -766,7 +767,7 @@ void OComboBoxModel::_loaded(const EventObject& rEvent) //------------------------------------------------------------------------------ void OComboBoxModel::_unloaded() { - if (m_xField.is()) + if (getField().is()) { m_xFormatter = 0; m_nFieldType = DataType::OTHER; |