diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-24 15:51:23 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-01-24 15:51:23 +0100 |
| commit | 6df1f4cd69b1b02020e3885d513ff718bf122b1c (patch) | |
| tree | b3c6f602b6d5eb4f1eadd967b531a02b2a0f9caa /toolkit/source/controls | |
| parent | 0cbc0e3ab6d9ee6597ac8a120ec82cb30ee8cb07 (diff) | |
gridsort: fixed the UnoControlList/ComboBox ctors so that the latter registers the proper properties
Diffstat (limited to 'toolkit/source/controls')
| -rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 9599a75672cf..7f09b562ccb0 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1847,12 +1847,15 @@ private: // = UnoControlListBoxModel // ===================================================================================================================== // --------------------------------------------------------------------------------------------------------------------- -UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XMultiServiceFactory >& i_factory ) +UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XMultiServiceFactory >& i_factory, ConstructorMode const i_mode ) :UnoControlListBoxModel_Base( i_factory ) ,m_pData( new UnoControlListBoxModel_Data( *this ) ) ,m_aItemListListeners( GetMutex() ) { - UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox ); + if ( i_mode == ConstructDefault ) + { + UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox ); + } } // --------------------------------------------------------------------------------------------------------------------- UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ) @@ -1870,6 +1873,7 @@ IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName { return ::rtl::OUString::createFromAscii( szServiceName_UnoControlListBoxModel ); } + // --------------------------------------------------------------------------------------------------------------------- uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { @@ -2717,7 +2721,7 @@ ItemListenerMultiplexer& UnoListBoxControl::getItemListeners() // class UnoControlComboBoxModel // ---------------------------------------------------- UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XMultiServiceFactory >& i_factory ) - :UnoControlListBoxModel( i_factory ) + :UnoControlListBoxModel( i_factory, ConstructWithoutProperties ) { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox ); } |