[Libreoffice-commits] .: Branch 'integration/dev300_m101' - scripting/source

[Norbert Thiebaud]

 scripting/source/vbaevents/eventhelper.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b87ef44ec29ede1a8989dae7ce83f14ba13bd6ad
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 15 00:23:23 2011 -0500

    sligh mis-merge... was corrected during the m98 iteration, reported here.

diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index c5e29c0..2e7e1f3 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,