summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-15 00:23:23 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-15 00:23:23 -0500
commitb87ef44ec29ede1a8989dae7ce83f14ba13bd6ad (patch)
tree28b967cc0065f09eb50fb2cf939e5bc6a5de2d0e
parentd303501fa3e31c0df86ae74f3ae4a0894f0525b6 (diff)
sligh mis-merge... was corrected during the m98 iteration, reported here.
-rwxr-xr-xscripting/source/vbaevents/eventhelper.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index c5e29c015b..2e7e1f3fda 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,