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

---
 forms/source/component/refvaluecomponent.hxx | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'forms')

diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx
index 4ceb7d8aa487..856c53572432 100644
--- a/forms/source/component/refvaluecomponent.hxx
+++ b/forms/source/component/refvaluecomponent.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: refvaluecomponent.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -59,15 +59,6 @@ namespace frm
 
         sal_Bool            m_bSupportSecondRefValue;       // do we support the SecondaryRefValue property?
 
-        /** type how we should transfer our selection to external value bindings
-        */
-        enum ValueExchangeType
-        {
-            eString,
-            eBoolean
-        };
-        ValueExchangeType   m_eValueExchangeType;
-
     protected:
         const ::rtl::OUString& getReferenceValue() const { return m_sReferenceValue; }
         void                   setReferenceValue( const ::rtl::OUString& _rRefValue );
@@ -100,11 +91,10 @@ namespace frm
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
         // OBoundControlModel overridables
-        virtual void            onConnectedExternalValue( );
-        virtual sal_Bool        approveValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding );
-
+        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;
 
@@ -113,11 +103,6 @@ namespace frm
 
         virtual ::com::sun::star::uno::Any
                                 getDefaultForReset() const;
-
-    private:
-        /** calculates the data type we need to use to exchange values with external bindings
-        */
-        void    calcValueExchangeType();
     };
 
 //........................................................................
-- 
cgit v1.2.1