diff options
| author | Noel Power <noel.power@suse.com> | 2012-09-07 12:17:31 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2012-09-11 16:04:11 +0100 |
| commit | 67adc642765862c6609914a0131a18967538b81c (patch) | |
| tree | 220c982d6d107a9912d225abb59bbbbf98f92f40 /oox | |
| parent | b241005c51a6705425937218e6893b4be2165128 (diff) | |
fixed the unable to close dialog when vert scrollbars set
Change-Id: If15a2b7312577a8285dc1ab1dea1ccb7c4824ed6
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 89570b933a0e..cba97f575e23 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -328,6 +328,7 @@ void ControlConverter::convertScrollabilitySettings( PropertyMap& rPropMap, rPropMap.setProperty( PROP_ScrollLeft, tmpPos.X ); rPropMap.setProperty( PROP_HScroll, ( nScrollBars & 0x1 ) == 0x1 ); rPropMap.setProperty( PROP_VScroll, ( nScrollBars & 0x2 ) == 0x2 ); + printf("** imported hscroll %d vscroll %d\n", ( nScrollBars & 0x1 ) == 0x1, ( nScrollBars & 0x2 ) == 0x2); } void ControlConverter::convertScrollBar( PropertyMap& rPropMap, @@ -2445,6 +2446,7 @@ void AxFrameModel::convertProperties( PropertyMap& rPropMap, const ControlConver { rPropMap.setProperty( PROP_Label, maCaption ); rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) ); + printf("Frame, converting scroll bits\n"); rConv.convertScrollabilitySettings( rPropMap, maScrollPos, maLogicalSize, mnScrollBars ); AxContainerModelBase::convertProperties( rPropMap, rConv ); } @@ -2508,6 +2510,7 @@ void AxUserFormModel::convertProperties( PropertyMap& rPropMap, const ControlCon rPropMap.setProperty( PROP_Title, maCaption ); rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor ); rConv.convertAxPicture( rPropMap, maPictureData, AX_PICPOS_CENTER ); + printf("UserForm, converting scroll bits\n"); rConv.convertScrollabilitySettings( rPropMap, maScrollPos, maLogicalSize, mnScrollBars ); AxContainerModelBase::convertProperties( rPropMap, rConv ); } |