diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-10-27 19:31:50 +0300 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-10-28 16:12:27 +0000 |
| commit | b41e7b817e1e214582505d28d0cc36d741fa9979 (patch) | |
| tree | 7911fda0bcc92d763c527ffe9d3b44a54d27daed /oox | |
| parent | eef81dd68fe7a09946ef062eff041f4b3f523e28 (diff) | |
tdf#63846 assign macros after VBA project fully loaded.
fixes regression caused by d4743045a0b320449d07a957463a76bb8b13f939.
see the documentation for VbaMacroAttacherBase, which indicates that
the macros are to be attached after all objects are finished loading.
Made attachMacros() public so it could be called separately since so
many things are inter-dependent in the logic flow.
Change-Id: I11f7f4a1a75d6f77a97e12e3359d6ea8a995f518
Reviewed-on: https://gerrit.libreoffice.org/30337
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/vbaproject.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 54711172fa98..e71669600647 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -253,6 +253,8 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap { readVbaModules( rVbaPrjStrg ); importModulesAndForms(rVbaPrjStrg, rGraphicHelper ); + // attach macros to registered objects + attachMacros(); } void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg ) @@ -502,9 +504,6 @@ void VbaProject::importModulesAndForms( StorageBase& rVbaPrjStrg, const GraphicH } } } - - // attach macros to registered objects - attachMacros(); } void VbaProject::attachMacros() |