summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-25 11:05:55 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-25 11:05:55 +0000
commit62d4b0e1a735151c53e23d5881cd9c8d5f4f4cae (patch)
treedc83969391532e509d2f5868e18bc0d51887847b
parentcb6265d40479e0281aa8491b661cadfd8ebe7949 (diff)
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
-rw-r--r--forms/source/component/scrollbar.hxx7
-rw-r--r--forms/source/component/spinbutton.hxx7
2 files changed, 8 insertions, 6 deletions
diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx
index 28481879a..4f1249aa0 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 d7c730890..9db7a3ead 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();