From 885228d6ec30f1c945fd6649a900289f60f526ce Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 25 Jun 2008 11:05:55 +0000
Subject: [PATCH] INTEGRATION: CWS dba30d (1.9.18); FILE MERGED 2008/05/27
 12:28:03 fs 1.9.18.1: #i89657# refactoring, so that our binding's getValue is
 only called when our mutex is not locked

---
 forms/source/component/scrollbar.hxx  | 7 ++++---
 forms/source/component/spinbutton.hxx | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index 20e385c95308..d6afd4811de6 100644
--- a/forms/source/component/scrollbar.hxx
+++ b/forms/source/component/scrollbar.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: scrollbar.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -82,11 +82,12 @@ namespace frm
         virtual ::com::sun::star::uno::Any
                                 getDefaultForReset() const;
 
+        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        approveValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding );
 
         // XCoponent and related helpers
         virtual void SAL_CALL disposing();
diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx
index 56facd702e17..fa26107dd4d7 100644
--- a/forms/source/component/spinbutton.hxx
+++ b/forms/source/component/spinbutton.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: spinbutton.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -82,11 +82,12 @@ namespace frm
         virtual ::com::sun::star::uno::Any
                                 getDefaultForReset() const;
 
+        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        approveValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding );
 
         // XCoponent and related helpers
         virtual void SAL_CALL disposing();