diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index c857d4cc38b0..1be80eea0f70 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scrollbar.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2003-12-11 12:30:16 $ + * last change: $Author: rt $ $Date: 2004-04-02 10:56:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,9 @@ #ifndef _COMPHELPER_STREAMSECTION_HXX_ #include #endif +#ifndef _COMPHELPER_BASIC_IO_HXX_ +#include +#endif #ifndef INCLUDED_RTL_MATH_HXX #include @@ -88,7 +91,7 @@ namespace frm using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::io; - using namespace ::drafts::com::sun::star::form; + using namespace ::com::sun::star::form::binding; //==================================================================== //= helper @@ -155,7 +158,7 @@ namespace frm DBG_NAME( OScrollBarModel ) //-------------------------------------------------------------------- OScrollBarModel::OScrollBarModel( const Reference& _rxFactory ) - :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_SCROLLBAR, VCL_CONTROL_SCROLLBAR, sal_True, sal_True ) + :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_SCROLLBAR, VCL_CONTROL_SCROLLBAR, sal_True, sal_True, sal_False ) ,m_nDefaultScrollValue( 0 ) { DBG_CTOR( OScrollBarModel, NULL ); @@ -209,14 +212,11 @@ namespace frm //-------------------------------------------------------------------- void OScrollBarModel::fillProperties( Sequence< Property >& _rProps, Sequence< Property >& _rAggregateProps ) const { - FRM_BEGIN_PROP_HELPER( 6 ) - DECL_PROP2( CLASSID, sal_Int16, READONLY, TRANSIENT ); + BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) DECL_PROP1( DEFAULT_SCROLL_VALUE, sal_Int32, BOUND ); - DECL_PROP1( NAME, ::rtl::OUString, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); - DECL_PROP1( TAG, ::rtl::OUString, BOUND ); DECL_PROP2( CONTROLSOURCEPROPERTY,::rtl::OUString, READONLY, TRANSIENT ); - FRM_END_PROP_HELPER(); + END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------