summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 10:52:19 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 10:52:19 +0000
commita6160da75e6c552bd0e5ab9491d4d4c82631515b (patch)
treee879fe5d96f408bfe90a59c06634be23f368600e /forms
parentaccc5421e6a4fa5a6f6ece42125834fcffb7e768 (diff)
INTEGRATION: CWS dba30d (1.14.4); FILE MERGED
2008/05/27 12:28:02 fs 1.14.4.1: #i89657# refactoring, so that our binding's getValue is only called when our mutex is not locked
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/ComboBox.hxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 0adb75645c31..c4d8846311b2 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ComboBox.hxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -145,10 +145,8 @@ protected:
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 );
-
// OEntryListHelper overriables
- virtual void stringItemListChanged( );
+ virtual void stringItemListChanged( ::osl::ResettableMutexGuard& _rInstanceLock );
virtual void connectedExternalListSource( );
virtual void disconnectedExternalListSource( );
virtual void refreshInternalEntryList();