diff options
| author | Noel Power <noel.power@suse.com> | 2012-09-06 19:25:12 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2012-09-11 16:04:11 +0100 |
| commit | b241005c51a6705425937218e6893b4be2165128 (patch) | |
| tree | 0b276704f86e49402beb48c6f7ca47db02c7bd0d /toolkit/source/awt/vclxwindows.cxx | |
| parent | 27a19817c6271b76013aa6bda5c3353c8a9dd35b (diff) | |
make interface for scrollablity properties to allow more code sharing
Change-Id: I0e03360808e73426848820d807f741c13c76abf8
Diffstat (limited to 'toolkit/source/awt/vclxwindows.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 84 |
1 files changed, 1 insertions, 83 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 09085007b0b9..0fd3cf0c80dc 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2454,44 +2454,6 @@ throw(::com::sun::star::uno::RuntimeException) sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) { - case BASEPROPERTY_SCROLLHEIGHT: - case BASEPROPERTY_SCROLLWIDTH: - case BASEPROPERTY_SCROLLTOP: - case BASEPROPERTY_SCROLLLEFT: - { - sal_Int32 nVal =0; - Value >>= nVal; - Size aSize( nVal, nVal ); - Window* pWindow = GetWindow(); - MapMode aMode( MAP_APPFONT ); - toolkit::ScrollableDialog<Dialog>* pScrollable = dynamic_cast< toolkit::ScrollableDialog<Dialog>* >( pWindow ); - if ( pWindow && pScrollable ) - { - OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() ); - if ( !pDev ) - pDev = pWindow->GetParent(); - - aSize = pDev->LogicToPixel( aSize, aMode ); - switch ( nPropType ) - { - case BASEPROPERTY_SCROLLHEIGHT: - pScrollable->SetScrollHeight( aSize.Height() ); - break; - case BASEPROPERTY_SCROLLWIDTH: - pScrollable->SetScrollWidth( aSize.Width() ); - break; - case BASEPROPERTY_SCROLLTOP: - pScrollable->SetScrollTop( aSize.Height() ); - break; - case BASEPROPERTY_SCROLLLEFT: - pScrollable->SetScrollLeft( aSize.Width() ); - break; - default: - break; - } - } - break; - } case BASEPROPERTY_GRAPHIC: { Reference< XGraphic > xGraphic; @@ -2517,7 +2479,7 @@ throw(::com::sun::star::uno::RuntimeException) default: { - VCLXWindow::setProperty( PropertyName, Value ); + VCLXContainer::setProperty( PropertyName, Value ); } } } @@ -6694,50 +6656,6 @@ throw(::com::sun::star::uno::RuntimeException) sal_Bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; (void)bVoid; #endif - // #TODO needs to be in common container base class, - // we need a common Scrollable interface then too - sal_uInt16 nPropType = GetPropertyId( PropertyName ); - switch ( nPropType ) - { - case BASEPROPERTY_SCROLLHEIGHT: - case BASEPROPERTY_SCROLLWIDTH: - case BASEPROPERTY_SCROLLTOP: - case BASEPROPERTY_SCROLLLEFT: - { - sal_Int32 nVal =0; - Value >>= nVal; - Size aSize( nVal, nVal ); - Window* pWindow = GetWindow(); - MapMode aMode( MAP_APPFONT ); - toolkit::ScrollableDialog<GroupBox>* pScrollable = dynamic_cast< toolkit::ScrollableDialog<GroupBox>* >( pWindow ); - if ( pWindow && pScrollable ) - { - OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() ); - if ( !pDev ) - pDev = pWindow->GetParent(); - - aSize = pDev->LogicToPixel( aSize, aMode ); - switch ( nPropType ) - { - case BASEPROPERTY_SCROLLHEIGHT: - pScrollable->SetScrollHeight( aSize.Height() ); - break; - case BASEPROPERTY_SCROLLWIDTH: - pScrollable->SetScrollWidth( aSize.Width() ); - break; - case BASEPROPERTY_SCROLLTOP: - pScrollable->SetScrollTop( aSize.Height() ); - break; - case BASEPROPERTY_SCROLLLEFT: - pScrollable->SetScrollLeft( aSize.Width() ); - break; - default: - break; - } - } - break; - } - } VCLXContainer::setProperty( PropertyName, Value ); } |