summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 11:44:19 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 11:44:19 +0000
commit12f6cdf7224b919505eeaabc268e959476395bf9 (patch)
treef07d82f6115390f6afbd027b188277a6d87e72df /forms
parentfa200e7b226f80a3344ccd063bc78eb99b215cac (diff)
INTEGRATION: CWS dba09 (1.22.34); FILE MERGED
2004/04/27 06:15:21 fs 1.22.34.3: RESYNC: (1.22-1.23); FILE MERGED 2004/03/19 08:25:33 fs 1.22.34.2: #i26715# when reading the binary format, care for 'overwritten' aggregate properties 2004/03/17 11:51:03 fs 1.22.34.1: #92831# at runtime, don't use 'stardiv.one.form.control.*' service names - translate when writing old (binary) format
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/ComboBox.cxx19
1 files changed, 16 insertions, 3 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 2a138be11f68..0c87f1f267d1 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ComboBox.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: rt $ $Date: 2004-04-02 10:49:48 $
+ * last change: $Author: hr $ $Date: 2004-05-10 12:44:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -209,7 +209,7 @@ Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (Runtime
DBG_NAME( OComboBoxModel )
//------------------------------------------------------------------
OComboBoxModel::OComboBoxModel(const Reference<XMultiServiceFactory>& _rxFactory)
- :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_COMBOBOX, FRM_CONTROL_COMBOBOX, sal_True, sal_True, sal_True )
+ :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_COMBOBOX, FRM_SUN_CONTROL_COMBOBOX, sal_True, sal_True, sal_True )
// use the old control name for compytibility reasons
,OEntryListHelper( m_aMutex )
,OErrorBroadcaster( OComponentHelper::rBHelper )
@@ -463,6 +463,19 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
OBoundControlModel::read(_rxInStream);
::osl::MutexGuard aGuard(m_aMutex);
+ // since we are "overwriting" the StringItemList of our aggregate (means we have
+ // an own place to store the value, instead of relying on our aggregate storing it),
+ // we need to respect what the aggregate just read for the StringItemList property.
+ try
+ {
+ if ( m_xAggregateSet.is() )
+ setNewStringItemList( m_xAggregateSet->getPropertyValue( PROPERTY_STRINGITEMLIST ) );
+ }
+ catch( const Exception& )
+ {
+ OSL_ENSURE( sal_False, "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
+ }
+
// Version
sal_uInt16 nVersion = _rxInStream->readShort();
DBG_ASSERT(nVersion > 0, "OComboBoxModel::read : version 0 ? this should never have been written !");