diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 09:35:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 09:35:57 +0000 |
| commit | a4afe58f4a6769738ef7f1a6cf522cba534e3a60 (patch) | |
| tree | 7f554f643f5f55648946f457f3e61db52d3e8667 /forms/source/component/ComboBox.cxx | |
| parent | 35748901e6d63e4906fa7d8874f13a4ddcc418dd (diff) | |
INTEGRATION: CWS eforms2 (1.24.24); FILE MERGED
2004/08/16 17:08:27 dvo 1.24.24.3: RESYNC: (1.25-1.26); FILE MERGED
2004/07/27 14:12:22 fs 1.24.24.2: RESYNC: (1.24-1.25); FILE MERGED
2004/07/19 15:18:40 fs 1.24.24.1: during #114856#: properly determine who instigated a setControlValue, so that we can propagate the values to appropriate interested parties / while we were here: make some attributes private ...
Diffstat (limited to 'forms/source/component/ComboBox.cxx')
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 1441b4d291dd..5125914c8156 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ComboBox.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hr $ $Date: 2004-08-02 16:27:20 $ + * last change: $Author: obo $ $Date: 2004-11-16 10:35:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -550,7 +550,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& readCommonProperties(_rxInStream); // Nach dem Lesen die Defaultwerte anzeigen - if (m_aControlSource.getLength()) + if ( getControlSource().getLength() ) { // (not if we don't have a control source - the "State" property acts like it is persistent, then resetNoBroadcast(); @@ -605,9 +605,9 @@ void OComboBoxModel::loadData() Reference<XIndexAccess> xFieldsByIndex(xFieldsByName, UNO_QUERY); ::rtl::OUString aFieldName; - if (xFieldsByName.is() && xFieldsByName->hasByName(m_aControlSource)) + if ( xFieldsByName.is() && xFieldsByName->hasByName( getControlSource() ) ) { - aFieldName = m_aControlSource; + aFieldName = getControlSource(); } else { @@ -635,10 +635,10 @@ void OComboBoxModel::loadData() DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !"); Reference< XNameAccess > xFieldNames = xSupplyFields->getColumns(); - if (xFieldNames->hasByName(m_aControlSource)) + if ( xFieldNames->hasByName( getControlSource() ) ) { Reference< XPropertySet > xComposerFieldAsSet; - xFieldNames->getByName(m_aControlSource) >>= xComposerFieldAsSet; + xFieldNames->getByName( getControlSource() ) >>= xComposerFieldAsSet; if (hasProperty(PROPERTY_FIELDSOURCE, xComposerFieldAsSet)) xComposerFieldAsSet->getPropertyValue(PROPERTY_FIELDSOURCE) >>= aFieldName; } @@ -868,7 +868,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset ) if ( bModified ) { - if (!aNewValue.getLength() && !m_bRequired && m_bEmptyIsNull) + if (!aNewValue.getLength() && !isRequired() && m_bEmptyIsNull) m_xColumnUpdate->updateNull(); else { |