mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix userform data aware control import

Browse Source 
Change-Id: I86f5cc0c60bba48eaaf40a3471cc0fb22e5e4b9c
This commit is contained in:
Noel Power
2013-05-03 15:14:26 +01:00
parent f1c6bebcad
commit 880da6c7b7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/oox/ole/vbacontrol.hxx
View File

@@ -73,7 +73,8 @@ public:
const ControlConverter& rConv, const ControlConverter& rConv,
ApiControlType eCtrlType, ApiControlType eCtrlType,
sal_Int32 nCtrlIndex ) const; sal_Int32 nCtrlIndex ) const;
inline ::rtl::OUString getControlSource() { return maControlSource; }
inline ::rtl::OUString getRowSource() { return maRowSource; }
protected: protected:
OUString maName; ///< Name of the control. OUString maName; ///< Name of the control.
OUString maTag; ///< User defined tag. OUString maTag; ///< User defined tag.

1
oox/source/ole/vbacontrol.cxx
View File

@@ -493,6 +493,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl
// convert all properties // convert all properties
PropertyMap aPropMap; PropertyMap aPropMap;
mxSiteModel->convertProperties( aPropMap, rConv, mxCtrlModel->getControlType(), nCtrlIndex ); mxSiteModel->convertProperties( aPropMap, rConv, mxCtrlModel->getControlType(), nCtrlIndex );
rConv.bindToSources( rxCtrlModel, mxSiteModel->getControlSource(), mxSiteModel->getRowSource() );
mxCtrlModel->convertProperties( aPropMap, rConv ); mxCtrlModel->convertProperties( aPropMap, rConv );
mxCtrlModel->convertSize( aPropMap, rConv ); mxCtrlModel->convertSize( aPropMap, rConv );
PropertySet aPropSet( rxCtrlModel ); PropertySet aPropSet( rxCtrlModel );