CWS gnumake: resync to m91; conflicts unresolved

11 files changed, 155 insertions, 122 deletions

diff --git a/sot/prj/build.lst b/sot/prj/build.lst
index f2696155fd97..a5ebff311e9c 100644
--- a/sot/prj/build.lst
+++ b/sot/prj/build.lst
@@ -1,8 +1,10 @@
 to	sot	:	tools ucbhelper unotools NULL
-to	sot										usr1	-	all	sot_mkout NULL
-to	sot\inc									nmake	-	all	sot_inc NULL
-to	sot\prj									get		-	all	sot_prj NULL
-to	sot\source\base							nmake	-	all	sot_base sot_inc NULL
-to	sot\source\sdstor						nmake	-	all	sot_sdst sot_inc NULL
-to	sot\source\unoolestorage				nmake	-	all	sot_unoolestor sot_inc NULL
-to	sot\util								nmake	-	all	sot_ut sot_base sot_sdst sot_unoolestor NULL
+to	sot						usr1	-	all	sot_mkout NULL
+to	sot\inc						nmake	-	all	sot_inc NULL
+to	sot\prj						get	-	all	sot_prj NULL
+to	sot\source\base					nmake	-	all	sot_base sot_inc NULL
+to	sot\source\sdstor				nmake	-	all	sot_sdst sot_inc NULL
+to	sot\source\unoolestorage			nmake	-	all	sot_unoolestor sot_inc NULL
+to	sot\util					nmake	-	all	sot_ut sot_base sot_sdst sot_unoolestor NULL
+
+# to	sot\qa\complex\olesimplestorage			nmake	-	all	sot_complex sot_ut NULL
diff --git a/sot/prj/d.lst b/sot/prj/d.lst
index 29c92260e178..ec3166bbea1a 100644
--- a/sot/prj/d.lst
+++ b/sot/prj/d.lst
@@ -12,3 +12,4 @@ mkdir: %_DEST%\inc%_EXT%\sot
 ..\%__SRC%\bin\sot?????.dll %_DEST%\bin%_EXT%\sot?????.dll
 ..\%__SRC%\bin\sot?????.sym %_DEST%\bin%_EXT%\sot?????.sym
 ..\%__SRC%\misc\sot?????.map %_DEST%\bin%_EXT%\sot?????.map
+..\%__SRC%\misc\sot.component %_DEST%\xml%_EXT%\sot.component
diff --git a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
index 054480d377d1..2824b0fcbffa 100644
--- a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
+++ b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
@@ -26,42 +26,85 @@
  ************************************************************************/
 package complex.olesimplestorage;
 
-import complexlib.ComplexTestCase;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
 /* Document.
  */
 
-public class OLESimpleStorageUnitTest extends ComplexTestCase {
+public class OLESimpleStorageUnitTest /* extends ComplexTestCase */
+{
     private XMultiServiceFactory m_xMSF = null;
 
-    public String[] getTestMethodNames() {
-        return new String[] {
-            "ExecuteTest01"};
-    }
-
-    public String getTestObjectName() {
-        return "OLESimpleStorageUnitTest";
-    }
+//    public String[] getTestMethodNames() {
+//        return new String[] {
+//            "ExecuteTest01"};
+//    }
+//
+//    public String getTestObjectName() {
+//        return "OLESimpleStorageUnitTest";
+//    }
 
-    public void before () {
+    @Before public void before () {
+        System.out.println("before()");
         try {
-            m_xMSF = (XMultiServiceFactory)param.getMSF();
+            m_xMSF = getMSF();
         } catch ( Exception e ){
-            failed ( "Cannot create service factory!" );
+            fail( "Cannot create service factory!" );
         }
         if ( m_xMSF == null ) {
-            failed ( "Cannot create service factory!" );
+            fail( "Cannot create service factory!" );
         }
     }
 
-    public void after () {
+    @After public void after () {
+        System.out.println("after()");
         m_xMSF = null;
     }
 
-    public void ExecuteTest01() {
-        OLESimpleStorageTest aTest = new Test01( m_xMSF, log );
-        assure( "Test01 failed!", aTest.test() );
+    @Test public void ExecuteTest01() {
+        System.out.println("ExecuteTest01()");
+        OLESimpleStorageTest aTest = new Test01( m_xMSF );
+        assertTrue( "Test01 failed!", aTest.test() );
     }
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+//        try
+//        {
+//            Thread.sleep(5000);
+//        }
+//        catch (java.lang.InterruptedException e)
+//        {
+//        }
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
 }
\ No newline at end of file
diff --git a/sot/qa/complex/olesimplestorage/Test01.java b/sot/qa/complex/olesimplestorage/Test01.java
index c9010e61231a..ad32e6e55a6b 100644
--- a/sot/qa/complex/olesimplestorage/Test01.java
+++ b/sot/qa/complex/olesimplestorage/Test01.java
@@ -1,6 +1,6 @@
 package complex.olesimplestorage;
 
-import complexlib.ComplexTestCase;
+
 
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.io.XInputStream;
@@ -10,7 +10,7 @@ import com.sun.star.embed.XOLESimpleStorage;
 import com.sun.star.uno.UnoRuntime;
 
 import java.util.Random;
-import share.LogWriter;
+
 
 public class Test01 implements OLESimpleStorageTest
 {
@@ -19,10 +19,10 @@ public class Test01 implements OLESimpleStorageTest
     final int pStreamCnt = 5;
     final int pBytesCnt = 10;
 
-    public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter )
+    public Test01 ( XMultiServiceFactory xMSF )
     {
         m_xMSF = xMSF;
-        m_aTestHelper = new TestHelper (aLogWriter, "Test01: ");
+        m_aTestHelper = new TestHelper ("Test01: ");
     }
 
     public boolean test ()
@@ -31,7 +31,7 @@ public class Test01 implements OLESimpleStorageTest
         {
             //create a new temporary stream
             Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" );
-            XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface ( XTempFile.class, oTempFile );
+            XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile);
             m_aTestHelper.Message ( "A new temporary stream created." );
 
             //create OLESimpleStorage based on it
@@ -39,7 +39,7 @@ public class Test01 implements OLESimpleStorageTest
             pArgs[0] = (Object) xTempFile;
             pArgs[1] = new Boolean( true );
             Object oOLESimpleStorage = m_xMSF.createInstanceWithArguments ( "com.sun.star.embed.OLESimpleStorage", pArgs );
-            XOLESimpleStorage xOLESimpleStorage = (XOLESimpleStorage) UnoRuntime.queryInterface ( XOLESimpleStorage.class, oOLESimpleStorage );
+            XOLESimpleStorage xOLESimpleStorage = UnoRuntime.queryInterface(XOLESimpleStorage.class, oOLESimpleStorage);
             m_aTestHelper.Message ( "OLESimpleStorage based on XStream created." );
 
             //fill it with some streams
@@ -53,7 +53,7 @@ public class Test01 implements OLESimpleStorageTest
             {
                 oRandom.nextBytes (pBytesOut[i]);
                 oStream[i] = m_xMSF.createInstance ( "com.sun.star.io.TempFile" );
-                xTempStream[i] = (XTempFile) UnoRuntime.queryInterface ( XTempFile.class, oStream[i] );
+                xTempStream[i] = UnoRuntime.queryInterface(XTempFile.class, oStream[i]);
                 xTempStream[i].getOutputStream ().writeBytes (pBytesOut[i]);
                 xTempStream[i].seek (0);
                 m_aTestHelper.Message ( "Substream " + i + " initialized." );
@@ -83,7 +83,7 @@ public class Test01 implements OLESimpleStorageTest
             //open the same stream with the constructor for inputstream
             pArgs[0] = (Object)xTempFile.getInputStream ();
             oOLESimpleStorage = m_xMSF.createInstanceWithArguments ( "com.sun.star.embed.OLESimpleStorage", pArgs );
-            xOLESimpleStorage = (XOLESimpleStorage)UnoRuntime.queryInterface ( XOLESimpleStorage.class, oOLESimpleStorage );
+            xOLESimpleStorage = UnoRuntime.queryInterface(XOLESimpleStorage.class, oOLESimpleStorage);
             m_aTestHelper.Message ( "Storage reopened, based on XInputStream." );
 
             //check that all the streams contain correct information
@@ -92,8 +92,7 @@ public class Test01 implements OLESimpleStorageTest
             {
                 if ( xOLESimpleStorage.hasByName (sSubStreamPrefix + i) )
                 {
-                    xTempStream[i] = (XTempFile)UnoRuntime.queryInterface (
-                    XTempFile.class, xOLESimpleStorage.getByName (sSubStreamPrefix + i) );
+                    xTempStream[i] = UnoRuntime.queryInterface(XTempFile.class, xOLESimpleStorage.getByName(sSubStreamPrefix + i));
                     xTempStream[i].seek (0);
                     xTempStream[i].getInputStream ().readBytes (pBytesIn[i], pBytesIn[i][0].length + 1 );
                     for ( int j = 0; j < pBytesCnt; ++j )
@@ -120,6 +119,7 @@ public class Test01 implements OLESimpleStorageTest
         catch ( Exception e )
         {
             m_aTestHelper.Error ( "Exception: " + e );
+            return false;
         }
         return true;
     }
diff --git a/sot/qa/complex/olesimplestorage/TestHelper.java b/sot/qa/complex/olesimplestorage/TestHelper.java
index 4b29ed15e393..e9e14f8d68c0 100644
--- a/sot/qa/complex/olesimplestorage/TestHelper.java
+++ b/sot/qa/complex/olesimplestorage/TestHelper.java
@@ -1,26 +1,27 @@
 package complex.olesimplestorage;
 
-import share.LogWriter;
 
 public class TestHelper
 {
-    LogWriter m_aLogWriter;
+
     String m_sTestPrefix;
 
-    /** Creates a new instance of TestHelper */
-    public TestHelper ( LogWriter aLogWriter, String sTestPrefix )
+    /** Creates a new instance of TestHelper
+     * @param sTestPrefix
+     */
+    public TestHelper (  String sTestPrefix )
     {
-        m_aLogWriter = aLogWriter;
+
         m_sTestPrefix = sTestPrefix;
     }
 
     public void Error ( String sError )
     {
-        m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError );
+        System.out.println ( m_sTestPrefix + "Error: " + sError );
     }
 
     public void Message ( String sMessage )
     {
-        m_aLogWriter.println ( m_sTestPrefix + sMessage );
+        System.out.println ( m_sTestPrefix + sMessage );
     }
 }
diff --git a/sot/qa/complex/olesimplestorage/makefile.mk b/sot/qa/complex/olesimplestorage/makefile.mk
index 3420d798c9bc..cf3facf94d66 100644
--- a/sot/qa/complex/olesimplestorage/makefile.mk
+++ b/sot/qa/complex/olesimplestorage/makefile.mk
@@ -25,60 +25,38 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = OLESimpleStorageUnitTest
-PRJNAME = sot
-PACKAGE = complex$/olesimplestorage
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-
-JAVAFILES       =\
-                                OLESimpleStorageUnitTest.java\
-                                OLESimpleStorageTest.java\
-                TestHelper.java\
-                Test01.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-MAXLINELENGTH = 100000
+PRJ = ../../..
+PRJNAME = sot
+TARGET = qa_complex_olesimplestorage
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/olesimplestorage
+JAVATESTFILES = \
+    OLESimpleStorageUnitTest.java
 
-# --- Parameters for the test --------------------------------------
+JAVAFILES = $(JAVATESTFILES) \
+    OLESimpleStorageTest.java \
+    Test01.java \
+    TestHelper.java
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+ALLTAR : javatest
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.END
 
-# --- Targets ------------------------------------------------------
 
-.INCLUDE: target.mk
 
-RUN: run
 
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
 
 
diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index fab908716a37..7970156e72aa 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.cxx
@@ -158,7 +158,7 @@ class EasyFat
 
 public:
     EasyFat( StgIo & rIo, StgStrm *pFatStream, INT32 nPSize );
-    ~EasyFat() { delete pFat; delete pFree; }
+    ~EasyFat() { delete[] pFat; delete[] pFree; }
     INT32 GetPageSize() { return nPageSize; }
     INT32 Count() { return nPages; }
     INT32 operator[]( INT32 nOffset ) { return pFat[ nOffset ]; }
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index cd56c1f62464..840f2cf2bba8 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -41,13 +41,7 @@
 #include "stgdir.hxx"
 #include "stgio.hxx"
 
-#if defined(W31)
-        #include <tools/svwin.h>
-    #define memcpy hmemcpy
-    #define __HUGE _huge
-#else
-    #define __HUGE
-#endif
+#define __HUGE
 
 ///////////////////////////// class StgFAT ///////////////////////////////
 
diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx
index 00326333546d..083a4d585ca1 100644
--- a/sot/source/unoolestorage/register.cxx
+++ b/sot/source/unoolestorage/register.cxx
@@ -69,33 +69,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp
     return pRet;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-
-            uno::Reference< registry::XRegistryKey >  xNewKey;
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                        OLESimpleStorage::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-
-            const uno::Sequence< ::rtl::OUString > &rServices = OLESimpleStorage::impl_staticGetSupportedServiceNames();
-            for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-                xNewKey->createKey( rServices.getConstArray()[ind] );
-
-            return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 } // extern "C"
 
diff --git a/sot/util/makefile.mk b/sot/util/makefile.mk
index cd1af59a5879..453dbddc5857 100644
--- a/sot/util/makefile.mk
+++ b/sot/util/makefile.mk
@@ -79,3 +79,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo Making: $@
     $(TYPE) sot.flt > $@
 
+
+ALLTAR : $(MISC)/sot.component
+
+$(MISC)/sot.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sot.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sot.component
diff --git a/sot/util/sot.component b/sot/util/sot.component
new file mode 100644
index 000000000000..7d17c7d54475
--- /dev/null
+++ b/sot/util/sot.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org 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 version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.embed.OLESimpleStorage">
+    <service name="com.sun.star.embed.OLESimpleStorage"/>
+  </implementation>
+</component>