diff options
| author | Noel Power <noel.power@suse.com> | 2013-04-25 15:37:22 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-04-26 15:30:36 +0100 |
| commit | cdb7217a0fa82edd13f8c532f2d66215f382f673 (patch) | |
| tree | 4aa28f7c031ca6a0a9a4028966775a46e8a134fe /oox | |
| parent | 0de977ff6067cf8c7cc8fe7e279eaaf849f10446 (diff) | |
fix userform data aware control import
Change-Id: I5b958f8760c38793344c2c573e1cef97a0b6e3e9
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/ole/vbacontrol.hxx | 3 | ||||
| -rw-r--r-- | oox/source/ole/vbacontrol.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx index b9f3975d5e37..25421002c430 100644 --- a/oox/inc/oox/ole/vbacontrol.hxx +++ b/oox/inc/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: ::rtl::OUString maName; ///< Name of the control. ::rtl::OUString maTag; ///< User defined tag. diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 91b0ac631e25..7146327b52b2 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 ); |