diff options
| author | Noel Power <noel.power@suse.com> | 2013-05-03 15:14:26 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-05-07 09:56:27 +0100 |
| commit | fdc14139b235b3695a67e073a20e65392ebf1f2f (patch) | |
| tree | eb5e2b4ea986ff63c5ddfd8baf9ddb463566f57f | |
| parent | 247fbd7db291e5e193a27ed0f0629e32c17023e0 (diff) | |
fix userform data aware control import
Change-Id: I86f5cc0c60bba48eaaf40a3471cc0fb22e5e4b9c
| -rw-r--r-- | include/oox/ole/vbacontrol.hxx | 3 | ||||
| -rw-r--r-- | oox/source/ole/vbacontrol.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 0de80153baed..e31ee4312f29 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -73,7 +73,8 @@ public: const ControlConverter& rConv, ApiControlType eCtrlType, sal_Int32 nCtrlIndex ) const; - + inline ::rtl::OUString getControlSource() { return maControlSource; } + inline ::rtl::OUString getRowSource() { return maRowSource; } protected: OUString maName; ///< Name of the control. OUString maTag; ///< User defined tag. diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 073f64e676a5..6ce66159c78c 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -493,6 +493,7 @@ bool VbaFormControl::convertProperties( const Reference< XControlModel >& rxCtrl // convert all properties PropertyMap aPropMap; mxSiteModel->convertProperties( aPropMap, rConv, mxCtrlModel->getControlType(), nCtrlIndex ); + rConv.bindToSources( rxCtrlModel, mxSiteModel->getControlSource(), mxSiteModel->getRowSource() ); mxCtrlModel->convertProperties( aPropMap, rConv ); mxCtrlModel->convertSize( aPropMap, rConv ); PropertySet aPropSet( rxCtrlModel ); |