*** empty log message ***

3 files changed, 384 insertions, 0 deletions

diff --git a/extensions/test/ole/cppToUno/makefile.mk b/extensions/test/ole/cppToUno/makefile.mk
new file mode 100644
index 000000000..0dad95a54
--- /dev/null
+++ b/extensions/test/ole/cppToUno/makefile.mk
@@ -0,0 +1,130 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: jl $ $Date: 2000-10-24 09:34:05 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/
+
+PRJNAME=extensions
+TARGET=testcppuno
+TARGETTYPE=CUI
+LIBTARGET=NO
+
+#USE_DEFFILE=	TRUE
+NO_BSYMBOLIC=	TRUE
+ENABLE_EXCEPTIONS=TRUE
+BOOTSTRAP_SERVICE=FALSE
+
+# --- Settings ---
+
+.INCLUDE : svpre.mk
+.INCLUDE : settings.mk
+.INCLUDE : sv.mk
+
+# --- Files ---
+
+UNOUCRDEP=	$(SOLARBINDIR)$/applicat.rdb
+UNOUCRRDB=	$(SOLARBINDIR)$/applicat.rdb
+
+
+UNOUCROUT=	$(OUT)$/inc
+INCPRE+=	$(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl
+
+
+UNOTYPES=	com.sun.star.lang.XMultiServiceFactory \
+            com.sun.star.script.XInvocation			\
+            oletest.XCallback 
+
+
+
+.IF "$(depend)" != ""
+
+.ENDIF # depend
+
+APP1TARGET=	$(TARGET)
+APP1OBJS=	$(OBJ)$/testcppuno.obj 
+
+LIBCMT=msvcrtd.lib
+            
+
+APP1STDLIBS= \
+    $(SALLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    user32.lib	\
+    kernel32.lib \
+    ole32.lib	\
+    oleaut32.lib	\
+    uuid.lib		\
+    comdlg32.lib	\
+    gdi32.lib
+
+
+
+.IF "$(GUI)"=="WNT"
+APP1STDLIBS += $(LIBCIMT)
+.ENDIF
+
+APP1DEF=	$(MISC)\$(APP1TARGET).def
+
+# --- Targets ---
+
+.INCLUDE : target.mk
+
diff --git a/extensions/test/ole/cppToUno/readme.txt b/extensions/test/ole/cppToUno/readme.txt
new file mode 100644
index 000000000..1a57d8524
--- /dev/null
+++ b/extensions/test/ole/cppToUno/readme.txt
@@ -0,0 +1,9 @@
+testcppuno.exe currently tests the conversion of SAFEARRAYs. There is
+no output from the program. Just step through the code.
+
+To run the test, the service oletest.OleTest ( extensions/test/ole/cpnt)
+must be in the same directory as the office dlls and it must be registered
+at the applicat.rdb. Also the type information must have been merged with
+applicat.rdb. The program requires an office to be present. Put testcppuno
+into the Office/program folder and run it there.
+	
\ No newline at end of file
diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx
new file mode 100644
index 000000000..4be1fc6fb
--- /dev/null
+++ b/extensions/test/ole/cppToUno/testcppuno.cxx
@@ -0,0 +1,245 @@
+/*************************************************************************
+ *
+ *  $RCSfile: testcppuno.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2000-10-24 09:34:19 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include <windows.h>
+#include <comdef.h>
+#include <tchar.h>
+#include <atlbase.h>
+extern CComModule _Module;
+#include<atlcom.h>
+#include<atlimpl.cpp>
+
+#include <com/sun/star/bridge/ModelDependent.hpp>
+#include <com/sun/star/bridge/XBridgeSupplier2.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/script/XInvocation.hpp>
+#include <oletest/XCallback.hpp>
+#include <rtl/process.h>
+#include <com/sun/star/uno/Reference.h>
+#include <cppuhelper/servicefactory.hxx>
+#include <rtl/string.h>
+#pragma hdrstop
+
+
+CComModule _Module;
+BEGIN_OBJECT_MAP(ObjectMap)
+END_OBJECT_MAP()
+
+using namespace com::sun::star::lang;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::script;
+using namespace com::sun::star::bridge;
+using namespace com::sun::star::bridge::ModelDependent;
+using namespace cppu;
+using namespace rtl;
+HRESULT doTest();
+bool incrementMultidimensionalIndex(sal_Int32 dimensions, 
+                                                                   const sal_Int32 * parDimensionLengths, 
+                                                                   sal_Int32 * parMultidimensionalIndex);
+
+
+
+int __cdecl _tmain( int argc, _TCHAR * argv[] )
+{
+    HRESULT hr;
+    if( FAILED( hr=CoInitialize(NULL)))
+    {
+        _tprintf(_T("CoInitialize failed \n"));
+        return -1;
+    }
+
+    
+    _Module.Init( ObjectMap, GetModuleHandle( NULL));
+
+    if( FAILED(hr=doTest()))
+    {
+        _com_error err( hr);
+        const TCHAR * errMsg= err.ErrorMessage();
+        MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR);
+    }
+
+
+    _Module.Term();
+    CoUninitialize();
+    return 0;
+}
+
+
+
+
+HRESULT doTest()
+{
+    HRESULT hr= S_OK;
+    long i,j;
+    SAFEARRAY* par;
+    CComDispatchDriver disp;
+    CComVariant result;
+    CComVariant param1;
+    CComPtr<IUnknown> spUnkFactory;
+    if( SUCCEEDED( spUnkFactory.CoCreateInstance(L"com.sun.star.ServiceManager")))
+    {
+        disp= spUnkFactory;
+        param1= L"oletest.OleTest";
+        disp.Invoke1( L"createInstance", &param1, &result);
+
+        disp= result.pdispVal;
+
+        // disp contains now oletest.OleTest
+
+        // one dimensional array 
+        par= SafeArrayCreateVector( VT_UI1, 0, 5);
+        unsigned char arbyte[]= { 1,2,3,4,5};
+        for(  i= 0; i < 5;i++)
+            hr=	SafeArrayPutElement( par, &i, &arbyte[i]);
+
+        result.Clear();
+        param1.vt= VT_ARRAY| VT_UI1;
+        param1.byref= par;
+        disp.Invoke1(L"methodByte", &param1, &result);
+        SafeArrayDestroy( par);
+
+
+        // two dimensional array
+        SAFEARRAYBOUND bounds[2];
+        bounds[0].cElements= 3;
+        bounds[0].lLbound= 0;
+        bounds[1].cElements= 2;
+        bounds[1].lLbound= 0;
+        par= SafeArrayCreate( VT_I4, 2, bounds );
+        
+
+        long index2[2];
+        memset( index2, 0, 2 * sizeof( long) );
+        long dimLengths[]={3,2};
+
+        long data;
+        do
+        {
+            data= index2[1] * 3 + index2[0] +1;
+            SafeArrayPutElement( par, index2, &data);
+        }while( incrementMultidimensionalIndex( 2, dimLengths, index2) );
+        
+        result.Clear();
+        param1.vt= VT_ARRAY | VT_I4;
+        param1.byref= par;
+        disp.Invoke1(L"methodSequence", &param1, &result);
+        
+        SAFEARRAY* arRet= result.parray;
+        
+        for( i= 0; i < 2 ; i++)
+        {
+            CComVariant varx;
+            varx.Clear();
+            hr= SafeArrayGetElement( arRet, &i, &varx);
+            SAFEARRAY* ari= varx.parray;
+            
+            for( j= 0; j < 3; j++)
+            {
+                CComVariant varj;
+                varj.Clear();
+                hr= SafeArrayGetElement( ari, &j, &varj);
+            }
+
+
+
+        }
+        SafeArrayDestroy( par);
+
+
+
+
+    }
+
+    return hr;
+}
+
+// left index is least significant
+bool incrementMultidimensionalIndex(sal_Int32 dimensions, 
+                                              const sal_Int32 * parDimensionLengths, 
+                                              sal_Int32 * parMultidimensionalIndex)
+{
+    if( dimensions < 1)
+        return sal_False;
+
+    bool ret= sal_True;
+    bool carry= sal_True; // to get into the while loop
+    
+    sal_Int32 currentDimension= 0; //most significant is 1
+    while( carry)
+    {
+        parMultidimensionalIndex[ currentDimension ]++;
+        // if carryover, set index to 0 and handle carry on a level above
+        if( parMultidimensionalIndex[ currentDimension] > (parDimensionLengths[ currentDimension] - 1))
+            parMultidimensionalIndex[ currentDimension]= 0;
+        else
+            carry= sal_False;
+
+        currentDimension ++;
+        // if dimensions drops below 1 and carry is set than then all indices are 0 again
+        // this is signalled by returning sal_False
+        if( currentDimension > dimensions - 1 && carry)
+        {
+            carry= sal_False;
+            ret= sal_False;
+        }
+    }
+    return ret;
+}
\ No newline at end of file