summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 10:59:42 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 10:59:42 +0000
commit3dc99680be23342758974d2fb5e1c76cc0c97055 (patch)
tree9d7f2e3e2b5ca7cf82656569bc05ed333e26841c
parentf6cdba3b7ac3f8a056c0df592c0b964250e6f4d5 (diff)
INTEGRATION: CWS dba30d (1.23.4); FILE MERGED
2008/05/27 12:28:02 fs 1.23.4.1: #i89657# refactoring, so that our binding's getValue is only called when our mutex is not locked
-rw-r--r--forms/source/component/ListBox.hxx22
1 files changed, 5 insertions, 17 deletions
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 72fc967fd20f..16fe8cd4482b 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ListBox.hxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
* This file is part of OpenOffice.org.
*
@@ -88,17 +88,6 @@ class OListBoxModel :public OBoundControlModel
sal_Int16 m_nNULLPos; // position of the NULL value in our list
sal_Bool m_bBoundComponent : 1;
- /** type how we should transfer our selection to external value bindings
- */
- enum TransferSelection
- {
- tsIndexList, /// as list of indexes of selected entries
- tsIndex, /// as index of the selected entry
- tsEntryList, /// as list of string representations of selected entries
- tsEntry /// as string representation of the selected entry
- };
- TransferSelection m_eTransferSelectionAs;
-
private:
// Helper functions
StringSequence GetCurValueSeq() const;
@@ -157,26 +146,25 @@ protected:
// OBoundControlModel overridables
virtual ::com::sun::star::uno::Any
translateDbColumnToControlValue( );
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
+ getSupportedBindingTypes();
virtual ::com::sun::star::uno::Any
- translateExternalValueToControlValue( ) const;
+ translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const;
virtual ::com::sun::star::uno::Any
translateControlValueToExternalValue( ) const;
virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset );
virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
virtual void onDisconnectedDbColumn();
- virtual void onConnectedExternalValue( );
virtual ::com::sun::star::uno::Any
getDefaultForReset() const;
- virtual sal_Bool approveValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding );
-
virtual ::com::sun::star::uno::Any
getCurrentFormComponentValue() const;
// OEntryListHelper overriables
- virtual void stringItemListChanged( );
+ virtual void stringItemListChanged( ::osl::ResettableMutexGuard& _rInstanceLock );
virtual void connectedExternalListSource( );
virtual void disconnectedExternalListSource( );
virtual void refreshInternalEntryList();