diff options
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 3 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 2 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index affd9d7659b0..3ec46c8349dc 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2445,8 +2445,9 @@ 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"); +#if SCROLLABLEFRAME rConv.convertScrollabilitySettings( rPropMap, maScrollPos, maLogicalSize, mnScrollBars ); +#endif AxContainerModelBase::convertProperties( rPropMap, rConv ); } @@ -2509,7 +2510,6 @@ 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 ); } diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 76f83158e2b2..bea6a744dc86 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -724,11 +724,13 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, break; case WINDOW_GROUPBOX: { +#if SCROLLABLEFRAME if ( bFrameControl ) { pNewWindow = new toolkit::ScrollableWrapper< GroupBox >( pParent, nWinBits | WB_VSCROLL ); } else +#endif pNewWindow = new GroupBox( pParent, nWinBits ); if ( bFrameControl ) { diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index d29f0ec8f3a7..ba6c7517ff64 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -361,9 +361,6 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons // there must be a better way than doing this, we can't // process the scrolltop & scrollleft in XDialog because // the children haven't been added when those props are applied - Reference< XPropertySet > xDlgProps( getModel(), UNO_QUERY ); - Reference< XPropertySet > xPeerProps( getPeer(), uno::UNO_QUERY ); - ImplSetPeerProperty( GetPropertyName( BASEPROPERTY_SCROLLTOP ), ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLTOP ) ) ); ImplSetPeerProperty( GetPropertyName( BASEPROPERTY_SCROLLLEFT ), ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLLEFT ) ) ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 4f638056e466..c8279a01ff22 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -124,7 +124,9 @@ void ElementDescriptor::readFrameModel( StyleBag * all_styles ) title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle ); addSubElement( title ); } +#if SCROLLABLEFRAME readScrollableSettings(); +#endif uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY ); if ( xControlContainer.is() && xControlContainer->getElementNames().getLength() ) { diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index b448d186bdc2..3b9022593a6e 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -97,7 +97,9 @@ void Frame::endElement() { xControlModel->setPropertyValue( "Label" , makeAny( _label ) ); } +#if SCROLLABLEFRAME ctx.importScollableSettings( _xAttributes ); +#endif ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) |