diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-15 00:23:23 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-15 00:23:23 -0500 |
| commit | fcc66077e2176b8bfc0908034eefefcf0f3bcf3d (patch) | |
| tree | 991a37fcfed4257bd075670848cbab0f65e7c6d4 /scripting/source | |
| parent | fd8bbb1294392afe70d08cb633f060bd035a58e6 (diff) | |
sligh mis-merge... was corrected during the m98 iteration, reported here.
Diffstat (limited to 'scripting/source')
| -rwxr-xr-x | scripting/source/vbaevents/eventhelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index b9ee8b3216c4..f6884cedfbe7 100755 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -1027,8 +1027,8 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce OSL_TRACE("*** trying to invoke %s ", rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() ); - ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); - if ( aMacroResolvedInfo.IsResolved() ) + ooo::vba::MacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); + if ( aMacroResolvedInfo.mbFound ) { if (! txInfo->ApproveRule(evt, txInfo->pPara) ) @@ -1047,7 +1047,7 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce // call basic event handlers for event // create script url - rtl::OUString url = aMacroResolvedInfo.ResolvedMacro(); + rtl::OUString url = aMacroResolvedInfo.msResolvedMacro; OSL_TRACE("resolved script = %s", rtl::OUStringToOString( url, |