CWS-TOOLING: integrate CWS dba31j_DEV300

2009-03-11 12:24:24 +0100 iha  r269311 : #i100102# report donut charts crash on load
2009-03-11 10:44:35 +0100 oj  r269302 : #i100102# export meta.xml
2009-03-11 07:35:03 +0100 oj  r269296 : #i99686# not used anymore
2009-03-11 07:34:27 +0100 oj  r269295 : #i99686# not used anymore
2009-03-11 07:33:57 +0100 oj  r269294 : #i99686# change storage usage
2009-03-10 15:21:41 +0100 mav  r269275 : #i99686# test additional scenario
2009-03-10 08:37:10 +0100 mav  r269239 : #i100040# calculate the name length correctly
2009-03-10 08:25:16 +0100 mav  r269236 : #i99686# workaround to prevent crash while disposing the hierarchical stream
2009-03-10 07:14:05 +0100 oj  r269235 : #i99686# fix usage of storage api
2009-03-10 07:13:17 +0100 oj  r269234 : #i99686# fix usage of storage api
2009-03-09 13:33:26 +0100 fs  r269085 : #i100012#
2009-03-09 13:11:08 +0100 fs  r269081 : #i100036# don't store sub documents which have not been touched
2009-03-09 11:21:17 +0100 fs  r269070 : #i100040# don't silence errors in impl_storeToStorage_throw
2009-03-09 10:28:48 +0100 oj  r269065 : #i100036# throw exception when no activeConnection exists

5 files changed, 190 insertions, 35 deletions

diff --git a/package/qa/storages/StorageUnitTest.java b/package/qa/storages/StorageUnitTest.java
index 83bfd79358e7..7e8caa314e96 100644
--- a/package/qa/storages/StorageUnitTest.java
+++ b/package/qa/storages/StorageUnitTest.java
@@ -83,6 +83,7 @@ public class StorageUnitTest  extends ComplexTestCase
                                 "ExecuteTest14",
                                 "ExecuteTest15",
                                 "ExecuteTest16",
+                                "ExecuteTest17",
                                 "ExecuteRegressionTest_114358",
                                 "ExecuteRegressionTest_i29169",
                                 "ExecuteRegressionTest_i30400",
@@ -227,6 +228,12 @@ public class StorageUnitTest  extends ComplexTestCase
         assure( "Test16 failed!", aTest.test() );
     }
 
+    public void ExecuteTest17()
+    {
+        StorageTest aTest = new Test17( m_xMSF, m_xStorageFactory, log );
+        assure( "Test17 failed!", aTest.test() );
+    }
+
 
     public void ExecuteRegressionTest_114358()
     {
diff --git a/package/qa/storages/Test17.java b/package/qa/storages/Test17.java
new file mode 100644
index 000000000000..009344cefbc4
--- /dev/null
+++ b/package/qa/storages/Test17.java
@@ -0,0 +1,142 @@
+package complex.storages;
+
+import com.sun.star.uno.XInterface;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XSingleServiceFactory;
+
+import com.sun.star.bridge.XUnoUrlResolver;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
+import com.sun.star.io.XStream;
+import com.sun.star.io.XInputStream;
+
+import com.sun.star.embed.*;
+
+import share.LogWriter;
+import complex.storages.TestHelper;
+import complex.storages.StorageTest;
+
+public class Test17 implements StorageTest {
+
+    XMultiServiceFactory m_xMSF;
+    XSingleServiceFactory m_xStorageFactory;
+    TestHelper m_aTestHelper;
+
+    public Test17( XMultiServiceFactory xMSF, XSingleServiceFactory xStorageFactory, LogWriter aLogWriter )
+    {
+        m_xMSF = xMSF;
+        m_xStorageFactory = xStorageFactory;
+        m_aTestHelper = new TestHelper( aLogWriter, "Test17: " );
+    }
+
+    public boolean test()
+    {
+        try
+        {
+            XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
+            if ( xTempFileStream == null )
+                return false;
+
+            // create storage based on the temporary stream
+            Object pArgs[] = new Object[2];
+            pArgs[0] = (Object) xTempFileStream;
+            pArgs[1] = new Integer( ElementModes.WRITE );
+
+            Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs );
+            XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage );
+            if ( xTempStorage == null )
+            {
+                m_aTestHelper.Error( "Can't create temporary storage representation!" );
+                return false;
+            }
+
+
+            byte pBytes1[] = { 1, 1, 1, 1, 1 };
+            String pNames[] = { "SubStream1", "SubStream2", "SubStream3", "SubStream4", "SubStream5", "SubStream6", "SubStream7" };
+
+            for ( int nInd = 0; nInd < pNames.length; nInd++ )
+            {
+                // open a new substorage
+                XStorage xTempSubStorage = m_aTestHelper.openSubStorage( xTempStorage,
+                                                                        "SubStorage1",
+                                                                        ElementModes.WRITE );
+                if ( xTempSubStorage == null )
+                {
+                    m_aTestHelper.Error( "Can't create substorage!" );
+                    return false;
+                }
+
+                // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
+                if ( !m_aTestHelper.WriteBytesToSubstream( xTempSubStorage, pNames[nInd], "MediaType1", true, pBytes1 ) )
+                    return false;
+
+                // commit substorage first
+                if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
+                    return false;
+
+                // dispose used storage to free resources
+                if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
+                    return false;
+            }
+
+            // commit the root storage so the contents must be stored now
+            if ( !m_aTestHelper.commitStorage( xTempStorage ) )
+                return false;
+
+            // dispose used storage to free resources
+            if ( !m_aTestHelper.disposeStorage( xTempStorage ) )
+                return false;
+
+
+            // ================================================
+            // now check all the written information
+            // ================================================
+
+            // close the output part of the temporary stream
+            // the output part must present since we already wrote to the stream
+            if ( !m_aTestHelper.closeOutput( xTempFileStream ) )
+                return false;
+
+            XInputStream xTempInStream = m_aTestHelper.getInputStream( xTempFileStream );
+            if ( xTempInStream == null )
+                return false;
+
+
+            // open input stream
+            // since no mode is provided the result storage must be opened readonly
+            Object pOneArg[] = new Object[1];
+            pOneArg[0] = (Object) xTempInStream;
+
+            Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pOneArg );
+            XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage );
+            if ( xResultStorage == null )
+            {
+                m_aTestHelper.Error( "Can't open storage based on input stream!" );
+                return false;
+            }
+
+            // open existing substorage
+            XStorage xResultSubStorage = m_aTestHelper.openSubStorage( xResultStorage,
+                                                                        "SubStorage1",
+                                                                        ElementModes.READ );
+            if ( xResultSubStorage == null )
+            {
+                m_aTestHelper.Error( "Can't open existing substorage!" );
+                return false;
+            }
+
+            for ( int nInd = 0; nInd < pNames.length; nInd++ )
+                if ( !m_aTestHelper.checkStream( xResultSubStorage, pNames[nInd], "MediaType1", true, pBytes1 ) )
+                    return false;
+
+            return true;
+        }
+        catch( Exception e )
+        {
+            m_aTestHelper.Error( "Exception: " + e );
+            return false;
+        }
+    }
+
+}
+
diff --git a/package/qa/storages/makefile.mk b/package/qa/storages/makefile.mk
index 7caa832a543d..a8a5bbf8219e 100644
--- a/package/qa/storages/makefile.mk
+++ b/package/qa/storages/makefile.mk
@@ -63,6 +63,7 @@ JAVAFILES       =\
                 Test14.java\
                 Test15.java\
                 Test16.java\
+                Test17.java\
                 RegressionTest_114358.java\
                 RegressionTest_i29169.java\
                 RegressionTest_i30400.java\
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 111eaa357d31..b3b9ec6affa2 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -2249,52 +2249,57 @@ void SAL_CALL OWriteStream::dispose()
         throw ( uno::RuntimeException )
 {
     // should be an internal method since it can be called only from parent storage
+    {
+        ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
-    ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
-
-    if ( !m_pImpl )
-        throw lang::DisposedException();
-
-    if ( m_xOutStream.is() )
-        CloseOutput_Impl();
+        if ( !m_pImpl )
+            throw lang::DisposedException();
 
-    if ( m_xInStream.is() )
-    {
-        m_xInStream->closeInput();
-        m_xInStream = uno::Reference< io::XInputStream >();
-    }
+        if ( m_xOutStream.is() )
+            CloseOutput_Impl();
 
-       lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
-    m_pData->m_aListenersContainer.disposeAndClear( aSource );
+        if ( m_xInStream.is() )
+        {
+            m_xInStream->closeInput();
+            m_xInStream = uno::Reference< io::XInputStream >();
+        }
 
-    m_pImpl->m_pAntiImpl = NULL;
+        m_pImpl->m_pAntiImpl = NULL;
 
-    if ( !m_bInitOnDemand )
-    {
-        try
+        if ( !m_bInitOnDemand )
         {
-            if ( !m_bTransacted )
+            try
             {
-                m_pImpl->Commit();
+                if ( !m_bTransacted )
+                {
+                    m_pImpl->Commit();
+                }
+                else
+                {
+                    // throw away all the changes
+                    m_pImpl->Revert();
+                }
             }
-            else
+            catch( uno::Exception& )
             {
-                // throw away all the changes
-                m_pImpl->Revert();
+                uno::Any aCaught( ::cppu::getCaughtException() );
+                throw lang::WrappedTargetRuntimeException(
+                                                ::rtl::OUString::createFromAscii( "Can not commit/revert the storage!\n" ),
+                                                uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
+                                                                                    uno::UNO_QUERY ),
+                                                aCaught );
             }
         }
-        catch( uno::Exception& )
-        {
-               uno::Any aCaught( ::cppu::getCaughtException() );
-            throw lang::WrappedTargetRuntimeException(
-                                            ::rtl::OUString::createFromAscii( "Can not commit/revert the storage!\n" ),
-                                            uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
-                                                                                uno::UNO_QUERY ),
-                                            aCaught );
-        }
+
+        m_pImpl = NULL;
     }
 
-    m_pImpl = NULL;
+    // the listener might try to get rid of parent storage, and the storage would delete this object;
+    // for now the listener is just notified at the end of the method to workaround the problem
+    // in future a more elegant way should be found
+
+       lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) );
+    m_pData->m_aListenersContainer.disposeAndClear( aSource );
 }
 
 //-----------------------------------------------
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index d6f115a3a09b..1d5e900e28fe 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -271,7 +271,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
         // it is an empty subfolder, use workaround to store it
         ZipEntry* pTempEntry = new ZipEntry();
         ZipPackageFolder::copyZipEntry ( *pTempEntry, aEntry );
-        pTempEntry->nNameLen = (sal_Int16)rPath.getLength();
+        pTempEntry->nNameLen = (sal_Int16)( ::rtl::OUStringToOString( rPath, RTL_TEXTENCODING_UTF8 ).getLength() );
         pTempEntry->nExtraLen = -1;
         pTempEntry->sName = rPath;
 
@@ -333,7 +333,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
 
             ZipPackageFolder::copyZipEntry ( *pTempEntry, pStream->aEntry );
             pTempEntry->sName = rPath + rShortName;
-            pTempEntry->nNameLen = (sal_Int16)( pTempEntry->sName.getLength() );
+            pTempEntry->nNameLen = (sal_Int16)( ::rtl::OUStringToOString( pTempEntry->sName, RTL_TEXTENCODING_UTF8 ).getLength() );
 
             sal_Bool bToBeEncrypted = pStream->IsToBeEncrypted() && (bHaveEncryptionKey || pStream->HasOwnKey());
             sal_Bool bToBeCompressed = bToBeEncrypted ? sal_True : pStream->IsToBeCompressed();