CWS-TOOLING: integrate CWS jl129

2009-07-08 09:24:14 +0200 jl  r273817 : #i103275# catching DisposedException when calling XDesktop.terminate, the test librariesversion_3_0_0.dll, ..3_0_1.dll, .. 3.1.dll have been recreated and checked in
2009-07-08 09:20:29 +0200 jl  r273816 : #
2009-07-07 10:51:52 +0200 jl  r273784 : #103378# allow to pass Nothing in Basic for uno null reference
2009-07-07 10:30:48 +0200 jl  r273781 : #103242# VS 2008 changes
2009-07-07 10:21:23 +0200 jl  r273778 : #103242
2009-07-07 10:12:20 +0200 jl  r273777 : #103242 adapting to VS 2008
2009-07-03 09:47:21 +0200 jl  r273679 : #i10324# fix build errors
2009-07-03 09:12:08 +0200 jl  r273677 : #i10324# fix build errors
2009-07-02 15:26:07 +0200 jl  r273657 : #i103242 make it build again
2009-07-02 14:39:34 +0200 jl  r273652 : #i103242 make it build again
2009-07-02 14:18:45 +0200 jl  r273650 : #i103242 remove warnings
2009-07-02 14:11:48 +0200 jl  r273648 : #i103242
2009-07-02 12:41:23 +0200 jl  r273637 : #i103242
2009-07-02 12:25:09 +0200 jl  r273636 : #i103242 upgraded to VS2008
2009-07-02 12:00:07 +0200 jl  r273632 : #i103242 upgraded to VS2008
2009-07-02 11:30:55 +0200 jl  r273630 : #i103242 test does not build anymore
2009-07-02 11:14:21 +0200 jl  r273629 : #i103242 test does not build anymore
2009-07-02 10:59:56 +0200 jl  r273628 : #i103242 test does not build anymore
2009-07-02 10:17:43 +0200 jl  r273622 : #i103242 run test prints out the InnerException in case there was an exception. The InnerException is usually the one thrown in OOo
2009-07-01 17:06:24 +0200 jl  r273604 : #i103242 test does not build anymore

4 files changed, 20 insertions, 23 deletions

diff --git a/extensions/test/ole/OleClient/axhost.cxx b/extensions/test/ole/OleClient/axhost.cxx
index e6f42363f49d..b57860327560 100644
--- a/extensions/test/ole/OleClient/axhost.cxx
+++ b/extensions/test/ole/OleClient/axhost.cxx
@@ -46,7 +46,7 @@ HostWin::~HostWin()
 }
 
 
-LRESULT HostWin::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+LRESULT HostWin::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
     CAxWindow wnd(m_hWnd);
 
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index be5037c35619..112f5a1512d9 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -86,7 +86,7 @@ void printResultVariantArray( VARIANT & var);
 void printVariant( VARIANT & var);
 void printSequence( Sequence<Any>& val);
 
-extern "C" int __cdecl main( int argc, char * argv[] )
+extern "C" int __cdecl main( int , char **)
 {
     HRESULT hr;
     if( FAILED( hr=CoInitialize(NULL)))
@@ -381,7 +381,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
     Any inrefVariant, outrefVariant;
     Any inrefDecimal, outrefDecimal;
     Any inParamsLong, outParamsLong;
-    Reference<XInterface> xintUnknown = getComObject(L"AxTestComponents.Foo");
+    Reference<XInterface> xintUnknown(getComObject(L"AxTestComponents.Foo"));
 
     inBool <<= (sal_Bool) sal_True;
     inv->setValue(OUString(L"prpBool"), inBool);
@@ -391,7 +391,7 @@ bool doPropertyTest(const Reference<XInvocation> & inv)
     inv->setValue(OUString(L"prpByte"), inByte);
     outByte = inv->getValue(OUString(L"prpByte"));
 
-    inShort <<= ( sal_Int16) 0xffff;
+    inShort <<= static_cast<sal_Int16>( -1);
     inv->setValue(OUString(L"prpShort"), inShort);
     outShort = inv->getValue(OUString(L"prpShort"));
 
@@ -659,7 +659,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     Any inrefVariant, outrefVariant;
     Any inrefDecimal, outrefDecimal;
 
-    Reference<XInterface> xIntFoo = getComObject(L"AxTestComponents.Foo");
+    Reference<XInterface> xIntFoo(getComObject(L"AxTestComponents.Foo"));
     //###################################################################################
     //  in and out parameter
     //###################################################################################
@@ -678,7 +678,7 @@ bool doSimpleTest(const Reference<XInvocation> & inv)
     inv->invoke(OUString(L"outByte"), Sequence< Any > ( & outByte, 1), seqIndices, seqOut);
     outByte <<= seqOut[0];
 
-    inShort <<= ( sal_Int16) 0xffff;
+    inShort <<= static_cast<sal_Int16>(-1);
     inv->invoke(OUString(L"inShort"), Sequence< Any > ( & inShort, 1), seqIndices, seqOut);
     seqIndices.realloc( 0);
     seqOut.realloc(0);
@@ -1221,7 +1221,7 @@ HRESULT doTest()
     //  invMfc->invoke( OUString(L"inByte"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
     if ( ! invMfc.is())
         return hr;
-    aAny <<= ( sal_Int16) 0xffff;
+    aAny <<= static_cast<sal_Int16>(-1);
     aAny= invMfc->invoke( OUString(L"inShort"), Sequence< Any > ( &aAny, 1), seqIndices, seqOut);
 
 //
diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx
index f6900e44d4cd..1c58da6743cd 100644
--- a/extensions/test/ole/OleClient/funcs.cxx
+++ b/extensions/test/ole/OleClient/funcs.cxx
@@ -42,6 +42,7 @@
 #include "com/sun/star/uno/TypeClass.hpp"
 #include "com/sun/star/script/XInvocation.hpp"
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
 #include <com/sun/star/bridge/oleautomation/NamedArgument.hpp>
 #include "rtl/ustring.hxx"
 
@@ -276,6 +277,7 @@ bool equalSequences(const Any& orig, const Any& returned)
         default:
             return false;
     }
+    return false;
 }
 
 template< class T >
@@ -292,6 +294,7 @@ bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & seqOut)
         if (anyIn != anyOut)
             return false;
     }
+
     return true;
 }
 
diff --git a/extensions/test/ole/OleClient/readme.txt b/extensions/test/ole/OleClient/readme.txt
index dfbeec3b6623..96181e44db9b 100644
--- a/extensions/test/ole/OleClient/readme.txt
+++ b/extensions/test/ole/OleClient/readme.txt
@@ -1,16 +1,10 @@
-The program tests the OleObjectFactory service which enables to use COM components
-through XInvocation.
-
-Requirements:
-
-types.rdb and services.rdb and OleClient.ini have to be next to the executable. 
-COM component: XCallback_Impl.Simple ( extensions/test/ole/unotocomcalls/XCallback_Impl )
-ActiveX controls: AxTestComponent.Basic ( extensions/test/ole/AxTestComponents)
-		  MFCCONTROL.MfcControlCtrl.1 (extensions/test/ole/MfcControl)
-
-//The project cannot be build in our environment therefore it must be an MSDEV project.
-//Reason: ATL uses min and max macros defined in windef.h. Our stl header undef min and max.
-//To generate the uno header use the make file. Then Set the include path directories to
-//the inc directory in the build tree.
-
-Now with Visual Studio .NET 2002 it seems to work
+The program tests the OleObjectFactory service which enables to use COM components

+through XInvocation.

+

+Requirements:

+

+types.rdb and services.rdb and OleClient.ini have to be next to the executable. 

+COM component: XCallback_Impl.Simple ( extensions/test/ole/unotocomcalls/XCallback_Impl )

+ActiveX controls: AxTestComponent.Basic ( extensions/test/ole/AxTestComponents)

+		  MFCCONTROL.MfcControlCtrl.1 (extensions/test/ole/MfcControl)

+