?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
update ooo310-m15
[ooovba.git] / applied_patches / 0441-vba-fixup-macrosearch.diff
blob58b92599a881b5978c48592048f2ddb764f36e61
1 diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
2 index 2109a0a..88eb9d0 100644
3 --- sc/source/filter/excel/xlescher.cxx
4 +++ sc/source/filter/excel/xlescher.cxx
5 @@ -45,6 +45,7 @@
6 #include <basic/sbmod.hxx>
7 #include <basic/sbmeth.hxx>
8 #include <basic/basmgr.hxx>
9 +#include <svx/msvbahelper.hxx>
10
11 using ::rtl::OUString;
12 using ::com::sun::star::uno::Reference;
13 @@ -306,7 +307,6 @@ Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape
14 }
15
16 #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard."
17 -#define EXC_MACRO_SCHEME "vnd.sun.star.script:"
18 #define EXC_MACRONAME_SUF "?language=Basic&location=document"
19
20 OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
21 @@ -314,27 +314,10 @@ OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjec
22 String sTmp( rXclMacroName );
23 if( rXclMacroName.Len() > 0 )
24 {
25 - String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
26 + ooo::vba::VBAMacroResolvedInfo aMacro = ooo::vba::resolveVBAMacro( pDocShell, rXclMacroName, false );
27 + if ( aMacro.IsResolved() )
28 + return ooo::vba::makeMacroURL( aMacro.ResolvedMacro() );
29
30 - if ( pDocShell && pDocShell->GetBasicManager()->GetName().Len() > 0 )
31 - sProjectName = pDocShell->GetBasicManager()->GetName();
32 -
33 - if ( ( sTmp.Search( '.' ) == STRING_NOTFOUND) && pDocShell )
34 - {
35 - if( StarBASIC* pBasic = pDocShell->GetBasicManager()->GetLib( sProjectName ) )
36 - {
37 - if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sTmp, SbxCLASS_METHOD ) ) )
38 - {
39 - if( SbModule* pModule = pMethod->GetModule() )
40 - {
41 - sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 );
42 - }
43 - }
44 - }
45 - }
46 - sProjectName.Append( '.' );
47 - sTmp.Insert( sProjectName, 0 );
48 - return CREATE_OUSTRING( EXC_MACRO_SCHEME ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
49 }
50 return OUString();
51 }
52 diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
53 index af78648..16a1c03 100644
54 --- sc/source/ui/unoobj/docuno.cxx
55 +++ sc/source/ui/unoobj/docuno.cxx
56 @@ -1793,6 +1793,12 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
57 return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
58 }
59
60 + if ( rId.getLength() == 16 &&
61 + 0 == rtl_compareMemory( SfxObjectShell::getUnoTunnelId().getConstArray(),
62 + rId.getConstArray(), 16 ) )
63 + {
64 + return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
65 + }
66 // aggregated number formats supplier has XUnoTunnel, too
67 // interface from aggregated object must be obtained via queryAggregation
68
69 diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx
70 index 3948ac6..36e1115 100644
71 --- sc/source/ui/vba/vbaeventshelper.cxx
72 +++ sc/source/ui/vba/vbaeventshelper.cxx
73 @@ -614,8 +614,8 @@ rtl::OUString
74 ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
75 {
76 SfxObjectShell* pShell = pDoc->GetDocumentShell();
77 - rtl::OUString sMacroPath;
78 - rtl::OUString sMacroName = getEventName( nEventId );
79 + String sMacroName = getEventName( nEventId );
80 + VBAMacroResolvedInfo sMacroResolvedInfo;
81 switch( nEventId )
82 {
83 // Worksheet
84 @@ -629,8 +629,9 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
85 case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE :
86 case VBAEVENT_WORKSHEET_SELECTIONCHANGE :
87 {
88 - rtl::OUString aSheetModuleName = getSheetModuleName( nTab );
89 - sMacroPath = findVBAMacro( pShell, aSheetModuleName, sMacroName );
90 + String aSheetModuleName = getSheetModuleName( nTab );
91 + sMacroName.Insert( '.', 0 ).Insert( aSheetModuleName, 0);
92 + sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
93 break;
94 }
95 // Workbook
96 @@ -664,13 +665,14 @@ ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
97 sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
98 }
99
100 - sMacroPath = findVBAMacro( pShell, sWorkbookModuleName, sMacroName );
101 + sMacroName.Insert( '.', 0 ).Insert( sWorkbookModuleName, 0);
102 + sMacroResolvedInfo = resolveVBAMacro( pShell, sMacroName );
103 break;
104 }
105 default:
106 break;
107 }
108 - return sMacroPath;
109 + return sMacroResolvedInfo.ResolvedMacro();
110 }
111
112 sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs, const SCTAB nTab )
113 @@ -681,6 +683,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
114 sal_Bool bCancel = sal_False;
115 uno::Sequence< uno::Any > aArgs;
116 uno::Any aRet;
117 + uno::Any aDummyCaller;
118
119 // For most cases, there is no corresponsible event macro in the document.
120 // It is better fo check if the event macro exists before process the arguments to improve performance.
121 @@ -777,7 +780,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
122 // process Cancel argument
123 aArgs = uno::Sequence< uno::Any >(1);
124 aArgs[0] <<= bCancel;
125 - executeMacro( pShell, sMacroPath, aArgs, aRet );
126 + executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
127 aArgs[0] >>= bCancel;
128 return bCancel;
129 }
130 @@ -787,7 +790,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
131 aArgs = uno::Sequence< uno::Any >(2);
132 aArgs[0] = rArgs[0];
133 aArgs[1] <<= bCancel;
134 - executeMacro( pShell, sMacroPath, aArgs, aRet );
135 + executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
136 aArgs[1] >>= bCancel;
137 return bCancel;
138 }
139 @@ -805,7 +808,7 @@ sal_Bool ScVbaEventsHelper::processVbaEvent( const sal_Int32 nEventId, const uno
140 }
141
142 // excute the macro
143 - result = executeMacro( pShell, sMacroPath, aArgs, aRet );
144 + result = executeMacro( pShell, sMacroPath, aArgs, aRet, aDummyCaller );
145 }
146
147 return result;
148 diff --git scripting/prj/build.lst scripting/prj/build.lst
149 index fc33238..f216009 100644
150 --- scripting/prj/build.lst
151 +++ scripting/prj/build.lst
152 @@ -1,4 +1,4 @@
153 -tc scripting : oovbaapi bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
154 +tc scripting : oovbaapi svx bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
155 tc scripting usr1 - all tc1_mkout NULL
156 tc scripting\inc nmake - all tc1_inc NULL
157 tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL
158 diff --git scripting/source/vbaevents/eventhelper.cxx scripting/source/vbaevents/eventhelper.cxx
159 index 84dc900..f85ac51 100644
160 --- scripting/source/vbaevents/eventhelper.cxx
161 +++ scripting/source/vbaevents/eventhelper.cxx
162 @@ -35,14 +35,11 @@
163 #include <basic/sbmeth.hxx>
164 #include <basic/sbmod.hxx>
165 #include <basic/sbx.hxx>
166 -
167 -
168 -
169 +#include <svx/msvbahelper.hxx>
170
171 // for debug
172 #include <comphelper/anytostring.hxx>
173
174 -
175 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
176 #include <com/sun/star/script/XScriptListener.hpp>
177 #include <cppuhelper/implbase1.hxx>
178 @@ -771,7 +768,7 @@ EventListener::getPropertySetInfo( ) throw (RuntimeException)
179 // EventListener
180
181 void
182 -EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(RuntimeException)
183 +EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeException)
184 {
185 OSL_TRACE("EventListener::firing_Impl( FAKE VBA_EVENTS )");
186 static const ::rtl::OUString vbaInterOp =
187 @@ -842,22 +839,16 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
188 sMacroLoc = sMacroLoc.concat( sScriptCode ).concat( rtl::OUString::createFromAscii(".") );
189
190 OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
191 -
192 - // find library
193 - pBasic = pBasicManager->GetLib( sProject );
194 -
195 - SbModule* pModule = pBasic ? pBasic->FindModule( sScriptCode ) : NULL;
196 -
197 - for ( ; pModule && txInfo != txInfo_end; ++txInfo )
198 + for ( ; txInfo != txInfo_end; ++txInfo )
199 {
200 + rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName );
201 // see if we have a match for the handlerextension
202 // where ScriptCode is methodname_handlerextension
203 - rtl::OUString sTemp = sName.concat( (*txInfo).sVBAName );
204 -
205 + rtl::OUString sToResolve = sMacroLoc.concat( sTemp );
206 OSL_TRACE("*** trying to invoke %s ",
207 - rtl::OUStringToOString( sTemp, RTL_TEXTENCODING_UTF8 ).getStr() );
208 - SbMethod* pMeth = static_cast< SbMethod* >( pModule->Find( sTemp, SbxCLASS_METHOD ) );
209 - if ( pMeth )
210 + rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
211 + ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
212 + if ( aMacroResolvedInfo.IsResolved() )
213 {
214 // !! translate arguments & emulate events where necessary
215 Sequence< Any > aArguments;
216 @@ -869,31 +860,22 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* /*pRet*/ ) throw(Runtime
217 {
218 // call basic event handlers for event
219
220 - static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
221 - static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
222 -
223 // create script url
224 - rtl::OUString url = part1 + sMacroLoc + sTemp + part2;
225 + rtl::OUString url = aMacroResolvedInfo.ResolvedMacro();
226
227 - OSL_TRACE("script url = %s",
228 + OSL_TRACE("resolved script = %s",
229 rtl::OUStringToOString( url,
230 RTL_TEXTENCODING_UTF8 ).getStr() );
231 - Sequence< sal_Int16 > aOutArgsIndex;
232 - Sequence< Any > aOutArgs;
233 try
234 {
235 - uno::Reference< script::provider::XScript > xScript = xScriptProvider->getScript( url );
236 - if ( xScript.is() )
237 - {
238 - uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
239 - if ( xProps.is() )
240 - {
241 - Sequence< Any > aCallerHack(1);
242 - aCallerHack[ 0 ] = uno::makeAny( rtl::OUString::createFromAscii("Error") );
243 - xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
244 - }
245 - xScript->invoke( aArguments, aOutArgsIndex, aOutArgs );
246 - }
247 + uno::Any aDummyCaller = uno::makeAny( rtl::OUString::createFromAscii("Error") );
248 + if ( pRet )
249 + ooo::vba::executeMacro( mpShell, url, aArguments, *pRet, aDummyCaller );
250 + else
251 + {
252 + uno::Any aRet;
253 + ooo::vba::executeMacro( mpShell, url, aArguments, aRet, aDummyCaller );
254 + }
255 }
256 catch ( uno::Exception& e )
257 {
258 diff --git scripting/source/vbaevents/makefile.mk scripting/source/vbaevents/makefile.mk
259 index eabb67e..96f4e3d 100644
260 --- scripting/source/vbaevents/makefile.mk
261 +++ scripting/source/vbaevents/makefile.mk
262 @@ -46,6 +46,7 @@ SHL1STDLIBS= \
263 $(BASICLIB) \
264 $(COMPHELPERLIB) \
265 $(SFXLIB) \
266 + $(SVXMSFILTERLIB) \
267 $(CPPULIB) \
268 $(TOOLSLIB) \
269 $(SALLIB)
270 diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx
271 index c65280b..3f2d197 100644
272 --- sfx2/inc/sfx2/objsh.hxx
273 +++ sfx2/inc/sfx2/objsh.hxx
274 @@ -265,6 +265,7 @@ public:
275 TYPEINFO();
276 SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH)
277
278 + static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
279 /* Stampit disable/enable cancel button for print jobs
280 default = true = enable! */
281 void Stamp_SetPrintCancelState(sal_Bool bState);
282 @@ -885,6 +886,7 @@ public:
283 virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
284 SfxObjectShell* GetObjectShell() const
285 { return pObjSh; }
286 +
287 };
288
289 #endif
290 diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
291 index d16f0c8..dd4f044 100644
292 --- sfx2/source/doc/objserv.cxx
293 +++ sfx2/source/doc/objserv.cxx
294 @@ -1480,3 +1480,19 @@ void SfxObjectShell::SignScriptingContent()
295 ImplSign( TRUE );
296 }
297
298 +// static
299 +const uno::Sequence<sal_Int8>& SfxObjectShell::getUnoTunnelId()
300 +{
301 + static uno::Sequence<sal_Int8> * pSeq = 0;
302 + if( !pSeq )
303 + {
304 + osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
305 + if( !pSeq )
306 + {
307 + static uno::Sequence< sal_Int8 > aSeq( 16 );
308 + rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
309 + pSeq = &aSeq;
310 + }
311 + }
312 + return *pSeq;
313 +}
314 diff --git svx/inc/svx/mstoolbar.hxx svx/inc/svx/mstoolbar.hxx
315 index b3667a8..5d76eaf 100644
316 --- svx/inc/svx/mstoolbar.hxx
317 +++ svx/inc/svx/mstoolbar.hxx
318 @@ -55,6 +55,7 @@ public:
319 void applyIcons();
320 rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
321 rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
322 + SfxObjectShell& GetDocShell() { return mrDocSh; }
323 };
324
325 class SVX_DLLPUBLIC TBBase
326 diff --git svx/inc/svx/msvbahelper.hxx svx/inc/svx/msvbahelper.hxx
327 index 8be6901..294f26e 100644
328 --- svx/inc/svx/msvbahelper.hxx
329 +++ svx/inc/svx/msvbahelper.hxx
330 @@ -35,9 +35,24 @@
331
332 namespace ooo { namespace vba
333 {
334 + class SVX_DLLPUBLIC VBAMacroResolvedInfo
335 + {
336 + SfxObjectShell* mpDocContext;
337 + bool mbFound;
338 + String msResolvedMacro;
339 + public:
340 + VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
341 + void SetResolved( bool bRes ) { mbFound = bRes; }
342 + bool IsResolved() { return mbFound; }
343 + void SetMacroDocContext(SfxObjectShell* pShell ) { mpDocContext = pShell; }
344 + SfxObjectShell* MacroDocContext() { return mpDocContext; }
345 + String ResolvedMacro() { return msResolvedMacro; }
346 + void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
347 + };
348 +
349 SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
350 - SVX_DLLPUBLIC String findVBAMacro( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
351 - SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet );
352 + SVX_DLLPUBLIC VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
353 + SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
354 } }
355
356 #endif
357 diff --git svx/inc/svxmsbas.hxx svx/inc/svxmsbas.hxx
358 index a777795..fab5faf 100644
359 --- svx/inc/svxmsbas.hxx
360 +++ svx/inc/svxmsbas.hxx
361 @@ -91,6 +91,7 @@ public:
362 static ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
363
364 static String GetMSBasicStorageName();
365 + rtl::OUString GetVBAProjectName() { return msProjectName; }
366 private:
367 SotStorageRef xRoot;
368 SfxObjectShell &rDocSh;
369 diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx
370 index 9579db7..fa66fe5 100644
371 --- svx/source/msfilter/mstoolbar.cxx
372 +++ svx/source/msfilter/mstoolbar.cxx
373 @@ -12,6 +12,7 @@
374 #include <basic/basmgr.hxx>
375 #include <svtools/filterutils.hxx>
376 #include <boost/scoped_array.hpp>
377 +#include <svx/msvbahelper.hxx>
378
379 int TBBase::nIndent = 0;
380
381 @@ -67,16 +68,8 @@ CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
382 //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"
383 static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
384 static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
385 - rtl::OUString sProject( RTL_CONSTASCII_USTRINGPARAM("Standard") );
386 - if ( mrDocSh.GetBasicManager()->GetName().Len() )
387 - sProject = mrDocSh.GetBasicManager()->GetName();
388 - sProject += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") );
389 -
390 - // #TODO #FIXME a script can also be loosly defined ( e.g. with no module
391 - // spec )
392 -
393 // create script url
394 - rtl::OUString scriptURL = scheme + sProject + sCmd + part2;
395 + rtl::OUString scriptURL = scheme + sCmd + part2;
396 return uno::makeAny( scriptURL );
397 }
398
399 @@ -377,7 +370,9 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
400 if ( extraInfo.getOnAction().getLength() )
401 {
402 aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
403 - aProp.Value = helper.createCommandFromMacro( extraInfo.getOnAction() );
404 + ooo::vba::VBAMacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true );
405 + if ( aMacroInf.IsResolved() )
406 + aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
407 sControlData.push_back( aProp );
408 }
409
410 @@ -390,7 +385,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
411 sControlData.push_back( aProp );
412
413 aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HelpURL") );
414 - aProp.Value = uno::makeAny( helper.createCommandFromMacro( tooltip.getString() ) );
415 + aProp.Value = uno::makeAny( tooltip.getString() );
416 sControlData.push_back( aProp );
417
418 // #TODO find out what is the property for tooltip?
419 diff --git svx/source/msfilter/msvbahelper.cxx svx/source/msfilter/msvbahelper.cxx
420 index 5875cf7..d02746f 100644
421 --- svx/source/msfilter/msvbahelper.cxx
422 +++ svx/source/msfilter/msvbahelper.cxx
423 @@ -34,6 +34,11 @@
424 #include <basic/basmgr.hxx>
425 #include <basic/sbmod.hxx>
426 #include <basic/sbmeth.hxx>
427 +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
428 +#include <com/sun/star/document/XDocumentProperties.hpp>
429 +#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
430 +#include <tools/urlobj.hxx>
431 +#include <osl/file.hxx>
432
433 using namespace ::com::sun::star;
434
435 @@ -44,91 +49,335 @@ namespace ooo { namespace vba {
436
437 String makeMacroURL( const String& sMacroName )
438 {
439 - return sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart1 ) ;
440 + return sUrlPart0.concat( sMacroName ).concat( sUrlPart1 ) ;
441 }
442
443 -String findVBAMacro( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
444 +SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
445 {
446 - String sFullName;
447 - // would use the script provider to see if the macro exists but
448 - // called at this stage tdoc content handler stuff is not set up
449 - // so it fails
450 -
451 - String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
452 - BasicManager* pBasicMgr = pShell-> GetBasicManager();
453 - if ( pBasicMgr )
454 - {
455 - if ( pBasicMgr->GetName().Len() )
456 - sLibrary = pBasicMgr->GetName();
457 - StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
458 - if ( !pBasic )
459 - {
460 - USHORT nId = pBasicMgr->GetLibId( sLibrary );
461 - pBasicMgr->LoadLib( nId );
462 - pBasic = pBasicMgr->GetLib( sLibrary );
463 - }
464 - if ( pBasic )
465 - {
466 - if ( sMod.Len() ) // we wish to find the macro is a specific module
467 - {
468 - SbModule* pModule = pBasic->FindModule( sMod );
469 - if ( pModule )
470 - {
471 - SbxArray* pMethods = pModule->GetMethods();
472 - if ( pMethods )
473 - {
474 - SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
475 - if ( pMethod )
476 - {
477 - sFullName = sMacro;
478 - sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
479 - }
480 - }
481 - }
482 - }
483 - else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
484 - {
485 - if( SbModule* pModule = pMethod->GetModule() )
486 - {
487 - sFullName = sMacro;
488 - sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
489 - }
490 - }
491 -
492 - }
493 - }
494 - return sFullName;
495 + SfxObjectShell* pFoundShell=NULL;
496 + SfxObjectShell* pShell = SfxObjectShell::GetFirst();
497 + INetURLObject aObj;
498 + aObj.SetURL( sMacroURLOrPath );
499 + bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
500 + rtl::OUString aURL;
501 + if ( bIsURL )
502 + aURL = sMacroURLOrPath;
503 + else
504 + {
505 + osl::FileBase::getFileURLFromSystemPath( sMacroURLOrPath, aURL );
506 + aObj.SetURL( aURL );
507 + }
508 + OSL_TRACE("Trying to find shell for url %s", rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr() );
509 + while ( pShell )
510 + {
511 +
512 + uno::Reference< frame::XModel > xModel = pShell->GetModel();
513 + // are we searching for a template? if so we have to cater for the
514 + // fact that in openoffice a document opened from a template is always
515 + // a new document :/
516 + if ( xModel.is() )
517 + {
518 + OSL_TRACE("shell 0x%x has model with url %s and we look for %s", pShell
519 + , rtl::OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr()
520 + , rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr()
521 + );
522 + if ( sMacroURLOrPath.endsWithIgnoreAsciiCaseAsciiL( ".dot", 4 ) )
523 + {
524 + uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( xModel, uno::UNO_QUERY );
525 + if( xDocInfoSupp.is() )
526 + {
527 + uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
528 + uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
529 + rtl::OUString sCurrName = xDocProps->getTemplateName();
530 + if( sMacroURLOrPath.lastIndexOf( sCurrName ) >= 0 )
531 + {
532 + pFoundShell = pShell;
533 + break;
534 + }
535 + }
536 + }
537 + else
538 + {
539 + if ( aURL.equals( xModel->getURL() ) )
540 + {
541 + pFoundShell = pShell;
542 + break;
543 + }
544 + }
545 + }
546 + pShell = SfxObjectShell::GetNext( *pShell );
547 + }
548 + return pFoundShell;
549 }
550
551 -// Treat the args as possible inouts ( convertion at bottom of method )
552 -sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet )
553 +// sMod can be empty ( but we really need the library to search in )
554 +// if sMod is empty and a macro is found then sMod is updated
555 +bool hasMacro( SfxObjectShell* pShell, const String& sLibrary, String& sMod, const String& sMacro )
556 +{
557 + bool bFound = false;
558 + if ( sLibrary.Len() && sMacro.Len() )
559 + {
560 + OSL_TRACE("** Searching for %s.%s in library %s"
561 + ,rtl::OUStringToOString( sMod, RTL_TEXTENCODING_UTF8 ).getStr()
562 + ,rtl::OUStringToOString( sMacro, RTL_TEXTENCODING_UTF8 ).getStr()
563 + ,rtl::OUStringToOString( sLibrary, RTL_TEXTENCODING_UTF8 ).getStr() );
564 + BasicManager* pBasicMgr = pShell-> GetBasicManager();
565 + if ( pBasicMgr )
566 + {
567 + StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
568 + if ( !pBasic )
569 + {
570 + USHORT nId = pBasicMgr->GetLibId( sLibrary );
571 + pBasicMgr->LoadLib( nId );
572 + pBasic = pBasicMgr->GetLib( sLibrary );
573 + }
574 + if ( pBasic )
575 + {
576 + if ( sMod.Len() ) // we wish to find the macro is a specific module
577 + {
578 + SbModule* pModule = pBasic->FindModule( sMod );
579 + if ( pModule )
580 + {
581 + SbxArray* pMethods = pModule->GetMethods();
582 + if ( pMethods )
583 + {
584 + SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
585 + if ( pMethod )
586 + bFound = true;
587 + }
588 + }
589 + }
590 + else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
591 + {
592 + if( SbModule* pModule = pMethod->GetModule() )
593 + {
594 + sMod = pModule->GetName();
595 + bFound = true;
596 + }
597 + }
598 + }
599 + }
600 + }
601 + return bFound;
602 +}
603 +void parseMacro( const rtl::OUString& sMacro, String& sContainer, String& sModule, String& sProcedure )
604 {
605 - // until ObjectModules ( and persisting of codenames ) is supported, if this is a
606 - // document saved from XL then we won't be able to determine the codename for the Workbook
607 - // Module, so... we have no choice but to search all modules for the moment, thus the macro
608 - // passed in should be the fully specified name.
609 - rtl::OUString sUrl = makeMacroURL( sMacroName );
610 - uno::Sequence< sal_Int16 > aOutArgsIndex;
611 - uno::Sequence< uno::Any > aOutArgs;
612 - ErrCode nErr = pShell->CallXScript( sUrl, aArgs, aRet,
613 - aOutArgsIndex, aOutArgs, sal_False );
614 -
615 - // Script Executed?
616 - if ( nErr != ERRCODE_NONE )
617 - return sal_False;
618 -
619 - sal_Int32 nLen = aOutArgs.getLength();
620 - // convert any out params to seem like they were inouts
621 - if ( nLen )
622 - {
623 - for ( sal_Int32 index=0; index < nLen; ++index )
624 - {
625 - sal_Int32 nOutIndex = aOutArgsIndex[ index ];
626 - aArgs[ nOutIndex ] = aOutArgs[ index ];
627 - }
628 -
629 - }
630 - return sal_True;
631 + sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' );
632 +
633 + if ( nMacroDot != -1 )
634 + {
635 + sProcedure = sMacro.copy( nMacroDot + 1 );
636 +
637 + sal_Int32 nContainerDot = sMacro.lastIndexOf( '.', nMacroDot - 1 );
638 + if ( nContainerDot != -1 )
639 + {
640 + sModule = sMacro.copy( nContainerDot + 1, nMacroDot - nContainerDot - 1 );
641 + sContainer = sMacro.copy( 0, nContainerDot );
642 + }
643 + else
644 + sModule = sMacro.copy( 0, nMacroDot );
645 + }
646 + else
647 + sProcedure = sMacro;
648 +}
649 +
650 +VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& MacroName, bool bSearchGlobalTemplates )
651 +{
652 + VBAMacroResolvedInfo aRes;
653 + if ( !pShell )
654 + return aRes;
655 + aRes.SetMacroDocContext( pShell );
656 + // parse the macro name
657 + sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
658 + String sMacroUrl = MacroName;
659 +
660 + String sContainer;
661 + String sModule;
662 + String sProcedure;
663 +
664 + if( nDocSepIndex > 0 )
665 + {
666 + // macro specified by document name
667 + // find document shell for document name and call ourselves
668 + // recursively
669 +
670 + // assume for now that the document name is *this* document
671 + String sDocUrlOrPath = MacroName.copy( 0, nDocSepIndex );
672 + sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
673 + OSL_TRACE("doc search, current shell is 0x%x", pShell );
674 + SfxObjectShell* pFoundShell = findShellForUrl( sDocUrlOrPath );
675 + OSL_TRACE("doc search, after find, found shell is 0x%x", pFoundShell );
676 + aRes = resolveVBAMacro( pFoundShell, sMacroUrl );
677 + }
678 + else
679 + {
680 + // macro is contained in 'this' document ( or code imported from a template
681 + // where that template is a global template or perhaps the template this
682 + // document is created from )
683 +
684 + // macro format = Container.Module.Procedure
685 + parseMacro( MacroName, sContainer, sModule, sProcedure );
686 + uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY);
687 + uno::Reference< container::XNameContainer > xPrjNameCache;
688 + if ( xSF.is() )
689 + xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
690 +
691 + std::vector< rtl::OUString > sSearchList;
692 +
693 + if ( sContainer.Len() > 0 )
694 + {
695 + // get the Project associated with the Container
696 + if ( xPrjNameCache.is() )
697 + {
698 + if ( xPrjNameCache->hasByName( sContainer ) )
699 + {
700 + rtl::OUString sProject;
701 + xPrjNameCache->getByName( sContainer ) >>= sProject;
702 + sContainer = sProject;
703 + }
704 + }
705 + sSearchList.push_back( sContainer ); // First Lib to search
706 + }
707 + else
708 + {
709 + // Ok, if we have no Container specified then we need to search them in order, this document, template this document created from, global templates,
710 + // get the name of Project/Library for 'this' document
711 + rtl::OUString sThisProject;
712 + BasicManager* pBasicMgr = pShell-> GetBasicManager();
713 + if ( pBasicMgr )
714 + {
715 + if ( pBasicMgr->GetName().Len() )
716 + sThisProject = pBasicMgr->GetName();
717 + else // cater for the case where VBA is not enabled
718 + sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
719 + }
720 + sSearchList.push_back( sThisProject ); // First Lib to search
721 + if ( xPrjNameCache.is() )
722 + {
723 + // is this document created from a template?
724 + uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( pShell->GetModel(), uno::UNO_QUERY_THROW );
725 + uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
726 + uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
727 +
728 + rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
729 + if ( sCreatedFrom.getLength() )
730 + {
731 + INetURLObject aObj;
732 + aObj.SetURL( sCreatedFrom );
733 + bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
734 + rtl::OUString aURL;
735 + if ( bIsURL )
736 + aURL = sCreatedFrom;
737 + else
738 + {
739 + osl::FileBase::getFileURLFromSystemPath( sCreatedFrom, aURL );
740 + aObj.SetURL( aURL );
741 + }
742 + sCreatedFrom = aObj.GetLastName();
743 + }
744 +
745 + sal_Int32 nIndex = sCreatedFrom.lastIndexOf( '.' );
746 + if ( nIndex != -1 )
747 + sCreatedFrom = sCreatedFrom.copy( 0, nIndex );
748 +
749 + rtl::OUString sPrj;
750 + if ( sCreatedFrom.getLength() && xPrjNameCache->hasByName( sCreatedFrom ) )
751 + {
752 + xPrjNameCache->getByName( sCreatedFrom ) >>= sPrj;
753 + // Make sure we don't double up with this project
754 + if ( !sPrj.equals( sThisProject ) )
755 + sSearchList.push_back( sPrj );
756 + }
757 +
758 + // get list of global template Names
759 + uno::Sequence< rtl::OUString > sTemplateNames = xPrjNameCache->getElementNames();
760 + sal_Int32 nLen = sTemplateNames.getLength();
761 + for ( sal_Int32 index = 0; ( bSearchGlobalTemplates && index < nLen ); ++index )
762 + {
763 +
764 + if ( !sCreatedFrom.equals( sTemplateNames[ index ] ) )
765 + {
766 + if ( xPrjNameCache->hasByName( sTemplateNames[ index ] ) )
767 + {
768 + xPrjNameCache->getByName( sTemplateNames[ index ] ) >>= sPrj;
769 + // Make sure we don't double up with this project
770 + if ( !sPrj.equals( sThisProject ) )
771 + sSearchList.push_back( sPrj );
772 + }
773 + }
774 +
775 + }
776 + }
777 + }
778 + std::vector< rtl::OUString >::iterator it_end = sSearchList.end();
779 + for ( std::vector< rtl::OUString >::iterator it = sSearchList.begin(); it != it_end; ++it )
780 + {
781 + bool bRes = hasMacro( pShell, *it, sModule, sProcedure );
782 + if ( bRes )
783 + {
784 + aRes.SetResolved( true );
785 + aRes.SetMacroDocContext( pShell );
786 + sContainer = *it;
787 + break;
788 + }
789 + }
790 + }
791 + aRes.SetResolvedMacro( sProcedure.Insert( '.', 0 ).Insert( sModule, 0).Insert( '.', 0 ).Insert( sContainer, 0 ) );
792 +
793 + return aRes;
794 }
795
796 +// Treat the args as possible inouts ( convertion at bottom of method )
797 +sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& /*aRet*/, const uno::Any& aCaller )
798 +{
799 + sal_Bool bRes = sal_False;
800 + if ( !pShell )
801 + return bRes;
802 + rtl::OUString sUrl = makeMacroURL( sMacroName );
803 +
804 + uno::Sequence< sal_Int16 > aOutArgsIndex;
805 + uno::Sequence< uno::Any > aOutArgs;
806 +
807 + try
808 + {
809 + uno::Reference< script::provider::XScriptProvider > xScriptProvider;
810 + uno::Reference< script::provider::XScriptProviderSupplier > xSPS( pShell->GetModel(), uno::UNO_QUERY_THROW );
811 +
812 + xScriptProvider.set( xSPS->getScriptProvider(), uno::UNO_QUERY_THROW );
813 +
814 + uno::Reference< script::provider::XScript > xScript( xScriptProvider->getScript( sUrl ), uno::UNO_QUERY_THROW );
815 +
816 + if ( aCaller.hasValue() )
817 + {
818 + uno::Reference< beans::XPropertySet > xProps( xScript, uno::UNO_QUERY );
819 + if ( xProps.is() )
820 + {
821 + uno::Sequence< uno::Any > aCallerHack(1);
822 + aCallerHack[ 0 ] = aCaller;
823 + xProps->setPropertyValue( rtl::OUString::createFromAscii( "Caller" ), uno::makeAny( aCallerHack ) );
824 + }
825 + }
826 +
827 +
828 + xScript->invoke( aArgs, aOutArgsIndex, aOutArgs );
829 +
830 + sal_Int32 nLen = aOutArgs.getLength();
831 + // convert any out params to seem like they were inouts
832 + if ( nLen )
833 + {
834 + for ( sal_Int32 index=0; index < nLen; ++index )
835 + {
836 + sal_Int32 nOutIndex = aOutArgsIndex[ index ];
837 + aArgs[ nOutIndex ] = aOutArgs[ index ];
838 + }
839 + }
840 +
841 + bRes = sal_True;
842 + }
843 + catch ( uno::Exception& e )
844 + {
845 + bRes = sal_False;
846 + }
847 + return bRes;
848 +}
849 } } // vba // ooo
850 diff --git sw/inc/doc.hxx sw/inc/doc.hxx
851 index 5ee662e..68c5660 100644
852 --- sw/inc/doc.hxx
853 +++ sw/inc/doc.hxx
854 @@ -417,6 +417,7 @@ class SW_DLLPUBLIC SwDoc :
855
856 // table of forbidden characters of this document
857 vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharsTable;
858 + com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
859
860 // --> OD 2007-10-26 #i83479#
861 public:
862 @@ -2127,6 +2128,8 @@ public:
863 {
864 return n32DummyCompatabilityOptions2;
865 }
866 + void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; };
867 + com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; };
868 };
869
870
871 diff --git sw/inc/unocoll.hxx sw/inc/unocoll.hxx
872 index e9da66c..2c6bd02 100644
873 --- sw/inc/unocoll.hxx
874 +++ sw/inc/unocoll.hxx
875 @@ -197,8 +197,9 @@ class SwUnoCollection
876 #define SW_SERVICE_TYPE_FORMFIELDMARK 108
877 #define SW_SERVICE_VBAOBJECTPROVIDER 109
878 #define SW_SERVICE_VBACODENAMEPROVIDER 110
879 +#define SW_SERVICE_VBAPROJECTNAMEPROVIDER 111
880
881 -#define SW_SERVICE_LAST SW_SERVICE_VBACODENAMEPROVIDER
882 +#define SW_SERVICE_LAST SW_SERVICE_VBAPROJECTNAMEPROVIDER
883
884 #define SW_SERVICE_INVALID USHRT_MAX
885
886 diff --git sw/source/core/unocore/unocoll.cxx sw/source/core/unocore/unocoll.cxx
887 index 54797da..e3cded8 100644
888 --- sw/source/core/unocore/unocoll.cxx
889 +++ sw/source/core/unocore/unocoll.cxx
890 @@ -163,6 +163,71 @@ public:
891 }
892 };
893
894 +typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > StringHashMap;
895 +class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
896 +{
897 + SwDocShell* mpDocShell;
898 + StringHashMap mTemplateToProject;
899 +public:
900 + SwVbaProjectNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
901 + {
902 + }
903 + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
904 + {
905 + return ( mTemplateToProject.find( aName ) != mTemplateToProject.end() );
906 + }
907 + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
908 + {
909 + if ( !hasByName( aName ) )
910 + throw container::NoSuchElementException();
911 + return uno::makeAny( mTemplateToProject.find( aName )->second );
912 + }
913 + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException)
914 + {
915 + uno::Sequence< rtl::OUString > aElements( mTemplateToProject.size() );
916 + StringHashMap::iterator it_end = mTemplateToProject.end();
917 + sal_Int32 index = 0;
918 + for ( StringHashMap::iterator it = mTemplateToProject.begin(); it != it_end; ++it, ++index )
919 + aElements[ index ] = it->first;
920 + return aElements;
921 + }
922 +
923 + virtual void SAL_CALL insertByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException )
924 + {
925 +
926 + rtl::OUString sProjectName;
927 + aElement >>= sProjectName;
928 + OSL_TRACE("** Template cache inserting template name %s with project %s"
929 + , rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr()
930 + , rtl::OUStringToOString( sProjectName, RTL_TEXTENCODING_UTF8 ).getStr() );
931 + mTemplateToProject[ aName ] = sProjectName;
932 + }
933 +
934 + virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
935 + {
936 + if ( !hasByName( Name ) )
937 + throw container::NoSuchElementException();
938 + mTemplateToProject.erase( Name );
939 + }
940 + virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const uno::Any& aElement ) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException )
941 + {
942 + if ( !hasByName( aName ) )
943 + throw container::NoSuchElementException();
944 + insertByName( aName, aElement ); // insert will overwrite
945 + }
946 + // XElemenAccess
947 + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
948 + {
949 + return ::getCppuType((const rtl::OUString*)0);
950 + }
951 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException )
952 + {
953 +
954 + return ( mTemplateToProject.size() > 0 );
955 + }
956 +
957 +};
958 +
959 class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
960 {
961 SwDocShell* mpDocShell;
962 @@ -325,6 +390,7 @@ const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
963 { "com.sun.star.chart2.data.DataProvider", SW_SERVICE_CHART2_DATA_PROVIDER },
964 { "ooo.vba.VBAObjectModuleObjectProvider", SW_SERVICE_VBAOBJECTPROVIDER },
965 { "ooo.vba.VBACodeNameProvider", SW_SERVICE_VBACODENAMEPROVIDER },
966 + { "ooo.vba.VBAProjectNameProvider", SW_SERVICE_VBAPROJECTNAMEPROVIDER },
967
968 // case-correct versions of the service names (see #i67811)
969 { CSS_TEXT_TEXTFIELD_DATE_TIME, SW_SERVICE_FIELDTYPE_DATETIME },
970 @@ -517,6 +583,18 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16
971 xRet = (cppu::OWeakObject*)pObjProv;
972 }
973 break;
974 + case SW_SERVICE_VBAPROJECTNAMEPROVIDER :
975 + {
976 + uno::Reference< container::XNameContainer > xProjProv = pDoc->GetVBATemplateToProjectCache();
977 + if ( !xProjProv.is() )
978 + {
979 + xProjProv = new SwVbaProjectNameProvider( pDoc->GetDocShell() );
980 + pDoc->SetVBATemplateToProjectCache( xProjProv );
981 + }
982 + //xRet = (cppu::OWeakObject*)xProjProv;
983 + xRet = xProjProv;
984 + }
985 + break;
986 case SW_SERVICE_TYPE_FOOTNOTE :
987 xRet = (cppu::OWeakObject*)new SwXFootnote(sal_False);
988 break;
989 diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
990 index 90efd7b..e1366a2 100644
991 --- sw/source/filter/ww8/ww8par.cxx
992 +++ sw/source/filter/ww8/ww8par.cxx
993 @@ -161,7 +161,7 @@ using namespace nsHdFtFlags;
994 #include <svtools/pathoptions.hxx>
995 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
996
997 -const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
998 +const static String sThisDocument( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
999
1000 struct DocEventNameTable
1001 {
1002 @@ -191,10 +191,10 @@ bool registerDocEvent( SfxObjectShell* pShell )
1003 for( const DocEventNameTable* pTable = aEventNameTable; pTable->sEventName != NULL; pTable++ )
1004 {
1005 rtl::OUString sEvt = rtl::OUString::createFromAscii( pTable->sEventName );
1006 - rtl::OUString sMacroName = rtl::OUString::createFromAscii( pTable->sMacroName );
1007 + String sMacroName = String::CreateFromAscii( pTable->sMacroName ).Insert( '.', 0 ).Insert( sThisDocument, 0);
1008 // fail to search the macro if the module is not specified.
1009 - String sFullPath = ooo::vba::findVBAMacro( pShell, sModule, sMacroName );
1010 - if( sFullPath.Len() == 0 )
1011 + ooo::vba::VBAMacroResolvedInfo aMacroInfo = ooo::vba::resolveVBAMacro( pShell, sMacroName );
1012 + if( !aMacroInfo.IsResolved() )
1013 continue;
1014
1015 uno::Sequence< beans::PropertyValue > aEvents;
1016 @@ -203,7 +203,7 @@ bool registerDocEvent( SfxObjectShell* pShell )
1017 aOpenEvt[ 0 ].Name = sEvtType;
1018 aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
1019 aOpenEvt[ 1 ].Name = sScript;
1020 - rtl::OUString sUrl = ooo::vba::makeMacroURL( sFullPath );
1021 + rtl::OUString sUrl = ooo::vba::makeMacroURL( aMacroInfo.ResolvedMacro() );
1022 aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
1023 sal_Int32 nPos = aEvents.getLength();
1024
1025 @@ -3834,6 +3834,39 @@ void SwWW8ImplReader::ReadDocInfo()
1026 }
1027 }
1028
1029 +void lcl_createTemplateToProjectEntry( const uno::Reference< container::XNameContainer >& xPrjNameCache, const rtl::OUString& sTemplatePathOrURL, const rtl::OUString& sVBAProjName )
1030 +{
1031 + if ( xPrjNameCache.is() )
1032 + {
1033 + INetURLObject aObj;
1034 + aObj.SetURL( sTemplatePathOrURL );
1035 + bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
1036 + rtl::OUString aURL;
1037 + if ( bIsURL )
1038 + aURL = sTemplatePathOrURL;
1039 + else
1040 + {
1041 + osl::FileBase::getFileURLFromSystemPath( sTemplatePathOrURL, aURL );
1042 + aObj.SetURL( aURL );
1043 + }
1044 + try
1045 + {
1046 + rtl::OUString templateNameWithExt = aObj.GetLastName();
1047 + rtl::OUString templateName;
1048 + sal_Int32 nIndex = templateNameWithExt.lastIndexOf( '.' );
1049 + //xPrjNameCache->insertByName( templateNameWithExt, uno::makeAny( sVBAProjName ) );
1050 + if ( nIndex != -1 )
1051 + {
1052 + templateName = templateNameWithExt.copy( 0, nIndex );
1053 + xPrjNameCache->insertByName( templateName, uno::makeAny( sVBAProjName ) );
1054 + }
1055 + }
1056 + catch( uno::Exception& )
1057 + {
1058 + }
1059 + }
1060 +}
1061 +
1062 class WW8Customizations
1063 {
1064 SvStream* mpTableStream;
1065 @@ -3863,7 +3896,7 @@ bool WW8Customizations::Import( SwDocShell* pShell )
1066 return aTCG.ImportCustomToolBar( *pShell );
1067 }
1068
1069 -bool SwWW8ImplReader::ReadGlobalTemplateSettings()
1070 +bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const uno::Reference< container::XNameContainer >& xPrjNameCache )
1071 {
1072 SvtPathOptions aPathOpt;
1073 String aAddinPath = aPathOpt.GetAddinPath();
1074 @@ -3878,11 +3911,6 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings()
1075 sal_Int32 nEntries = sGlobalTemplates.getLength();
1076 bool bRes = true;
1077 const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
1078 - uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
1079 - uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
1080 - uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
1081 -
1082 - rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
1083 for ( sal_Int32 i=0; i<nEntries; ++i )
1084 {
1085 INetURLObject aObj;
1086 @@ -3897,13 +3925,17 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings()
1087 continue; // don't try and read the same document as ourselves
1088
1089 SotStorageRef rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
1090 +
1091 // Read Macro Projects
1092 SvxImportMSVBasic aVBasic(*mpDocShell, *rRoot,
1093 pVBAFlags->IsLoadWordBasicCode(),
1094 pVBAFlags->IsLoadWordBasicStorage() );
1095 +
1096 +
1097 String s1(CREATE_CONST_ASC("Macros"));
1098 String s2(CREATE_CONST_ASC("VBA"));
1099 int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
1100 + lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aVBasic.GetVBAProjectName() );
1101 // Read toolbars & menus
1102 SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WordDocument") ) );
1103 refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
1104 @@ -4183,10 +4215,20 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
1105 // dissable below for 3.1 at the moment, 'cause it's kinda immature
1106 // similarly the project reference in svx/source/msvba
1107 #if 1
1108 + uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
1109 + uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
1110 + uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
1111 +
1112 + rtl::OUString sCreatedFrom = xDocProps->getTemplateURL();
1113 + uno::Reference< container::XNameContainer > xPrjNameCache;
1114 + uno::Reference< lang::XMultiServiceFactory> xSF(mpDocShell->GetModel(), uno::UNO_QUERY);
1115 + if ( xSF.is() )
1116 + xPrjNameCache.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAProjectNameProvider" ) ) ), uno::UNO_QUERY );
1117 +
1118 // Read Global templates
1119 - ReadGlobalTemplateSettings();
1120 + ReadGlobalTemplateSettings( sCreatedFrom, xPrjNameCache );
1121 #endif
1122 - // Create and insert Excel vba Globals
1123 + // Create and insert Word vba Globals
1124 uno::Any aGlobs;
1125 aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
1126 mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
1127 @@ -4200,6 +4242,7 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
1128 // dissable below for 3.1 at the moment, 'cause it's kinda immature
1129 // similarly the project reference in svx/source/msvba
1130 #if 1
1131 + lcl_createTemplateToProjectEntry( xPrjNameCache, sCreatedFrom, aVBasic.GetVBAProjectName() );
1132 WW8Customizations aCustomisations( pTableStream, *pWwFib );
1133 aCustomisations.Import( mpDocShell );
1134 #endif
1135 diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx
1136 index 89ab0d6..9389568 100644
1137 --- sw/source/filter/ww8/ww8par.hxx
1138 +++ sw/source/filter/ww8/ww8par.hxx
1139 @@ -1415,7 +1415,7 @@ private:
1140 // determine object attribute "Layout in Table Cell"
1141 bool IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell ) const;
1142 // <--
1143 - bool ReadGlobalTemplateSettings();
1144 + bool ReadGlobalTemplateSettings( const rtl::OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap );
1145 //No copying
1146 SwWW8ImplReader(const SwWW8ImplReader &);
1147 SwWW8ImplReader& operator=(const SwWW8ImplReader&);
1148 diff --git sw/source/ui/uno/unotxdoc.cxx sw/source/ui/uno/unotxdoc.cxx
1149 index 0aacbda..9bc3d85 100644
1150 --- sw/source/ui/uno/unotxdoc.cxx
1151 +++ sw/source/ui/uno/unotxdoc.cxx
1152 @@ -225,6 +225,12 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI
1153 {
1154 return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
1155 }
1156 + if( rId.getLength() == 16
1157 + && 0 == rtl_compareMemory( SfxObjectShell::getUnoTunnelId().getConstArray(),
1158 + rId.getConstArray(), 16 ) )
1159 + {
1160 + return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
1161 + }
1162
1163 sal_Int64 nRet = SfxBaseModel::getSomething( rId );
1164 if ( nRet )
1165 diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
1166 index 1849437..77eb2a3 100644
1167 --- vbahelper/inc/vbahelper/vbahelper.hxx
1168 +++ vbahelper/inc/vbahelper/vbahelper.hxx
1169 @@ -63,6 +63,7 @@ namespace ooo
1170 throw css::lang::IllegalArgumentException();
1171 return aSomething;
1172 }
1173 + VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
1174 VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
1175 VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
1176 VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
1177 diff --git vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbaapplicationbase.cxx
1178 index a424b35..0d9f52e 100644
1179 --- vbahelper/source/vbahelper/vbaapplicationbase.cxx
1180 +++ vbahelper/source/vbahelper/vbaapplicationbase.cxx
1181 @@ -134,234 +134,39 @@ VbaApplicationBase::getVersion() throw (uno::RuntimeException)
1182
1183 void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException)
1184 {
1185 - // parse the macro name
1186 - sal_Int32 nDocSepIndex = MacroName.indexOfAsciiL( "!", 1 );
1187 - String sMacroUrl = MacroName;
1188 - uno::Reference< frame::XModel > xModel;
1189 - if( nDocSepIndex > 0 )
1190 + VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( GetDocShell( getCurrentDocument() ), MacroName );
1191 + if( aMacroInfo.IsResolved() )
1192 {
1193 - rtl::OUString sTemplate = MacroName.copy( 0, nDocSepIndex );
1194 - OSL_TRACE("VbaApplicationBase::Run, template name: %s", rtl::OUStringToOString( sTemplate, RTL_TEXTENCODING_UTF8 ).getStr() );
1195 - sMacroUrl = MacroName.copy( nDocSepIndex + 1 );
1196 - OSL_TRACE("VbaApplicationBase::Run, macro name: %s", rtl::OUStringToOString( sMacroUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
1197 + // handle the arguments
1198 + const uno::Any* aArgsPtrArray[] = { &varg1, &varg2, &varg3, &varg4, &varg5, &varg6, &varg7, &varg8, &varg9, &varg10, &varg11, &varg12, &varg13, &varg14, &varg15, &varg16, &varg17, &varg18, &varg19, &varg20, &varg21, &varg22, &varg23, &varg24, &varg25, &varg26, &varg27, &varg28, &varg29, &varg30 };
1199
1200 - // get the template model
1201 - uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
1202 + int nArg = sizeof( aArgsPtrArray ) / sizeof( aArgsPtrArray[0] );
1203 + uno::Sequence< uno::Any > aArgs( nArg );
1204
1205 - uno::Reference< frame::XDesktop > xDesktop
1206 - (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), mxContext), uno::UNO_QUERY_THROW );
1207 - uno::Reference< container::XEnumeration > mxComponents = xDesktop->getComponents()->createEnumeration();
1208 - sal_Int32 nCount = 0;
1209 - while( mxComponents->hasMoreElements() )
1210 - {
1211 - uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( mxComponents->nextElement(), uno::UNO_QUERY );
1212 - if( xDocInfoSupp.is() )
1213 - {
1214 - uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
1215 - uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
1216 - rtl::OUString sCurrName = xDocProps->getTemplateName();
1217 - OSL_TRACE("VbaApplicationBase::Run, current template %d name: %s", ++nCount, rtl::OUStringToOString( sCurrName, RTL_TEXTENCODING_UTF8 ).getStr() );
1218 - // FIXME: should be check the full path of the template
1219 - if( sTemplate.lastIndexOf( sCurrName ) >= 0 )
1220 - {
1221 - xModel.set( xDocInfoSupp, uno::UNO_QUERY_THROW );
1222 - break;
1223 - }
1224 - }
1225 + const uno::Any** pArg = aArgsPtrArray;
1226 + const uno::Any** pArgEnd = ( aArgsPtrArray + nArg );
1227 +
1228 + sal_Int32 nLastArgWithValue = 0;
1229 + sal_Int32 nArgProcessed = 0;
1230 +
1231 + for ( ; pArg != pArgEnd; ++pArg, ++nArgProcessed )
1232 + {
1233 + aArgs[ nArgProcessed ] = **pArg;
1234 + if( (*pArg)->hasValue() )
1235 + nLastArgWithValue = nArgProcessed;
1236 }
1237 - }
1238 - else
1239 - {
1240 - xModel = getCurrentDocument();
1241 - }
1242
1243 - if( !xModel.is() )
1244 - {
1245 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Fail to find the template in Application.Run") ), uno::Reference< uno::XInterface >() );
1246 - }
1247 + // resize array to position of last param with value
1248 + aArgs.realloc( nArgProcessed + 1 );
1249
1250 - String sMacro;
1251 - String sModule;
1252 - sal_Int32 nTokens = sMacroUrl.GetTokenCount( '.' );
1253 - xub_StrLen nToken = 0;
1254 - xub_StrLen nIndex = 0;
1255 - // only support ThisModule.ThisMacro
1256 - if( nTokens == 2 )
1257 - {
1258 - sModule = sMacroUrl.GetToken( nToken, '.', nIndex );
1259 - sMacro = sMacroUrl.GetToken( nToken, '.', nIndex );
1260 + uno::Any aRet;
1261 + uno::Any aDummyCaller;
1262 + executeMacro( aMacroInfo.MacroDocContext(), aMacroInfo.ResolvedMacro(), aArgs, aRet, aDummyCaller );
1263 }
1264 else
1265 {
1266 throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
1267 }
1268 -
1269 - SfxObjectShell* pShell = GetDocShell( xModel );
1270 - if( pShell )
1271 - {
1272 - sMacroUrl = findVBAMacro( pShell, sModule, sMacro );
1273 - if( sMacroUrl.Len() )
1274 - {
1275 - // handle the arguments
1276 - uno::Sequence< uno::Any > aArgs;
1277 - if( varg1.hasValue() )
1278 - {
1279 - aArgs.realloc( aArgs.getLength() + 1 );
1280 - aArgs[ aArgs.getLength() ] = varg1;
1281 - }
1282 - if( varg2.hasValue() )
1283 - {
1284 - aArgs.realloc( aArgs.getLength() + 1 );
1285 - aArgs[ aArgs.getLength() ] = varg2;
1286 - }
1287 - if( varg3.hasValue() )
1288 - {
1289 - aArgs.realloc( aArgs.getLength() + 1 );
1290 - aArgs[ aArgs.getLength() ] = varg3;
1291 - }
1292 - if( varg4.hasValue() )
1293 - {
1294 - aArgs.realloc( aArgs.getLength() + 1 );
1295 - aArgs[ aArgs.getLength() ] = varg4;
1296 - }
1297 - if( varg5.hasValue() )
1298 - {
1299 - aArgs.realloc( aArgs.getLength() + 1 );
1300 - aArgs[ aArgs.getLength() ] = varg5;
1301 - }
1302 - if( varg6.hasValue() )
1303 - {
1304 - aArgs.realloc( aArgs.getLength() + 1 );
1305 - aArgs[ aArgs.getLength() ] = varg6;
1306 - }
1307 - if( varg7.hasValue() )
1308 - {
1309 - aArgs.realloc( aArgs.getLength() + 1 );
1310 - aArgs[ aArgs.getLength() ] = varg7;
1311 - }
1312 - if( varg8.hasValue() )
1313 - {
1314 - aArgs.realloc( aArgs.getLength() + 1 );
1315 - aArgs[ aArgs.getLength() ] = varg8;
1316 - }
1317 - if( varg9.hasValue() )
1318 - {
1319 - aArgs.realloc( aArgs.getLength() + 1 );
1320 - aArgs[ aArgs.getLength() ] = varg9;
1321 - }
1322 - if( varg10.hasValue() )
1323 - {
1324 - aArgs.realloc( aArgs.getLength() + 1 );
1325 - aArgs[ aArgs.getLength() ] = varg10;
1326 - }
1327 - if( varg11.hasValue() )
1328 - {
1329 - aArgs.realloc( aArgs.getLength() + 1 );
1330 - aArgs[ aArgs.getLength() ] = varg11;
1331 - }
1332 - if( varg12.hasValue() )
1333 - {
1334 - aArgs.realloc( aArgs.getLength() + 1 );
1335 - aArgs[ aArgs.getLength() ] = varg12;
1336 - }
1337 - if( varg13.hasValue() )
1338 - {
1339 - aArgs.realloc( aArgs.getLength() + 1 );
1340 - aArgs[ aArgs.getLength() ] = varg13;
1341 - }
1342 - if( varg14.hasValue() )
1343 - {
1344 - aArgs.realloc( aArgs.getLength() + 1 );
1345 - aArgs[ aArgs.getLength() ] = varg14;
1346 - }
1347 - if( varg15.hasValue() )
1348 - {
1349 - aArgs.realloc( aArgs.getLength() + 1 );
1350 - aArgs[ aArgs.getLength() ] = varg15;
1351 - }
1352 - if( varg16.hasValue() )
1353 - {
1354 - aArgs.realloc( aArgs.getLength() + 1 );
1355 - aArgs[ aArgs.getLength() ] = varg16;
1356 - }
1357 - if( varg17.hasValue() )
1358 - {
1359 - aArgs.realloc( aArgs.getLength() + 1 );
1360 - aArgs[ aArgs.getLength() ] = varg17;
1361 - }
1362 - if( varg18.hasValue() )
1363 - {
1364 - aArgs.realloc( aArgs.getLength() + 1 );
1365 - aArgs[ aArgs.getLength() ] = varg18;
1366 - }
1367 - if( varg19.hasValue() )
1368 - {
1369 - aArgs.realloc( aArgs.getLength() + 1 );
1370 - aArgs[ aArgs.getLength() ] = varg19;
1371 - }
1372 - if( varg20.hasValue() )
1373 - {
1374 - aArgs.realloc( aArgs.getLength() + 1 );
1375 - aArgs[ aArgs.getLength() ] = varg20;
1376 - }
1377 - if( varg21.hasValue() )
1378 - {
1379 - aArgs.realloc( aArgs.getLength() + 1 );
1380 - aArgs[ aArgs.getLength() ] = varg21;
1381 - }
1382 - if( varg22.hasValue() )
1383 - {
1384 - aArgs.realloc( aArgs.getLength() + 1 );
1385 - aArgs[ aArgs.getLength() ] = varg22;
1386 - }
1387 - if( varg23.hasValue() )
1388 - {
1389 - aArgs.realloc( aArgs.getLength() + 1 );
1390 - aArgs[ aArgs.getLength() ] = varg23;
1391 - }
1392 - if( varg24.hasValue() )
1393 - {
1394 - aArgs.realloc( aArgs.getLength() + 1 );
1395 - aArgs[ aArgs.getLength() ] = varg24;
1396 - }
1397 - if( varg25.hasValue() )
1398 - {
1399 - aArgs.realloc( aArgs.getLength() + 1 );
1400 - aArgs[ aArgs.getLength() ] = varg25;
1401 - }
1402 - if( varg26.hasValue() )
1403 - {
1404 - aArgs.realloc( aArgs.getLength() + 1 );
1405 - aArgs[ aArgs.getLength() ] = varg26;
1406 - }
1407 - if( varg27.hasValue() )
1408 - {
1409 - aArgs.realloc( aArgs.getLength() + 1 );
1410 - aArgs[ aArgs.getLength() ] = varg27;
1411 - }
1412 - if( varg28.hasValue() )
1413 - {
1414 - aArgs.realloc( aArgs.getLength() + 1 );
1415 - aArgs[ aArgs.getLength() ] = varg28;
1416 - }
1417 - if( varg29.hasValue() )
1418 - {
1419 - aArgs.realloc( aArgs.getLength() + 1 );
1420 - aArgs[ aArgs.getLength() ] = varg29;
1421 - }
1422 - if( varg30.hasValue() )
1423 - {
1424 - aArgs.realloc( aArgs.getLength() + 1 );
1425 - aArgs[ aArgs.getLength() ] = varg30;
1426 - }
1427 - uno::Any aRet;
1428 - executeMacro( pShell, sMacroUrl, aArgs, aRet );
1429 - }
1430 - else
1431 - {
1432 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The macro doesn't exist") ), uno::Reference< uno::XInterface >() );
1433 - }
1434 - }
1435 }
1436
1437 float SAL_CALL VbaApplicationBase::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException)
1438 diff --git vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
1439 index 718cdd0..2fcce8a 100644
1440 --- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
1441 +++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
1442 @@ -36,6 +36,8 @@
1443 #include <basic/sbstar.hxx>
1444 #include <basic/sbmod.hxx>
1445 #include <basic/sbmeth.hxx>
1446 +#include <vbahelper/vbahelper.hxx>
1447 +#include <svx/msvbahelper.hxx>
1448
1449 using namespace com::sun::star;
1450 using namespace ooo::vba;
1451 @@ -286,79 +288,31 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u
1452 {
1453 if( m_xCurrentSettings.is() )
1454 {
1455 - // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
1456 - rtl::OUString aCommandURL;
1457 - rtl::OUString sScheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
1458 - SbModule* pModule = StarBASIC::GetActiveModule();
1459 - StarBASIC* pLib = pModule ? dynamic_cast< StarBASIC* >( pModule->GetParent() ) : NULL;
1460 -
1461 - // Ok, we should be able to deal with the following params for onAction
1462 - // a) macro ( we assume the macro lives in this Project ( that is not really a valid assumption but we can't currently search outside this Library yet )
1463 - // b) module.macro ( again assume the macro is in this Project )
1464 - // c) project.module.macro fully specified
1465 -
1466 - if( pModule && pLib )
1467 + // get the current model
1468 + uno::Reference< frame::XModel > xModel( getCurrentDocument() );
1469 + VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true );
1470 + if ( aResolvedMacro.IsResolved() )
1471 {
1472 - String sProject;
1473 - String sModule;
1474 - String sMacro = _onaction;
1475 -
1476 - sal_Int32 nMacroDot = _onaction.lastIndexOf( '.' );
1477 -
1478 - if ( nMacroDot != -1 )
1479 + rtl::OUString aCommandURL = ooo::vba::makeMacroURL( aResolvedMacro.ResolvedMacro() );
1480 + OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
1481 + beans::PropertyValues aPropertyValues;
1482 + m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
1483 + beans::PropertyValues aNewPropertyValues;
1484 + aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
1485 + m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
1486 + if( m_xUICfgManager->hasSettings( m_sBarName ) )
1487 {
1488 - sMacro = _onaction.copy( nMacroDot + 1 );
1489 -
1490 - sal_Int32 nProjectDot = _onaction.lastIndexOf( '.', nMacroDot - 1 );
1491 - if ( nProjectDot != -1 )
1492 - {
1493 - sModule = _onaction.copy( nProjectDot + 1, nMacroDot - nProjectDot - 1 );
1494 - pModule = NULL; // force full spec. no search
1495 -
1496 - }
1497 - else
1498 - sModule = _onaction.copy( 0, nMacroDot );
1499 - pModule = pLib->FindModule( sModule );
1500 + m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
1501 }
1502 -
1503 - // Hopefully eventually if no project is specified 'Find' below
1504 - // will do the right thing
1505 - if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pModule ? pModule->Find( sMacro, SbxCLASS_METHOD ) : NULL ) )
1506 + else
1507 {
1508 - if( pMethod )
1509 - {
1510 - sModule = pModule->GetName();
1511 - sProject = pModule->GetParent()->GetName();
1512 - }
1513 + m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
1514 + }
1515 + // make it permanent
1516 + if( !m_bTemporary )
1517 + {
1518 + m_xUICfgPers->store();
1519 }
1520 - sMacro.Insert( '.', 0 ).Insert( sModule, 0 ).Insert( '.', 0 ).Insert( sProject, 0 );
1521 -
1522 - rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
1523 - aCommandURL = sScheme.concat( sMacro ).concat( sUrlPart2 );
1524 - OSL_TRACE("**** METHOD IS %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
1525 - }
1526 - else
1527 - {
1528 - aCommandURL = _onaction;
1529 - }
1530 - OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
1531 - beans::PropertyValues aPropertyValues;
1532 - m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
1533 - beans::PropertyValues aNewPropertyValues;
1534 - aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
1535 - m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
1536 - if( m_xUICfgManager->hasSettings( m_sBarName ) )
1537 - {
1538 - m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
1539 - }
1540 - else
1541 - {
1542 - m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
1543 - }
1544 - // make it permanent
1545 - if( !m_bTemporary )
1546 - {
1547 - m_xUICfgPers->store();
1548 }
1549 }
1550 }
1551 diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
1552 index 57bca7c..97ebb3b 100644
1553 --- vbahelper/source/vbahelper/vbahelper.cxx
1554 +++ vbahelper/source/vbahelper/vbahelper.cxx
1555 @@ -67,6 +67,7 @@
1556 #include <toolkit/awt/vclxwindow.hxx>
1557 #include <toolkit/helper/vclunohelper.hxx>
1558 #include <com/sun/star/frame/XModel2.hpp>
1559 +#include <com/sun/star/lang/XUnoTunnel.hpp>
1560 #include <vcl/window.hxx>
1561 #include <vcl/syswin.hxx>
1562 #include <tools/diagnose_ex.h>
1563 @@ -1116,7 +1117,19 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
1564 double points = double( static_cast<double>(_hmm) / factor);
1565 return points;
1566 }
1567 -
1568 +
1569 + SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
1570 + {
1571 + SfxObjectShell* pFoundShell = NULL;
1572 + if ( xModel.is() )
1573 + {
1574 + uno::Reference< lang::XUnoTunnel > xObjShellTunnel( xModel, uno::UNO_QUERY_THROW );
1575 + pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
1576 + }
1577 + if ( !pFoundShell )
1578 + throw uno::RuntimeException();
1579 + return pFoundShell;
1580 + }
1581
1582 } // openoffice
1583 } //org
vba interoperability for OOo