diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 12:46:07 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 12:46:07 +0000 |
| commit | eef0a39e8b6c0203511f1f143c2b2877dd28bc40 (patch) | |
| tree | 867ba6ebc58c40d5379bfcad003ec228fa98052d /forms | |
| parent | f3843861b15bb04f02ef73f2b2183839fb325e6a (diff) | |
INTEGRATION: CWS dba22b (1.34.32); FILE MERGED
2006/12/04 14:24:37 fs 1.34.32.1: during #i69405#: getField().is() -> hasField()
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 411d33e46..3224cf98d 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ComboBox.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:47:34 $ + * last change: $Author: vg $ $Date: 2007-01-15 13:46:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -294,7 +294,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() && !getField().is() && !hasExternalListSource() ) + if ( m_xCursor.is() && !hasField() && !hasExternalListSource() ) // combo box is already connected to a database, and no external list source // data source changed -> refresh loadData(); @@ -814,7 +814,7 @@ void OComboBoxModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm //------------------------------------------------------------------------------ void OComboBoxModel::onDisconnectedDbColumn() { - if (getField().is()) + if (hasField()) { m_xFormatter = 0; m_nFieldType = DataType::OTHER; |