diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:36:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 07:34:29 -0600 |
| commit | 15246c959ae5ab4e124859a4d8981676f9eb657f (patch) | |
| tree | 87813888699be2b850201725c45564c8c6423262 /extensions/test | |
| parent | 710178094dfb21b0864335b1fa1a3401e4d82959 (diff) | |
Remove visual noise from extensions
Change-Id: I0397d0d0e5343b7ed192a790664b068ac6955bd3
Reviewed-on: https://gerrit.libreoffice.org/8259
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/test')
42 files changed, 482 insertions, 482 deletions
diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp index 49a45826c38f..a981e7b43eeb 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp @@ -37,7 +37,7 @@ OBJECT_ENTRY(CLSID_Basic, CBasic) OBJECT_ENTRY(CLSID_Foo, CFoo) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -53,7 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -61,7 +61,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -69,7 +69,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -78,7 +78,7 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.idl b/extensions/test/ole/AxTestComponents/AxTestComponents.idl index f2c93105a822..550eb0c5a46b 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.idl +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.idl @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ // AxTestComponents.idl : IDL source for AxTestComponents.dll -// + // This file will be processed by the MIDL tool to // produce the type library (AxTestComponents.tlb) and marshalling code. diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.rc b/extensions/test/ole/AxTestComponents/AxTestComponents.rc index e9e4171c8e2a..da5d58f6575c 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.rc +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.rc @@ -17,20 +17,20 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "winres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -39,18 +39,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_BASIC REGISTRY DISCARDABLE "Basic.rgs" IDR_FOO REGISTRY DISCARDABLE "Basic.rgs" #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -60,10 +60,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -86,10 +86,10 @@ END #ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -128,10 +128,10 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -139,17 +139,17 @@ BEGIN END #endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "AxTestComponents.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/AxTestComponents/Basic.cpp b/extensions/test/ole/AxTestComponents/Basic.cpp index 35986d27086f..d35469e3f611 100644 --- a/extensions/test/ole/AxTestComponents/Basic.cpp +++ b/extensions/test/ole/AxTestComponents/Basic.cpp @@ -21,7 +21,7 @@ #include "Basic.h" -///////////////////////////////////////////////////////////////////////////// + // CBasic CBasic::CBasic(): m_cPrpByte(0),m_nPrpShort(0),m_lPrpLong(0),m_fPrpFloat(0), m_dPrpDouble(0),m_PrpArray(0), m_safearray(NULL), m_bool(VARIANT_FALSE), diff --git a/extensions/test/ole/AxTestComponents/Basic.h b/extensions/test/ole/AxTestComponents/Basic.h index 9015ac3de0b5..13268cadb616 100644 --- a/extensions/test/ole/AxTestComponents/Basic.h +++ b/extensions/test/ole/AxTestComponents/Basic.h @@ -24,7 +24,7 @@ #include "resource.h" #import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids -///////////////////////////////////////////////////////////////////////////// + // CBasic class ATL_NO_VTABLE CBasic : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/AxTestComponents/Foo.cpp b/extensions/test/ole/AxTestComponents/Foo.cpp index a9283dd2b88b..a5064278b8ff 100644 --- a/extensions/test/ole/AxTestComponents/Foo.cpp +++ b/extensions/test/ole/AxTestComponents/Foo.cpp @@ -21,7 +21,7 @@ #include "Foo.h" -///////////////////////////////////////////////////////////////////////////// + // CBasic CFoo::CFoo() { diff --git a/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h index 70c93dd819c7..2142b5248532 100644 --- a/extensions/test/ole/AxTestComponents/Foo.h +++ b/extensions/test/ole/AxTestComponents/Foo.h @@ -24,7 +24,7 @@ #include "resource.h" #import "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids -///////////////////////////////////////////////////////////////////////////// + // CBasic class ATL_NO_VTABLE CFoo : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/AxTestComponents/resource.h b/extensions/test/ole/AxTestComponents/resource.h index 49c06e9ddc2f..e741826b54bd 100644 --- a/extensions/test/ole/AxTestComponents/resource.h +++ b/extensions/test/ole/AxTestComponents/resource.h @@ -19,13 +19,13 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by AxTestComponents.rc -// + #define IDS_PROJNAME 100 #define IDR_BASIC 101 //#define IDR_FOO 501 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp index 86c20c0a8610..5509cd99aa67 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp @@ -38,7 +38,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_EvtListener, CEvtListener) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -54,7 +54,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -62,7 +62,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -70,7 +70,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -79,7 +79,7 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl b/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl index 846f168db3ec..7786222a63c8 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl @@ -17,7 +17,7 @@ */ // EventListener.idl : IDL source for EventListener.dll -// + // This file will be processed by the MIDL tool to // produce the type library (EventListener.tlb) and marshalling code. diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc index 7c97bb33835b..418ce2686961 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc @@ -17,20 +17,20 @@ */ // Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "winres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // Deutsch (Deutschland) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -40,10 +40,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -66,10 +66,10 @@ END #ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -108,10 +108,10 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -119,10 +119,10 @@ BEGIN END #endif // Deutsch (Deutschland) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // Englisch (USA) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -131,24 +131,24 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_EVTLISTENER REGISTRY DISCARDABLE "EvtListener.rgs" #endif // Englisch (USA) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "EventListener.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp index c230a0c508d2..ca5c0bbc8d03 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp @@ -21,7 +21,7 @@ #include "EventListener.h" #include "EvtListener.h" -///////////////////////////////////////////////////////////////////////////// + // CEvtListener STDMETHODIMP CEvtListener::disposing( IDispatch* source) diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h index 272770816cfb..249a71653464 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h +++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h @@ -23,7 +23,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CEvtListener class ATL_NO_VTABLE CEvtListener : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/EventListenerSample/EventListener/resource.h b/extensions/test/ole/EventListenerSample/EventListener/resource.h index ee46ea07c12a..783a14507631 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/resource.h +++ b/extensions/test/ole/EventListenerSample/EventListener/resource.h @@ -19,12 +19,12 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by EventListener.rc -// + #define IDS_PROJNAME 100 #define IDR_EVTLISTENER 101 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/test/ole/JScriptNewStyle.htm b/extensions/test/ole/JScriptNewStyle.htm index 8568df37bf29..28b928630f07 100644 --- a/extensions/test/ole/JScriptNewStyle.htm +++ b/extensions/test/ole/JScriptNewStyle.htm @@ -25,11 +25,11 @@ <script language="JScript"> function callOleTest( id) -{ +{ var factory= new ActiveXObject("com.sun.star.ServiceManager"); var oletest= factory.createInstance("oletest.OleTest"); // alert(oletest); - + var arr= new Array( 1, 2, 3, 4, 0); var arrDouble= new Array( 1.2345, 12.345, 123,45, 1234.5, 12345); var arrBool= new Array( 1, 0, 2, 0, 3); @@ -43,7 +43,7 @@ function callOleTest( id) // ob.value= "A JScript object"; // var arrObject= new Array( ob, ob, ob); - + var arrout1= new Array(); var arrout2= new Array(); var arrout3= new Array(); @@ -64,9 +64,9 @@ function callOleTest( id) switch( id) { // Array in-params - case 1: + case 1: value.Set("[]byte", arr) - ret= oletest.methodByte( value); + ret= oletest.methodByte( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() + "<br>"); document.writeln( "Returns a Sequence< BYTE > <br>" + sfarray.toArray()) ; break; @@ -78,69 +78,69 @@ function callOleTest( id) document.writeln( "Param: " + arrDouble.toString() +"<br>"); document.writeln( "Returns a Sequence< double > <br>" + sfarray.toArray()) ; break; - case 3: + case 3: value.Set("[]boolean", arrBool) - ret= oletest.methodBool( value); + ret= oletest.methodBool( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arrBool.toString() +"<br>"); document.writeln( "Returns a Sequence< BOOL > <br>" + sfarray.toArray()) ; break; - case 4: + case 4: value.Set("[]short", arr) - ret= oletest.methodShort( value); + ret= oletest.methodShort( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< SHORT > <br>" + sfarray.toArray()) ; break; - case 5: + case 5: value.Set("[]unsigned short", arr) ret= oletest.methodUShort( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned SHORT > <br>" + sfarray.toArray()) ; break; - case 6: + case 6: value.Set("[]long", arr) - ret= oletest.methodLong( value); + ret= oletest.methodLong( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< LONG > <br>" + sfarray.toArray()) ; break; - case 7: + case 7: value.Set("[]unsigned long", arr) ret= oletest.methodULong( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned LONG > <br>" + sfarray.toArray()) ; break; - case 8: + case 8: value.Set("[]char", arrChar) - ret= oletest.methodChar( value); + ret= oletest.methodChar( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arrChar.toString() +"<br>"); document.writeln( "Returns a Sequence< wchar_t > <br>" + sfarray.toArray()) ; break; - case 9: + case 9: value.Set("[]string", arrString) - ret= oletest.methodString( value); - sfarray= new VBArray( ret); + ret= oletest.methodString( value); + sfarray= new VBArray( ret); document.writeln( "Param: " + arrString.toString() +"<br>"); document.writeln( "Returns a Sequence< UString > <br>" + sfarray.toArray()) ; break; - case 10: + case 10: value.Set("[]any", arrAny) ret= oletest.methodAny( value); sfarray= new VBArray( ret); document.writeln( "Param: " + arrAny.toString() +"<br>"); document.writeln( "Returns a Sequence< UsrAny > <br>" + sfarray.toArray() ) ; break; - - case 11: + + case 11: var allArray= new Array(); for(var i= 0; i <3; i++) { var value1= oletest._GetValueObject(); value1.Set("[]long", arr); - allArray[i]= value1; + allArray[i]= value1; } value.Set("[][]long", allArray); @@ -150,7 +150,7 @@ function callOleTest( id) document.writeln( "Param: " + arrSeq.toString() +"<br>"); document.writeln("Returns a Sequence< Sequence < long >> <br>") ; var arr1= new Array(); - arr1= sfarray.toArray(); + arr1= sfarray.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -160,7 +160,7 @@ function callOleTest( id) } break; - case 12: + case 12: var array1= new Array(); for(var i= 0; i <3; i++) { @@ -171,18 +171,18 @@ function callOleTest( id) value2.Set("[]long", arr); array2[j]= value2; } - + var value1= oletest._GetValueObject(); - value1.Set("[][]long", array2) - array1[i]= value1; + value1.Set("[][]long", array2) + array1[i]= value1; } var valueAll= oletest._GetValueObject(); valueAll.Set("[][][]long",array1); - ret= oletest.methodSequence2( valueAll); + ret= oletest.methodSequence2( valueAll); document.writeln( "Param: " + arrSeq2.toString() +"<br>"); sfarray1= new VBArray( ret); - arr1= sfarray1.toArray(); + arr1= sfarray1.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -195,12 +195,12 @@ function callOleTest( id) document.write( i+ " "); document.writeln(j + ": "+ arr3.toString() + "<br>" ); } - + } break; case 13: - + var ar= new Array(); for( i=0; i< 3; i++) { @@ -235,105 +235,105 @@ function callOleTest( id) // Properties: setting and getting values - case 200: + case 200: value.Set("[]byte", arr) oletest.AttrByte = value; - ret= oletest.AttrByte; + ret= oletest.AttrByte; sfarray= new VBArray( ret); document.writeln("Setting AttrByte: " + arr.toString() + "<p>"); document.writeln("Getting AttrByte: " + sfarray.toArray()); break; - case 201: + case 201: value.Set("[]double", arrDouble) - oletest.AttrDouble= value; - ret= oletest.AttrDouble; + oletest.AttrDouble= value; + ret= oletest.AttrDouble; sfarray= new VBArray( ret); document.writeln("Setting AttrDouble: " + arrDouble.toString() + "<p>"); document.writeln("Getting AttrDouble: " + sfarray.toArray()); break; - case 202: + case 202: value.Set("[]boolean", arrBool) oletest.AttrBool= value; - ret= oletest.AttrBool; + ret= oletest.AttrBool; sfarray= new VBArray( ret); document.writeln("Setting AttrBool: " + arrBool.toString() + "<p>"); document.writeln("Getting AttrBool: " + sfarray.toArray()); break; - case 203: + case 203: value.Set("[]short", arr) - oletest.AttrShort= value; - ret= oletest.AttrShort; + oletest.AttrShort= value; + ret= oletest.AttrShort; sfarray= new VBArray( ret); document.writeln("Setting AttrShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrShort: " + sfarray.toArray()); break; - case 204: + case 204: value.Set("[]unsigned short", arr) - oletest.AttrUShort= value; - ret= oletest.AttrUShort; + oletest.AttrUShort= value; + ret= oletest.AttrUShort; sfarray= new VBArray( ret); document.writeln("Setting AttrUShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrUShort: " + sfarray.toArray()); break; - case 205: + case 205: value.Set("[]long", arr) - oletest.AttrLong= value; - ret= oletest.AttrLong; + oletest.AttrLong= value; + ret= oletest.AttrLong; sfarray= new VBArray( ret); document.writeln("Setting AttrLong: " + arr.toString() + "<p>"); document.writeln("Getting AttrLong: " + sfarray.toArray()); break; - case 206: + case 206: value.Set("[]unsigned long", arr) - oletest.AttrULong= value; - ret= oletest.AttrULong; + oletest.AttrULong= value; + ret= oletest.AttrULong; sfarray= new VBArray( ret); document.writeln("Setting AttrULong: " + arr.toString() + "<p>"); document.writeln("Getting AttrULong: " + sfarray.toArray()); break; - case 207: + case 207: value.Set("[]char", arrChar) - oletest.AttrChar= value; - ret= oletest.AttrChar; + oletest.AttrChar= value; + ret= oletest.AttrChar; sfarray= new VBArray( ret); document.writeln("Setting AttrChar: " + arrChar.toString() + "<p>"); document.writeln("Getting AttrChar: " + sfarray.toArray()); break; - case 208: + case 208: value.Set("[]string", arrString) - oletest.AttrString= value; - ret= oletest.AttrString; + oletest.AttrString= value; + ret= oletest.AttrString; sfarray= new VBArray( ret); document.writeln("Setting AttrString: " + arrString.toString() + "<p>"); document.writeln("Getting AttrString: " + sfarray.toArray()); break; - case 209: + case 209: value.Set("[]any", arrAny) - oletest.AttrAny= value; - ret= oletest.AttrAny; + oletest.AttrAny= value; + ret= oletest.AttrAny; sfarray= new VBArray( ret); document.writeln("Setting AttrAny: " + arrAny.toString() + "<p>"); document.writeln("Getting AttrAny: " + sfarray.toArray()); break; - case 210: + case 210: var allArray= new Array(); for(var i= 0; i <3; i++) { var value1= oletest._GetValueObject(); value1.Set("[]long", arr); - allArray[i]= value1; + allArray[i]= value1; } value.Set("[][]long", allArray); - oletest.AttrSequence= value; - ret= oletest.AttrSequence; + oletest.AttrSequence= value; + ret= oletest.AttrSequence; sfarray= new VBArray( ret); document.writeln( "Param: " + arrSeq.toString() +"<br>"); document.writeln("Returns a Sequence< Sequence < long >> <br>") ; var arr1= new Array(); - arr1= sfarray.toArray(); + arr1= sfarray.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -343,7 +343,7 @@ function callOleTest( id) } break; - case 211: + case 211: var array1= new Array(); for(var i= 0; i <3; i++) { @@ -354,18 +354,18 @@ function callOleTest( id) value2.Set("[]long", arr); array2[j]= value2; } - + var value1= oletest._GetValueObject(); - value1.Set("[][]long", array2) - array1[i]= value1; + value1.Set("[][]long", array2) + array1[i]= value1; } var valueAll= oletest._GetValueObject(); valueAll.Set("[][][]long",array1); - oletest.AttrSequence2= valueAll; - ret= oletest.AttrSequence2; + oletest.AttrSequence2= valueAll; + ret= oletest.AttrSequence2; sfarray1= new VBArray( ret); - arr1= sfarray1.toArray(); + arr1= sfarray1.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -378,7 +378,7 @@ function callOleTest( id) document.write( i+ " "); document.writeln(j + ": "+ arr3.toString() + "<br>" ); } - + } break; @@ -393,7 +393,7 @@ function callOleTest( id) ar[i]= valueObject; } value.Set("[]com.sun.star.uno.XInterface", ar); - + oletest.AttrXInterface= value; ret= oletest.AttrXInterface; sfarray= new VBArray( ret); @@ -414,29 +414,29 @@ function callOleTest( id) break; // Out-parameter ------------------------------------------------------------ - case (2000): - + case (2000): + oletest.testout_methodByte( outValue ); alert("byte: " + outValue.Get() ); break; - case (2001): + case (2001): oletest.testout_methodDouble( outValue ); alert( "double: " + outValue.Get() ); break; case (2002): oletest.testout_methodBool( outValue ); alert( "boolean: " + outValue.Get() ); break; - case (2003): + case (2003): oletest.testout_methodShort( outValue ); alert( "short: " + outValue.Get() ); break; case (2004): oletest.testout_methodUShort( outValue ); alert( "unsigned short: " + outValue.Get() ); break; - case (2005): + case (2005): oletest.testout_methodLong( outValue ); alert( "long: " + outValue.Get() ); break; - case (2006): + case (2006): oletest.testout_methodULong( outValue ); alert( "unsigned long: " + outValue.Get() ); break; - case (2007): + case (2007): oletest.testout_methodChar( outValue ); alert( "char: " + outValue.Get() ); break; case (2008): @@ -452,7 +452,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (2011): + case (2011): oletest.testout_methodSequence2( outValue ); var sfarray= new VBArray( outValue.Get()); arr= sfarray.toArray(); @@ -481,11 +481,11 @@ function callOleTest( id) // INOUT - Parameter ------------------------------------------------------------------------------- // The in value has to be placed on index 0 of the passed in array - case (500): + case (500): inoutValue.InitInOutParam("byte", 100); oletest.testinout_methodByte( inoutValue ); alert("byte: " + inoutValue.Get() ); break; - case (501): + case (501): inoutValue.InitInOutParam("double", 3.14); oletest.testinout_methodDouble( inoutValue ); alert( "double: " + inoutValue.Get() ); break; @@ -493,7 +493,7 @@ function callOleTest( id) inoutValue.InitInOutParam("boolean", false); oletest.testinout_methodBool( inoutValue ); alert( "boolean: " + inoutValue.Get() ); break; - case (503): + case (503): inoutValue.InitInOutParam( "short", 200); oletest.testinout_methodShort( inoutValue ); alert( "short: " + inoutValue.Get() ); break; @@ -501,15 +501,15 @@ function callOleTest( id) inoutValue.InitInOutParam("unsigned short", 300); oletest.testinout_methodUShort( inoutValue ); alert( "unsigned short: " + inoutValue.Get() ); break; - case (505): + case (505): inoutValue.InitInOutParam("long", 400); oletest.testinout_methodLong( inoutValue ); alert( "long: " + inoutValue.Get() ); break; - case (506): + case (506): inoutValue.InitInOutParam( "unsigned long", 500); oletest.testinout_methodULong( inoutValue ); alert( "unsigned long: " + inoutValue.Get() ); break; - case (507): + case (507): inoutValue.InitInOutParam( "char", "A"); oletest.testinout_methodChar( inoutValue ); alert( "char: " + inoutValue.Get() ); break; @@ -531,7 +531,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (511): + case (511): inoutValue.InitInOutParam( "[][]long", arrSeq); oletest.testinout_methodSequence2( inoutValue ); var sfarray= new VBArray( inoutValue.Get()); @@ -552,11 +552,11 @@ function callOleTest( id) oletest.testinout_methodXInterface( inoutValue); document.write("Out value: " + inoutValue.Get().value ); break; - - - + + + // Test ANY // Methods case 1000: @@ -564,7 +564,7 @@ function callOleTest( id) ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); break; - case 1001: + case 1001: i= 3.14; ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); @@ -595,7 +595,7 @@ function callOleTest( id) ret= oletest.AttrAny2; document.writeln( "set: " + i + " get: " + ret); break; - case 1011: + case 1011: i= 3.14; oletest.AttrAny2= i; ret= oletest.AttrAny2; @@ -650,7 +650,7 @@ function funcOut( out) <script language="VBScript"> sub callBasic(id) - + Dim factory Set factory= GetObject("", "com.sun.star.ServiceManager") @@ -672,7 +672,7 @@ sub callBasic(id) arrDim2Int(i,j) = i*2 + j Next Next - + Dim arrDim3Int(1,1,1) For i= 0 To 1 For j= 0 To 1 @@ -685,7 +685,7 @@ sub callBasic(id) set outValue= factory.Bridge_GetValueObject() outValue.InitOutParam - set value= factory.Bridge_GetValueObject() + set value= factory.Bridge_GetValueObject() select case id case 0 value.Set "[]byte", arrInt @@ -763,47 +763,47 @@ sub callBasic(id) a= 100 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodByte a - document.write a + document.write a case 101 a= 1.11 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodDouble a - document.write a + document.write a case 102 a= 5 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodBool a - document.write a + document.write a case 103 a= -10 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodShort a - document.write a + document.write a case 104 a= 128 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodUShort a - document.write a + document.write a case 105 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodLong a - document.write a + document.write a case 106 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodULong a - document.write a + document.write a case 107 a= "ein test string" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodString a - document.write a + document.write a case 108 a= "W" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodChar a - document.write a + document.write a case 109 a= "Ein String im Any" document.write "param: "& CStr( a) & "<br>" @@ -811,69 +811,69 @@ sub callBasic(id) document.write a // Attributes ----------------------------------------------------------------- case 200 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrByte= arrInt b= oletest.AttrByte call printArrayEx( "<br> get: ", "<br>", b) case 201 - document.write "set: " - printArray arrDouble + document.write "set: " + printArray arrDouble oletest.AttrDouble= arrDouble b= oletest.AttrDouble call printArrayEx( "<br> get: ", "<br>", b) case 202 - document.write "set: " - printArray arrBool : + document.write "set: " + printArray arrBool : oletest.AttrBool= arrBool b= oletest.AttrBool call printArrayEx( "<br> get: ", "<br>", b) case 203 - document.write "set: " - printArray arrInt2 : + document.write "set: " + printArray arrInt2 : oletest.AttrShort= arrInt2 b= oletest.AttrShort call printArrayEx( "<br> get: ", "<br>", b) case 204 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrUShort= arrInt b= oletest.AttrUShort call printArrayEx( "<br> get: ", "<br>", b) case 205 - document.write "set: " + document.write "set: " printArray arrInt2 oletest.AttrLong= arrInt2 b= oletest.AttrLong call printArrayEx( "<br> get: ", "<br>", b) case 206 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrULong= arrInt b= oletest.AttrULong call printArrayEx( "<br> get: ", "<br>", b) case 207 - document.write "set: " - printArray arrString + document.write "set: " + printArray arrString oletest.AttrString= arrString b= oletest.AttrString call printArrayEx( "<br> get: ", "<br>", b) case 208 - document.write "set: " + document.write "set: " printArray arrChar oletest.AttrChar= arrChar b= oletest.AttrChar call printArrayEx( "<br> get: ", "<br>", b) case 209 - document.write "set: " + document.write "set: " printArray arrAny oletest.AttrAny= arrAny b= oletest.AttrAny call printArrayEx( "<br> get: ", "<br>", b) case 210 - document.write "set: <br>" - printArray2 arrDim2Int : + document.write "set: <br>" + printArray2 arrDim2Int : oletest.AttrSequence= arrDim2Int ret= oletest.AttrSequence document.write "get: " @@ -884,11 +884,11 @@ sub callBasic(id) next next -// out params +// out params case 300 oletest.testout_methodByte( outValue ) alert("byte: " & outValue.Get() ) - + end select end sub @@ -904,7 +904,7 @@ end sub sub printArray2( arr) elements1= UBound( arr, 1) - LBound( arr, 1) +1 elements2= UBound( arr, 2) - LBound( arr, 2) +1 - + For i=0 To elements1 -1 document.write( "array " & CStr( i) & ": " ) For j=0 To elements2 -1 @@ -979,7 +979,7 @@ In Out Parameter <br> <button onclick='callOleTest( 512)'>XInterface </Button> <p> -Tests Array/Sequence conversion with Attributes. All params are of type Sequence and +Tests Array/Sequence conversion with Attributes. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callOleTest( 200)'>byte </Button> <button onclick='callOleTest( 201)'>double</Button> @@ -1017,7 +1017,7 @@ Test of Any parameter in a property. Any contains:<br> <h2> Visual Basic Tests </h2> Test array /Sequence conversion and return value<br> Template: <b> Sequence < type > method( Sequence< type > ) </b> -<p> +<p> <button onclick='callBasic(0)'>byte</button> @@ -1028,8 +1028,8 @@ Template: <b> Sequence < type > method( Sequence< type > ) </b> <button onclick='callBasic(4)'>u short</button> <button onclick='callBasic(5)'>long</button> <button onclick='callBasic(6)'>u long</button> -<button onclick='callBasic(7)'>string</button> -<button onclick='callBasic(8)'>char</button> +<button onclick='callBasic(7)'>string</button> +<button onclick='callBasic(8)'>char</button> <button onclick='callBasic(9)'>any</button> <br> <button onclick='callBasic(10)'>Seq < int ></button> --> @@ -1046,13 +1046,13 @@ Template: <b> void method( Sequence < type > ) </b> <br> <button onclick='callBasic(104)'>u short</button> <button onclick='callBasic(105)'>long</button> <button onclick='callBasic(106)'>u long</button> -<button onclick='callBasic(107)'>string</button> -<button onclick='callBasic(108)'>char</button> +<button onclick='callBasic(107)'>string</button> +<button onclick='callBasic(108)'>char</button> <button onclick='callBasic(109)'>any</button> <br> --> <p> <!-- -Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and +Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callBasic( 200)'>byte </Button> <button onclick='callBasic( 201)'>double</Button> diff --git a/extensions/test/ole/MfcControl/MfcControl.cpp b/extensions/test/ole/MfcControl/MfcControl.cpp index 1be1633c5eb8..74f10830e927 100644 --- a/extensions/test/ole/MfcControl/MfcControl.cpp +++ b/extensions/test/ole/MfcControl/MfcControl.cpp @@ -36,7 +36,7 @@ const WORD _wVerMajor = 1; const WORD _wVerMinor = 0; -//////////////////////////////////////////////////////////////////////////// + // CMfcControlApp::InitInstance - DLL initialization BOOL CMfcControlApp::InitInstance() @@ -52,7 +52,7 @@ BOOL CMfcControlApp::InitInstance() } -//////////////////////////////////////////////////////////////////////////// + // CMfcControlApp::ExitInstance - DLL termination int CMfcControlApp::ExitInstance() @@ -63,7 +63,7 @@ int CMfcControlApp::ExitInstance() } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -80,7 +80,7 @@ STDAPI DllRegisterServer(void) } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h index 118431219144..64edc9ae7063 100644 --- a/extensions/test/ole/MfcControl/MfcControl.h +++ b/extensions/test/ole/MfcControl/MfcControl.h @@ -31,7 +31,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CMfcControlApp : See MfcControl.cpp for implementation. class CMfcControlApp : public COleControlModule diff --git a/extensions/test/ole/MfcControl/MfcControl.rc b/extensions/test/ole/MfcControl/MfcControl.rc index dadf101f12c3..49831c2313c7 100644 --- a/extensions/test/ole/MfcControl/MfcControl.rc +++ b/extensions/test/ole/MfcControl/MfcControl.rc @@ -17,24 +17,24 @@ */ //Microsoft Visual C++ generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "afxres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -53,14 +53,14 @@ BEGIN "\0" END -///////////////////////////////////////////////////////////////////////////// + #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -97,17 +97,17 @@ BEGIN END END -///////////////////////////////////////////////////////////////////////////// -// + + // Bitmap -// + //IDB_MFCCONTROL BITMAP DISCARDABLE "MfcControlCtl.bmp" -///////////////////////////////////////////////////////////////////////////// -// + + // Dialog -// + IDD_PROPPAGE_MFCCONTROL DIALOG DISCARDABLE 0, 0, 250, 62 @@ -119,10 +119,10 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// + + // DESIGNINFO -// + #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO DISCARDABLE @@ -137,10 +137,10 @@ BEGIN END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -152,12 +152,12 @@ END #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "MfcControl.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.cpp b/extensions/test/ole/MfcControl/MfcControlCtl.cpp index 201a27204e76..402c0ccbf81e 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.cpp +++ b/extensions/test/ole/MfcControl/MfcControlCtl.cpp @@ -34,7 +34,7 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(CMfcControlCtrl, COleControl) -///////////////////////////////////////////////////////////////////////////// + // Message map BEGIN_MESSAGE_MAP(CMfcControlCtrl, COleControl) @@ -46,7 +46,7 @@ BEGIN_MESSAGE_MAP(CMfcControlCtrl, COleControl) END_MESSAGE_MAP() -///////////////////////////////////////////////////////////////////////////// + // Dispatch map BEGIN_DISPATCH_MAP(CMfcControlCtrl, COleControl) @@ -69,7 +69,7 @@ BEGIN_DISPATCH_MAP(CMfcControlCtrl, COleControl) END_DISPATCH_MAP() -///////////////////////////////////////////////////////////////////////////// + // Event map BEGIN_EVENT_MAP(CMfcControlCtrl, COleControl) @@ -80,7 +80,7 @@ BEGIN_EVENT_MAP(CMfcControlCtrl, COleControl) END_EVENT_MAP() -///////////////////////////////////////////////////////////////////////////// + // Property pages // TODO: Add more property pages as needed. Remember to increase the count! @@ -89,20 +89,20 @@ BEGIN_PROPPAGEIDS(CMfcControlCtrl, 1) END_PROPPAGEIDS(CMfcControlCtrl) -///////////////////////////////////////////////////////////////////////////// + // Initialize class factory and guid IMPLEMENT_OLECREATE_EX(CMfcControlCtrl, "MFCCONTROL.MfcControlCtrl.1", 0xac221fb6, 0xa0d8, 0x11d4, 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4) -///////////////////////////////////////////////////////////////////////////// + // Type library ID and version IMPLEMENT_OLETYPELIB(CMfcControlCtrl, _tlid, _wVerMajor, _wVerMinor) -///////////////////////////////////////////////////////////////////////////// + // Interface IDs const IID BASED_CODE IID_DMfcControl = @@ -111,7 +111,7 @@ const IID BASED_CODE IID_DMfcControlEvents = { 0xac221fb5, 0xa0d8, 0x11d4, { 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4 } }; -///////////////////////////////////////////////////////////////////////////// + // Control type information static const DWORD BASED_CODE _dwMfcControlOleMisc = @@ -124,7 +124,7 @@ static const DWORD BASED_CODE _dwMfcControlOleMisc = IMPLEMENT_OLECTLTYPE(CMfcControlCtrl, IDS_MFCCONTROL, _dwMfcControlOleMisc) -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::CMfcControlCtrlFactory::UpdateRegistry - // Adds or removes system registry entries for CMfcControlCtrl @@ -153,7 +153,7 @@ BOOL CMfcControlCtrl::CMfcControlCtrlFactory::UpdateRegistry(BOOL bRegister) } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::CMfcControlCtrl - Constructor CMfcControlCtrl::CMfcControlCtrl() @@ -164,7 +164,7 @@ CMfcControlCtrl::CMfcControlCtrl() } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::~CMfcControlCtrl - Destructor CMfcControlCtrl::~CMfcControlCtrl() @@ -173,7 +173,7 @@ CMfcControlCtrl::~CMfcControlCtrl() } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::OnDraw - Drawing function void CMfcControlCtrl::OnDraw( @@ -185,7 +185,7 @@ void CMfcControlCtrl::OnDraw( } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::DoPropExchange - Persistence support void CMfcControlCtrl::DoPropExchange(CPropExchange* pPX) @@ -198,7 +198,7 @@ void CMfcControlCtrl::DoPropExchange(CPropExchange* pPX) } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl::OnResetState - Reset control to default state void CMfcControlCtrl::OnResetState() @@ -209,7 +209,7 @@ void CMfcControlCtrl::OnResetState() } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl message handlers diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h index fb95d210f8e3..865085467ece 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.h +++ b/extensions/test/ole/MfcControl/MfcControlCtl.h @@ -25,7 +25,7 @@ // MfcControlCtl.h : Declaration of the CMfcControlCtrl ActiveX Control class. -///////////////////////////////////////////////////////////////////////////// + // CMfcControlCtrl : See MfcControlCtl.cpp for implementation. class CMfcControlCtrl : public COleControl diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.cpp b/extensions/test/ole/MfcControl/MfcControlPpg.cpp index 3e004fbd5d58..3671223633c3 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.cpp +++ b/extensions/test/ole/MfcControl/MfcControlPpg.cpp @@ -32,7 +32,7 @@ static char THIS_FILE[] = __FILE__; IMPLEMENT_DYNCREATE(CMfcControlPropPage, COlePropertyPage) -///////////////////////////////////////////////////////////////////////////// + // Message map BEGIN_MESSAGE_MAP(CMfcControlPropPage, COlePropertyPage) @@ -43,14 +43,14 @@ BEGIN_MESSAGE_MAP(CMfcControlPropPage, COlePropertyPage) END_MESSAGE_MAP() -///////////////////////////////////////////////////////////////////////////// + // Initialize class factory and guid IMPLEMENT_OLECREATE_EX(CMfcControlPropPage, "MFCCONTROL.MfcControlPropPage.1", 0xac221fb7, 0xa0d8, 0x11d4, 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4) -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage::CMfcControlPropPageFactory::UpdateRegistry - // Adds or removes system registry entries for CMfcControlPropPage @@ -64,7 +64,7 @@ BOOL CMfcControlPropPage::CMfcControlPropPageFactory::UpdateRegistry(BOOL bRegis } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage::CMfcControlPropPage - Constructor CMfcControlPropPage::CMfcControlPropPage() : @@ -77,7 +77,7 @@ CMfcControlPropPage::CMfcControlPropPage() : } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage::DoDataExchange - Moves data between page and properties void CMfcControlPropPage::DoDataExchange(CDataExchange* pDX) @@ -90,7 +90,7 @@ void CMfcControlPropPage::DoDataExchange(CDataExchange* pDX) } -///////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage message handlers /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.h b/extensions/test/ole/MfcControl/MfcControlPpg.h index 821152a1ff38..cb7cd7164499 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.h +++ b/extensions/test/ole/MfcControl/MfcControlPpg.h @@ -25,7 +25,7 @@ // MfcControlPpg.h : Declaration of the CMfcControlPropPage property page class. -//////////////////////////////////////////////////////////////////////////// + // CMfcControlPropPage : See MfcControlPpg.cpp.cpp for implementation. class CMfcControlPropPage : public COlePropertyPage diff --git a/extensions/test/ole/MfcControl/Resource.h b/extensions/test/ole/MfcControl/Resource.h index e36b50165e8d..598d26ba3d39 100644 --- a/extensions/test/ole/MfcControl/Resource.h +++ b/extensions/test/ole/MfcControl/Resource.h @@ -19,7 +19,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by MfcControl.rc -// + #define IDS_MFCCONTROL 1 #define IDS_MFCCONTROL_PPG 2 diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index b37b2fa50480..3d0066279e06 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -642,9 +642,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) Any inrefDecimal, outrefDecimal; Reference<XInterface> xIntFoo(getComObject(L"AxTestComponents.Foo")); - //################################################################################### + // in and out parameter - //################################################################################### + sal_Bool aBool = sal_True; inBool.setValue(&aBool, getCppuBooleanType()); inv->invoke(OUString(L"inBool"), Sequence< Any > ( &inBool, 1), seqIndices, seqOut); @@ -754,9 +754,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) || inCY != outCY || inDate != outDate || inDecimal != outDecimal || inSCode != outSCode) return false; - //################################################################################### + // in/out parameter - //################################################################################### + outBool = Any(); seqIndices.realloc( 0); seqOut.realloc(0); @@ -841,9 +841,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) || inDate != outDate || inDecimal != outDecimal || inSCode != outSCode) return false; - //################################################################################### + // in byref parameters - //################################################################################### + inrefLong <<= (sal_Int32) 1234; inv->invoke(OUString(L"inrefLong"), Sequence<Any>( & inrefLong, 1), seqIndices, seqOut); @@ -872,9 +872,9 @@ bool doSimpleTest(const Reference<XInvocation> & inv) return false; - //################################################################################### + // mixed parameter - //################################################################################### + // mixed1 seqIndices.realloc( 0); seqOut.realloc(0); @@ -919,9 +919,9 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv) arAnyStrTmp[2]<<= arStr[2]; Sequence<Any> seq_1( arAnyStrTmp, 3); inArAny <<= seq_1; - //################################################################################### + // in, out Sequences - //################################################################################### + //Test sequence containing Anys of Strings inv->invoke(OUString(L"inArray"), Sequence< Any > ( & inArAny, 1), seqIndices, seqOut); seqIndices.realloc(0); @@ -1009,9 +1009,9 @@ bool doSimpleSequenceTest(const Reference<XInvocation> & inv) || ! equalSequences(inArString, outArString) || ! equalSequences(inArObject, outArObject)) return false; - //################################################################################### + // in/out Sequences - //################################################################################### + seqIndices.realloc(0); seqOut.realloc(0); inv->invoke(OUString(L"inoutArray"), Sequence< Any >( & inArString, 1), seqIndices, seqOut); @@ -1107,10 +1107,10 @@ HRESULT doTest() -// -// //################################################################################### + + // // in multi Sequences -// //################################################################################### + // // inMulDimArrayLong sal_Int32 arLongi[]={1,2,3}; sal_Int32 arLongi2[]={4,5,6,7}; @@ -1127,7 +1127,7 @@ HRESULT doTest() seqAny<<= seq2i; // dimension length 3,5 inv->invoke( OUString(L"inMulDimArrayLong"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut); -// + //inMulDimArrayVariant inv->invoke( OUString(L"inMulDimArrayVariant"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut); @@ -1189,15 +1189,15 @@ HRESULT doTest() - //################################################################################### - //################################################################################### - //################################################################################### + + + // Tests with a MFC ActiveX control, ( pure dispinterface) - //################################################################################### - //################################################################################### + + // in parameter MFC ActiveX - //################################################################################### + // unsigned char is not supported by MFC // aAny <<= ( sal_Int8) 127; // invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); @@ -1206,7 +1206,7 @@ HRESULT doTest() aAny <<= static_cast<sal_Int16>(-1); aAny= invMfc->invoke( OUString(L"inShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); -// + aAny <<= ( sal_Int32) 1234567; aAny=invMfc->invoke( OUString(L"inLong"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); sal_Int32 retLong= *(sal_Int32*)aAny.getValue(); @@ -1232,11 +1232,11 @@ HRESULT doTest() inv5->setValue( OUString(L"prpString"), anyVal4); aAny <<= inv5; aAny=invMfc->invoke( OUString(L"inObject"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); -// -// //################################################################################### + + // // out parameter MFC ActiveX -// //################################################################################### -// + + // // outShort aAny= invMfc->invoke( OUString(L"outShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut); anyOut<<= seqOut[0]; @@ -1286,9 +1286,9 @@ HRESULT doTest() MessageBox( NULL, buff, _T("clientTest"), MB_OK); - //################################################################################### + // Sequence parameter MFC ActiveX - //################################################################################### + // Sequences are not directly supported. diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx index 11b61de1c54a..c4846440bac3 100644 --- a/extensions/test/ole/OleClient/funcs.cxx +++ b/extensions/test/ole/OleClient/funcs.cxx @@ -46,7 +46,7 @@ template< class T > bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & returned); -Reference< XMultiServiceFactory > objectFactory;// +Reference< XMultiServiceFactory > objectFactory; Reference<XMultiServiceFactory> getMultiServiceFactory() diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index 4e2da554917f..adfe3b6fb1a1 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -262,32 +262,32 @@ HRESULT doTest() // preparing out parameter; char byteOut; - CComVariant varOutByte; //### + CComVariant varOutByte; varOutByte.vt= VT_BYREF | VT_UI1; V_I1REF(&varOutByte)= &byteOut; short shortOut; - CComVariant varOutShort; //### + CComVariant varOutShort; varOutShort.vt= VT_BYREF | VT_I2; V_I2REF( &varOutShort)= &shortOut; long longOut; - CComVariant varOutLong; //### + CComVariant varOutLong; varOutLong.vt= VT_BYREF | VT_I4; V_I4REF( &varOutLong)= &longOut; double doubleOut; - CComVariant varOutDouble; //### + CComVariant varOutDouble; varOutDouble.vt= VT_BYREF | VT_R8; V_R8REF( &varOutDouble)= &doubleOut; BSTR bstrOut= NULL; - CComVariant varOutString; //### + CComVariant varOutString; varOutString.vt= VT_BYREF | VT_BSTR; V_BSTRREF(&varOutString)= &bstrOut; CComVariant variantOut; - CComVariant varOutAny; //### + CComVariant varOutAny; varOutAny.vt= VT_BYREF | VT_VARIANT; V_VARIANTREF(&varOutAny)= &variantOut; CComPtr<IDispatch> dispOut; - CComVariant varOutXInterface; //### + CComVariant varOutXInterface; varOutXInterface.vt= VT_BYREF |VT_DISPATCH; V_DISPATCHREF(&varOutXInterface)= &dispOut.p; diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h b/extensions/test/ole/OleConverterVar1/smartarray.h index f50189241ec1..741958d32e54 100644 --- a/extensions/test/ole/OleConverterVar1/smartarray.h +++ b/extensions/test/ole/OleConverterVar1/smartarray.h @@ -162,17 +162,17 @@ public: // rgsabound[0].lLbound= 0; // m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count); // SafeArrayLock( m_array); -// + // IUnknown* *pData; // if( m_array && (SUCCEEDED( SafeArrayAccessData( m_array, (void**)&pData)) ) ) // { -// + // for( int i=0; i< count; i++) // { // CComVariant varSource( parParams[i]); // switch (destVartype) // { -// + // case VT_UNKNOWN: // { // pData[i]= parParams[i]; diff --git a/extensions/test/ole/OleTest.htm b/extensions/test/ole/OleTest.htm index a4a42fed2845..acca9fda0a6c 100644 --- a/extensions/test/ole/OleTest.htm +++ b/extensions/test/ole/OleTest.htm @@ -32,12 +32,12 @@ function XEventListener_Impl() //XEventListener this.disposing= XEventListener_disposing; - + this.bdisposingCalled= false; this.bQuiet= true; this.resetDisposing= XEventListener_resetDisposing; this.disposingCalled= XEventListener_disposingCalled; -} +} function XEventListener_disposing( source) { @@ -56,13 +56,13 @@ function XEventListener_disposingCalled() return this.bdisposingCalled; } -//-------------------------------------------------------------------------------------------- + function callOleTest( id) -{ +{ var factory= new ActiveXObject("com.sun.star.ServiceManager"); var oletest= factory.createInstance("oletest.OleTest"); // alert(oletest); - + var arr= new Array( 1, 2, 3, 4, 0); var arrDouble= new Array( 1.2345, 12.345, 123,45, 1234.5, 12345); var arrBool= new Array( 1, 0, 2, 0, 3); @@ -72,7 +72,7 @@ function callOleTest( id) var arrSeq= new Array( arr, arr, arr); var arrSeq2= new Array( arrSeq, arrSeq, arrSeq) - + var arrout1= new Array(); var arrout2= new Array(); var arrout3= new Array(); @@ -87,7 +87,7 @@ function callOleTest( id) switch( id) { // Array in-params - case 1: ret= oletest.methodByte( arr); + case 1: ret= oletest.methodByte( arr); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() + "<br>"); document.writeln( "Returns a Sequence< BYTE > <br>" + sfarray.toArray()) ; break; @@ -97,12 +97,12 @@ function callOleTest( id) document.writeln( "Param: " + arrDouble.toString() +"<br>"); document.writeln( "Returns a Sequence< double > <br>" + sfarray.toArray()) ; break; - case 3: ret= oletest.methodBool( arrBool); + case 3: ret= oletest.methodBool( arrBool); sfarray= new VBArray( ret); document.writeln( "Param: " + arrBool.toString() +"<br>"); document.writeln( "Returns a Sequence< BOOL > <br>" + sfarray.toArray()) ; break; - case 4: ret= oletest.methodShort( arr); + case 4: ret= oletest.methodShort( arr); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< SHORT > <br>" + sfarray.toArray()) ; break; @@ -112,7 +112,7 @@ function callOleTest( id) document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned SHORT > <br>" + sfarray.toArray()) ; break; - case 6: ret= oletest.methodLong( arr); + case 6: ret= oletest.methodLong( arr); sfarray= new VBArray( ret); document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< LONG > <br>" + sfarray.toArray()) ; break; @@ -122,13 +122,13 @@ function callOleTest( id) document.writeln( "Param: " + arr.toString() +"<br>"); document.writeln( "Returns a Sequence< unsigned LONG > <br>" + sfarray.toArray()) ; break; - case 8: ret= oletest.methodChar( arrChar); + case 8: ret= oletest.methodChar( arrChar); sfarray= new VBArray( ret); document.writeln( "Param: " + arrChar.toString() +"<br>"); document.writeln( "Returns a Sequence< wchar_t > <br>" + sfarray.toArray()) ; break; - case 9: ret= oletest.methodString( arrString); - sfarray= new VBArray( ret); + case 9: ret= oletest.methodString( arrString); + sfarray= new VBArray( ret); document.writeln( "Param: " + arrString.toString() +"<br>"); document.writeln( "Returns a Sequence< UString > <br>" + sfarray.toArray()) ; break; @@ -136,13 +136,13 @@ function callOleTest( id) sfarray= new VBArray( ret); document.writeln( "Param: " + arrAny.toString() +"<br>"); document.writeln( "Returns a Sequence< UsrAny > <br>" + sfarray.toArray() ) ; break; - + case 11: ret= oletest.methodSequence( arrSeq); sfarray= new VBArray( ret); document.writeln( "Param: " + arrSeq.toString() +"<br>"); document.writeln("Returns a Sequence< Sequence < long >> <br>") ; var arr1= new Array(); - arr1= sfarray.toArray(); + arr1= sfarray.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -152,10 +152,10 @@ function callOleTest( id) } break; - case 12: ret= oletest.methodSequence2( arrSeq2); + case 12: ret= oletest.methodSequence2( arrSeq2); document.writeln( "Param: " + arrSeq2.toString() +"<br>"); sfarray1= new VBArray( ret); - arr1= sfarray1.toArray(); + arr1= sfarray1.toArray(); for( i=0; i < arr1.length; i++) { sfarray2= new VBArray( arr1[i]); @@ -168,7 +168,7 @@ function callOleTest( id) document.write( i+ " "); document.writeln(j + ": "+ arr3.toString() + "<br>" ); } - + } break; @@ -203,12 +203,12 @@ function callOleTest( id) document.writeln( "Param: " + arrDouble.toString() +"<br>"); document.writeln( "Returns a Sequence< float> <br>" + sfarray.toArray()) ; break; - case 15: + case 15: ret= oletest.methodXEventListeners( arEventListener); sfarray= new VBArray(ret); _ret= sfarray.toArray(); for ( key in _ret) - { + { if( ! _ret[key].disposingCalled()) alert("Error! oletest.methodXEventListeners") } @@ -233,95 +233,95 @@ function callOleTest( id) // Properties: setting and getting values case 200: oletest.AttrByte = arr; - ret= oletest.AttrByte; + ret= oletest.AttrByte; document.writeln("Setting AttrByte: " + arr.toString() + "<p>"); document.writeln("Getting AttrByte: " + arr.toString()); break; - case 201: oletest.AttrDouble= arrDouble; - ret= oletest.AttrDouble; + case 201: oletest.AttrDouble= arrDouble; + ret= oletest.AttrDouble; document.writeln("Setting AttrDouble: " + arrDouble.toString() + "<p>"); document.writeln("Getting AttrDouble: " + arrDouble.toString()); break; case 202: oletest.AttrBool= arrBool; - ret= oletest.AttrBool; + ret= oletest.AttrBool; document.writeln("Setting AttrBool: " + arrBool.toString() + "<p>"); document.writeln("Getting AttrBool: " + arrBool.toString()); break; - case 203: oletest.AttrShort= arr; - ret= oletest.AttrShort; + case 203: oletest.AttrShort= arr; + ret= oletest.AttrShort; document.writeln("Setting AttrShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrShort: " + arr.toString()); break; - case 204: oletest.AttrUShort= arr; - ret= oletest.AttrUShort; + case 204: oletest.AttrUShort= arr; + ret= oletest.AttrUShort; document.writeln("Setting AttrUShort: " + arr.toString() + "<p>"); document.writeln("Getting AttrUShort: " + arr.toString()); break; - case 205: oletest.AttrLong= arr; - ret= oletest.AttrLong; + case 205: oletest.AttrLong= arr; + ret= oletest.AttrLong; document.writeln("Setting AttrLong: " + arr.toString() + "<p>"); document.writeln("Getting AttrLong: " + arr.toString()); break; - case 206: oletest.AttrULong= arr; - ret= oletest.AttrULong; + case 206: oletest.AttrULong= arr; + ret= oletest.AttrULong; document.writeln("Setting AttrULong: " + arr.toString() + "<p>"); document.writeln("Getting AttrULong: " + arr.toString()); break; - case 207: oletest.AttrChar= arrChar; - ret= oletest.AttrChar; + case 207: oletest.AttrChar= arrChar; + ret= oletest.AttrChar; document.writeln("Setting AttrChar: " + arrChar.toString() + "<p>"); document.writeln("Getting AttrChar: " + arrChar.toString()); break; - case 208: oletest.AttrString= arrString; - ret= oletest.AttrString; + case 208: oletest.AttrString= arrString; + ret= oletest.AttrString; document.writeln("Setting AttrString: " + arrString.toString() + "<p>"); document.writeln("Getting AttrString: " + arrString.toString()); break; - case 209: oletest.AttrAny= arrAny; - ret= oletest.AttrAny; + case 209: oletest.AttrAny= arrAny; + ret= oletest.AttrAny; document.writeln("Setting AttrAny: " + arrAny.toString() + "<p>"); document.writeln("Getting AttrAny: " + arrAny.toString()); break; - case 210: oletest.AttrSequence= arrSeq; - ret= oletest.AttrSequence; + case 210: oletest.AttrSequence= arrSeq; + ret= oletest.AttrSequence; document.writeln("Setting AttrSequence: " + arrSeq.toString() + "<p>"); document.writeln("Getting AttrSequence: " + arrSeq.toString()); break; - case 211: oletest.AttrSequence2= arrSeq2; - ret= oletest.AttrSequence2; + case 211: oletest.AttrSequence2= arrSeq2; + ret= oletest.AttrSequence2; document.writeln("Setting AttrSequence2: " + arrSeq2.toString() + "<p>"); document.writeln("Getting AttrSequence2: " + arrSeq2.toString()); break; - case 212: oletest.AttrFloat= arrDouble; - ret= oletest.AttrFloat; + case 212: oletest.AttrFloat= arrDouble; + ret= oletest.AttrFloat; document.writeln("Setting AttrFloat: " + arrDouble.toString() + "<p>"); document.writeln("Getting AttrFloat: " + arrDouble.toString()); break; // Out-parameter ------------------------------------------------------------ - case (2000): + case (2000): oletest.testout_methodByte( arrout1 ); alert("byte: " + arrout1[0] ); break; - case (2001): + case (2001): oletest.testout_methodDouble( arrout1 ); alert( "double: " + arrout1[0] ); break; case (2002): oletest.testout_methodBool( arrout1 ); alert( "boolean: " + arrout1[0] ); break; - case (2003): + case (2003): oletest.testout_methodShort( arrout1 ); alert( "short: " + arrout1[0] ); break; case (2004): oletest.testout_methodUShort( arrout1 ); alert( "unsigned short: " + arrout1[0] ); break; - case (2005): + case (2005): oletest.testout_methodLong( arrout1 ); alert( "long: " + arrout1[0] ); break; - case (2006): + case (2006): oletest.testout_methodULong( arrout1 ); alert( "unsigned long: " + arrout1[0] ); break; - case (2007): + case (2007): oletest.testout_methodChar( arrout1 ); alert( "char: " + arrout1[0] ); break; case (2008): @@ -337,7 +337,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (2011): + case (2011): oletest.testout_methodSequence2( arrout1 ); var sfarray= new VBArray( arrout1[0]); arr= sfarray.toArray(); @@ -364,10 +364,10 @@ function callOleTest( id) var outVal= arrout1[0]; alert( outVal.AttrAny2); document.writeln( "string: " + arrout1[0].AttrAny2); break; - case (2016): + case (2016): oletest.testout_methodFloat( arrout1 ); alert( "float: " + arrout1[0] ); break; - case (2017): + case (2017): var in1= 3.14; var in2= 1111; var in3= -2222; @@ -380,11 +380,11 @@ function callOleTest( id) // INOUT - Parameter ------------------------------------------------------------------------------- // The in value has to be placed on index 0 of the passed in array - case (500): + case (500): arrout1[0]= 100; oletest.testinout_methodByte( arrout1 ); alert("byte: " + arrout1[0] ); break; - case (501): + case (501): arrout1[0]= 3.14; oletest.testinout_methodDouble( arrout1 ); alert( "double: " + arrout1[0] ); break; @@ -392,7 +392,7 @@ function callOleTest( id) arrout1[0]= false; oletest.testinout_methodBool( arrout1 ); alert( "boolean: " + arrout1[0] ); break; - case (503): + case (503): arrout1[0]= 200; oletest.testinout_methodShort( arrout1 ); alert( "short: " + arrout1[0] ); break; @@ -400,15 +400,15 @@ function callOleTest( id) arrout1[0]= 300; oletest.testinout_methodUShort( arrout1 ); alert( "unsigned short: " + arrout1[0] ); break; - case (505): + case (505): arrout1[0]= 400; oletest.testinout_methodLong( arrout1 ); alert( "long: " + arrout1[0] ); break; - case (506): + case (506): arrout1[0]= 500; oletest.testinout_methodULong( arrout1 ); alert( "unsigned long: " + arrout1[0] ); break; - case (507): + case (507): arrout1[0]= "A"; oletest.testinout_methodChar( arrout1 ); alert( "char: " + arrout1[0] ); break; @@ -430,7 +430,7 @@ function callOleTest( id) document.writeln("use the browser's back arrow to go to the previous page <p>"); document.writeln( arr.toString()); break; - case (511): + case (511): arrout1[0]= arrSeq; oletest.testinout_methodSequence2( arrout1 ); var sfarray= new VBArray( arrout1[0]); @@ -468,13 +468,13 @@ function callOleTest( id) // document.write("Out value: " + inoutValue.Get().value ); // break; - case (513): + case (513): arrout1[0]= 3.14; oletest.testinout_methodFloat( arrout1 ); alert( "float: " + arrout1[0] ); break; - + // Test ANY // Methods case 1000: @@ -482,7 +482,7 @@ function callOleTest( id) ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); break; - case 1001: + case 1001: i= 3.14; ret= oletest.methodAnyTest1( i); document.writeln( "in: " + i + " ret: " + ret); @@ -513,7 +513,7 @@ function callOleTest( id) ret= oletest.AttrAny2; document.writeln( "set: " + i + " get: " + ret); break; - case 1011: + case 1011: i= 3.14; oletest.AttrAny2= i; ret= oletest.AttrAny2; @@ -539,7 +539,7 @@ function callOleTest( id) ret= oletest.AttrAny2; document.writeln( "set: " + obj + " get: " + ret); break; - + // Structs ---------------------------------------------- case 1020: var struct= oletest._GetStruct("com.sun.star.beans.Property"); @@ -588,7 +588,7 @@ function funcOut( out) <script language="VBScript"> sub callBasic(id) - + Dim factory Set factory= GetObject("", "com.sun.star.ServiceManager") @@ -610,7 +610,7 @@ sub callBasic(id) arrDim2Int(i,j) = i*2 + j Next Next - + Dim arrDim3Int(1,1,1) For i= 0 To 1 For j= 0 To 1 @@ -620,9 +620,9 @@ sub callBasic(id) Next Next - + select case id - case 0 + case 0 document.writeln "param: " printArray arrInt ret= oletest.methodByte(arrInt) @@ -697,7 +697,7 @@ sub callBasic(id) // Out Parameter case 150 dim rOut - oletest.testout_methodByte rOut + oletest.testout_methodByte rOut MsgBox rOut // void testout_methodFloat( [out] float rOut); // void testout_methodDouble( [out] double rOut); @@ -713,47 +713,47 @@ sub callBasic(id) a= 100 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodByte a - document.write a + document.write a case 101 a= 1.11 document.write "param: " & CStr( a) & "<br>" oletest.testinout_methodDouble a - document.write a + document.write a case 102 a= 5 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodBool a - document.write a + document.write a case 103 a= -10 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodShort a - document.write a + document.write a case 104 a= 128 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodUShort a - document.write a + document.write a case 105 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodLong a - document.write a + document.write a case 106 a= 65556 document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodULong a - document.write a + document.write a case 107 a= "ein test string" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodString a - document.write a + document.write a case 108 a= "W" document.write "param: "& CStr( a) & "<br>" oletest.testinout_methodChar a - document.write a + document.write a case 109 a= "Ein String im Any" document.write "param: "& CStr( a) & "<br>" @@ -767,69 +767,69 @@ sub callBasic(id) document.write a // Attributes ----------------------------------------------------------------- case 200 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrByte= arrInt b= oletest.AttrByte call printArrayEx( "<br> get: ", "<br>", b) case 201 - document.write "set: " - printArray arrDouble + document.write "set: " + printArray arrDouble oletest.AttrDouble= arrDouble b= oletest.AttrDouble call printArrayEx( "<br> get: ", "<br>", b) case 202 - document.write "set: " - printArray arrBool : + document.write "set: " + printArray arrBool : oletest.AttrBool= arrBool b= oletest.AttrBool call printArrayEx( "<br> get: ", "<br>", b) case 203 - document.write "set: " - printArray arrInt2 : + document.write "set: " + printArray arrInt2 : oletest.AttrShort= arrInt2 b= oletest.AttrShort call printArrayEx( "<br> get: ", "<br>", b) case 204 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrUShort= arrInt b= oletest.AttrUShort call printArrayEx( "<br> get: ", "<br>", b) case 205 - document.write "set: " + document.write "set: " printArray arrInt2 oletest.AttrLong= arrInt2 b= oletest.AttrLong call printArrayEx( "<br> get: ", "<br>", b) case 206 - document.write "set: " - printArray arrInt + document.write "set: " + printArray arrInt oletest.AttrULong= arrInt b= oletest.AttrULong call printArrayEx( "<br> get: ", "<br>", b) case 207 - document.write "set: " - printArray arrString + document.write "set: " + printArray arrString oletest.AttrString= arrString b= oletest.AttrString call printArrayEx( "<br> get: ", "<br>", b) case 208 - document.write "set: " + document.write "set: " printArray arrChar oletest.AttrChar= arrChar b= oletest.AttrChar call printArrayEx( "<br> get: ", "<br>", b) case 209 - document.write "set: " + document.write "set: " printArray arrAny oletest.AttrAny= arrAny b= oletest.AttrAny call printArrayEx( "<br> get: ", "<br>", b) case 210 - document.write "set: <br>" - printArray2 arrDim2Int : + document.write "set: <br>" + printArray2 arrDim2Int : oletest.AttrSequence= arrDim2Int ret= oletest.AttrSequence document.write "get: " @@ -844,11 +844,11 @@ sub callBasic(id) dim aByte aByte= 100 call oletest.testinout_methodByte( aByte) - MsgBox aByte + MsgBox aByte case 400 - + set struct= oletest.Bridge_GetStruct("com.sun.star.beans.Property") struct.Attributes= 1 struct.Handle= 2 @@ -886,7 +886,7 @@ end sub sub printArray2( arr) elements1= UBound( arr, 1) - LBound( arr, 1) +1 elements2= UBound( arr, 2) - LBound( arr, 2) +1 - + For i=0 To elements1 -1 document.write( "array " & CStr( i) & ": " ) For j=0 To elements2 -1 @@ -969,7 +969,7 @@ In Out Parameter <br> <button onclick='callOleTest( 512)'>XInterface </Button> <p> -Tests Array/Sequence conversion with Attributes. All params are of type Sequence and +Tests Array/Sequence conversion with Attributes. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callOleTest( 200)'>byte </Button> <button onclick='callOleTest( 212)'>float</Button> @@ -1022,8 +1022,8 @@ Template: <b> Sequence < type > method( Sequence< type > ) </b> <br> <button onclick='callBasic(4)'>u short</button> <button onclick='callBasic(5)'>long</button> <button onclick='callBasic(6)'>u long</button> -<button onclick='callBasic(7)'>string</button> -<button onclick='callBasic(8)'>char</button> +<button onclick='callBasic(7)'>string</button> +<button onclick='callBasic(8)'>char</button> <button onclick='callBasic(9)'>any</button> <br> <button onclick='callBasic(10)'>Seq < int ></button> <br> @@ -1037,8 +1037,8 @@ Template: <b> void method(type ) </b> <br> <button onclick='callBasic(104)'>u short</button> <button onclick='callBasic(105)'>long</button> <button onclick='callBasic(106)'>u long</button> -<button onclick='callBasic(107)'>string</button> -<button onclick='callBasic(108)'>char</button> +<button onclick='callBasic(107)'>string</button> +<button onclick='callBasic(108)'>char</button> <button onclick='callBasic(109)'>any</button> <br> Simple out parameter<br> @@ -1047,14 +1047,14 @@ Simple out parameter<br> <button onclick='callBasic(152)'>boolean</button> <button onclick='callBasic(153)'>short</button> <button onclick='callBasic(155)'>long</button> -<button onclick='callBasic(157)'>string</button> -<button onclick='callBasic(158)'>char</button> +<button onclick='callBasic(157)'>string</button> +<button onclick='callBasic(158)'>char</button> <button onclick='callBasic(159)'>any</button> <br> //--> <br> -Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and +Tests Array/Sequence conversion with <b>Attributes</b>. All params are of type Sequence and the element type of the Sequence is written on the buttons. <br> <button onclick='callBasic( 200)'>byte </Button> <button onclick='callBasic( 201)'>double</Button> diff --git a/extensions/test/ole/ScriptTest.html b/extensions/test/ole/ScriptTest.html index 71e11145766a..7cf188f4550d 100644 --- a/extensions/test/ole/ScriptTest.html +++ b/extensions/test/ole/ScriptTest.html @@ -324,7 +324,7 @@ for(i in _ret) } } Log.print( bOk, "methodXInterface"); -//====================================================================================== + document.writeln("<br>"); var inVal, outVal, retVal; outVal = new Array(); diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm index 481835e9897d..df07e56ec378 100644 --- a/extensions/test/ole/callUnoToJava.htm +++ b/extensions/test/ole/callUnoToJava.htm @@ -40,9 +40,9 @@ function callOleTest( id) // return value is the parameter object oletest.testInterface( new XCallback_Impl, 2); break; - //################################################## + // OUT parameter - //################################################## + case 3: // Test out parameter of type interface oletest.testInterface( new XCallback_Impl, 3); break; @@ -88,9 +88,9 @@ function callOleTest( id) case 31: // outValuesAll oletest.testInterface( new XCallback_Impl, 31); break; - //################################################## + // IN/OUT parameter - //################################################## + case 100: // inoutInterface oletest.testInterface( new XCallback_Impl, 100); @@ -141,9 +141,9 @@ function callOleTest( id) // Call a COM object that has not been passed as parameter to a UNO component and // hence no type information are available in the COM wrapper // case 300: - //################################################## + // Attributes - //################################################## + case 400: oletest.testInterface( new XCallback_Impl, 400); break; @@ -168,7 +168,7 @@ function XCallback_Impl() this.returnInterface= XCallback_Impl_returnInterface; // ################################################# // OUT parameter - //################################################### + this.outInterface= XCallback_Impl_outInterface; this.outStruct= XCallback_Impl_outStruct; this.outEnum= XCallback_Impl_outEnum; @@ -186,7 +186,7 @@ function XCallback_Impl() this.outValuesAll= XCallback_Impl_outValuesAll; // ################################################# // IN/ OUT parameter - //################################################### + this.inoutInterface= XCallback_Impl_inoutInterface; this.inoutStruct= XCallback_Impl_inoutStruct; this.inoutEnum= XCallback_Impl_inoutEnum; @@ -203,12 +203,12 @@ function XCallback_Impl() this.inoutValuesAll= XCallback_Impl_inoutValuesAll; // ################################################# // IN parameter - //################################################## + this.inValues= XCallback_Impl_inValues; // ################################################# // Attributes - //################################################## + this.simple= new XSimple_Impl(); @@ -382,8 +382,8 @@ function XCallback_Impl_inoutLong(val) alert( "JScript in long: " + val[0]); val[0]= 100000; } -function XCallback_Impl_inoutValuesAll(aXSimple, aStruct, aEnum, aSeq, - aAny, aBool, aChar, aString, aFloat, aDouble, +function XCallback_Impl_inoutValuesAll(aXSimple, aStruct, aEnum, aSeq, + aAny, aBool, aChar, aString, aFloat, aDouble, aByte, aShort, aLong ) { this.inoutInterface( aXSimple); @@ -407,9 +407,9 @@ function XCallback_Impl_inValues( aChar, aLong, aString) } -//################################################################ + // class MultiInterface implements XSimple, XSimple2, XSimple3 -//################################################################ + function MultiInterface() { this._environment= "JScript"; @@ -420,7 +420,7 @@ function MultiInterface() this.func2= MultiInterface_func2; this.func3= MultiInterface_func3; // XSimple2 - this.getName2= MultiInterface_getName2; + this.getName2= MultiInterface_getName2; // XSimple3 this.getName3= MultiInterface_getName3; } @@ -462,7 +462,7 @@ function MultiInterface_func3( message) //XCallback_Impl_outValuesAll( xSimple, aSimpleStruct, aSimpleEnum, seqAny, aAny, aBool, // aChar, aString, aFloat, aDouble, aByte, aShort, aLong, aUShort, aULong) //{ -// +// //} @@ -472,7 +472,7 @@ function XSimple_Impl() { //XSimple this.func= XSimple_Impl_func; -} +} function XSimple_Impl_func( message) { alert( "XSimple called." + message); @@ -498,7 +498,7 @@ verify the correct conversion of the return value( IDispatch JScript object) to <button onclick='callOleTest( 2)'>go</Button> <br> <h1> out parameter </h1> -The a JScript object of class XCallback_Impl is passed to the UNO OleTest Control as parameter. +The a JScript object of class XCallback_Impl is passed to the UNO OleTest Control as parameter. According to the buttons the OleTest object calls a function on XCallback_Impl that has appropriate type as out parameter.<br> <button onclick='callOleTest( 3)'>interface</Button> diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index d70440582ec8..150d3ff417b4 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -1826,7 +1826,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac arAny[11] <<= _short; sal_Int32 _long= -1; arAny[12] <<= _long; -// + Sequence<Any> params( arAny, 13); xInv->invoke( OUString( L"inoutValuesAll"), params, seqIndices, seqOutParams); diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx index 6c6556cda8e9..451c357f8a9e 100644 --- a/extensions/test/ole/cpptest/cpptest.cxx +++ b/extensions/test/ole/cpptest/cpptest.cxx @@ -18,7 +18,7 @@ */ // cpptest.cpp : Defines the entry point for the console application. -// + #ifdef _MSC_VER #pragma once diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h index 4a9eda2a51ad..cb20f6e9f7fe 100644 --- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h @@ -19,7 +19,7 @@ // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently -// + #if !defined(AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_ diff --git a/extensions/test/ole/unoTocomCalls/Test/Test.cpp b/extensions/test/ole/unoTocomCalls/Test/Test.cpp index da4414f84157..afed02a31d10 100644 --- a/extensions/test/ole/unoTocomCalls/Test/Test.cpp +++ b/extensions/test/ole/unoTocomCalls/Test/Test.cpp @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ // Test.cpp : Defines the entry point for the console application. -// + #include "stdafx.h" #include "../XCallback_Impl/XCallback_Impl.h" @@ -82,9 +82,9 @@ HRESULT doTest() CComQIPtr<IDispatch> paramDisp(spUnk); - //###################################################################### + // out parameters - //###################################################################### + CComVariant param1( paramDisp); CComVariant param2(1); @@ -145,9 +145,9 @@ HRESULT doTest() // param2= 32; // hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // in / out parameters - //###################################################################### + // XCallback::inoutInterface param2= 100; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); @@ -190,9 +190,9 @@ HRESULT doTest() // XCallback::inoutValuesAll param2=120; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // in parameters - //###################################################################### + // XCallback::inValues param2= 200; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); @@ -203,11 +203,11 @@ HRESULT doTest() //XCallback::inSeqXEventListener param2= 202; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // The UNO test component OleTest calls on XCallback_Impl.Callback directly // that is the COM object has not been past a parameter but rather OleTest // creates the COM object itself - //###################################################################### + // XCallback::outValuesAll // does not work currently param2= 300; @@ -222,9 +222,9 @@ HRESULT doTest() // XCallback::inValues param2= 303; hr= oletest.Invoke2(L"testInterface", ¶m1, ¶m2); - //###################################################################### + // Test a COM object which implements several interfaces. - //###################################################################### + CComQIPtr<IDispatch> dispSimple; hr= dispSimple.CoCreateInstance(L"XCallback_Impl.Simple"); diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp index a9bb76674d72..bb8a4e4f7ead 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp @@ -21,7 +21,7 @@ #include "XCallback_Impl.h" #include "Callback.h" -///////////////////////////////////////////////////////////////////////////// + // CCallback diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h index a0eeca974b82..f200129ed883 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.h @@ -23,7 +23,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CCallback class ATL_NO_VTABLE CCallback : public CComObjectRootEx<CComSingleThreadModel>, @@ -105,7 +105,7 @@ public: /* [out] */ short __RPC_FAR *aShort, /* [out] */ long __RPC_FAR *aLong); // ); -// + // STDMETHOD(outValuesAll)( // /*[out]*/ IDispatch** ppdisp, // /*[out]*/ IUnknown** ppSimpleStruct, diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp index b88fd6b7683d..5b7183cdb332 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.cpp @@ -21,7 +21,7 @@ #include "XCallback_Impl.h" #include "Simple.h" -///////////////////////////////////////////////////////////////////////////// + // CSimple diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h index 758c2aee28a0..e617ca6d763c 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h @@ -23,7 +23,7 @@ #include "resource.h" -///////////////////////////////////////////////////////////////////////////// + // CSimple class ATL_NO_VTABLE CSimple : public CComObjectRootEx<CComSingleThreadModel>, diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp index 671141d82771..2d44a5937e3d 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp @@ -40,7 +40,7 @@ OBJECT_ENTRY(CLSID_Callback, CCallback) OBJECT_ENTRY(CLSID_Simple, CSimple) END_OBJECT_MAP() -///////////////////////////////////////////////////////////////////////////// + // DLL Entry Point extern "C" @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) return TRUE; // ok } -///////////////////////////////////////////////////////////////////////////// + // Used to determine whether the DLL can be unloaded by OLE STDAPI DllCanUnloadNow(void) @@ -64,7 +64,7 @@ STDAPI DllCanUnloadNow(void) return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } -///////////////////////////////////////////////////////////////////////////// + // Returns a class factory to create an object of the requested type STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) @@ -72,7 +72,7 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } -///////////////////////////////////////////////////////////////////////////// + // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -81,7 +81,7 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } -///////////////////////////////////////////////////////////////////////////// + // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl index bb1e6844f333..cee998864bd9 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.idl @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ // XCallback_Impl.idl : IDL source for XCallback_Impl.dll -// + // This file will be processed by the MIDL tool to // produce the type library (XCallback_Impl.tlb) and marshalling code. diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc index 007ca92ffcd7..f544b17cab43 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc @@ -19,16 +19,16 @@ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "winres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -37,18 +37,18 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// + + // REGISTRY -// + IDR_CALLBACK REGISTRY DISCARDABLE "Callback.rgs" IDR_SIMPLE REGISTRY DISCARDABLE "Simple.rgs" #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// + + // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) @@ -58,10 +58,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -84,10 +84,10 @@ END #ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// + + // Version -// + VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,1 @@ -126,10 +126,10 @@ END #endif // !_MAC -///////////////////////////////////////////////////////////////////////////// -// + + // String Table -// + STRINGTABLE DISCARDABLE BEGIN @@ -137,18 +137,18 @@ BEGIN END #endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// + 1 TYPELIB "XCallback_Impl.tlb" -///////////////////////////////////////////////////////////////////////////// + #endif // not APSTUDIO_INVOKED diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h index ccd95cad3ce3..2864478cdc40 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h @@ -19,14 +19,14 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by XCallback_Impl.rc -// + #define IDS_PROJNAME 100 #define IDR_CALLBACK 101 #define IDR_SIMPLE 102 #define IDR_SIMPLESTRUCT 103 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 |