recreated tag libreoffice-3.3.3.1 which had these commits:

commit d7e53cee633ec1c583c72e6d9c01122195c4383c (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue May 31 17:39:04 2011 +0200

    Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)

10 files changed, 66 insertions, 66 deletions

diff --git a/package/qa/ofopxmlstorages/StorageUnitTest.java b/package/qa/ofopxmlstorages/StorageUnitTest.java
index 65294d46bbb9..228666c2f2e1 100644
--- a/package/qa/ofopxmlstorages/StorageUnitTest.java
+++ b/package/qa/ofopxmlstorages/StorageUnitTest.java
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/package/qa/ofopxmlstorages/Test01.java b/package/qa/ofopxmlstorages/Test01.java
index abb73c3fc48b..04510ea73e05 100644
--- a/package/qa/ofopxmlstorages/Test01.java
+++ b/package/qa/ofopxmlstorages/Test01.java
@@ -58,7 +58,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             XStorage xTempStorage = m_aTestHelper.createTempStorage( m_xMSF, m_xStorageFactory );
@@ -77,7 +77,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -99,7 +99,7 @@ public class Test01 implements StorageTest {
                                                         pBytes2,
                                                         aRelations2 ) )
                 return false;
-
+        
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             true,
@@ -113,7 +113,7 @@ public class Test01 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations1 ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             XStorage xTempFileStorage = m_aTestHelper.createStorageFromURL( m_xStorageFactory,
                                                                             sTempFileURL,
@@ -162,7 +162,7 @@ public class Test01 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -194,7 +194,7 @@ public class Test01 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test02.java b/package/qa/ofopxmlstorages/Test02.java
index 4ba7892b8295..3b85a5b5c9c8 100644
--- a/package/qa/ofopxmlstorages/Test02.java
+++ b/package/qa/ofopxmlstorages/Test02.java
@@ -48,7 +48,7 @@ public class Test02 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             XStorage xTempStorage = m_aTestHelper.createStorageFromStream( m_xStorageFactory,
                                                                             xTempFileStream,
@@ -68,7 +68,7 @@ public class Test02 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -93,7 +93,7 @@ public class Test02 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -120,7 +120,7 @@ public class Test02 implements StorageTest {
             if ( xTempInStream == null )
                 return false;
 
-
+        
             // open input stream
             XStorage xResultStorage = m_aTestHelper.createStorageFromInputStream( m_xStorageFactory, xTempInStream );
             if ( xResultStorage == null )
@@ -141,7 +141,7 @@ public class Test02 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResultSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -158,7 +158,7 @@ public class Test02 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test03.java b/package/qa/ofopxmlstorages/Test03.java
index e3424c9106f2..ee2a892d2080 100644
--- a/package/qa/ofopxmlstorages/Test03.java
+++ b/package/qa/ofopxmlstorages/Test03.java
@@ -61,7 +61,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -96,7 +96,7 @@ public class Test03 implements StorageTest {
 
             if ( !m_aTestHelper.disposeStorage( xTempSubStorage ) )
                 return false;
-
+                
             // ================================================
             // check storage hyerarchy tree
             // ================================================
@@ -166,14 +166,14 @@ public class Test03 implements StorageTest {
                 return false;
             }
 
-            if ( !( sRootCont[0].equals( "SubStorage1" ) && sRootCont[1].equals( "SubStream1" )
+            if ( !( sRootCont[0].equals( "SubStorage1" ) && sRootCont[1].equals( "SubStream1" ) 
                  || sRootCont[0].equals( "SubStream1" ) && sRootCont[1].equals( "SubStorage1" ) )
               || !( xRootNameAccess.hasByName( "SubStream1" ) && xRootNameAccess.hasByName( "SubStorage1" ) ) )
             {
                 m_aTestHelper.Error( "Root storage contains wrong list of children!" );
                 return false;
             }
-
+            
             // get storage through XNameAccess
             XStorage xResultSubStorage = getStorageFromNameAccess( xRootNameAccess, "SubStorage1" );
             if ( xResultSubStorage == null )
@@ -199,7 +199,7 @@ public class Test03 implements StorageTest {
                 m_aTestHelper.Error( "'SubStream2' can not be detected as child stream element of 'SubStorage1'!" );
                 return false;
             }
-
+            
             return true;
         }
         catch( Exception e )
@@ -207,7 +207,7 @@ public class Test03 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
     public XStorage getStorageFromNameAccess( XNameAccess xAccess, String sName )
     {
diff --git a/package/qa/ofopxmlstorages/Test04.java b/package/qa/ofopxmlstorages/Test04.java
index 8b99c15bd77c..5188b32b040f 100644
--- a/package/qa/ofopxmlstorages/Test04.java
+++ b/package/qa/ofopxmlstorages/Test04.java
@@ -61,7 +61,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "No valid temporary file was created!" );
                 return false;
             }
-
+        
             // create temporary storage based on arbitrary medium
             // after such a storage is closed it is lost
             XStorage xTempStorage = m_aTestHelper.createTempStorage( m_xMSF, m_xStorageFactory );
@@ -82,7 +82,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -114,7 +114,7 @@ public class Test04 implements StorageTest {
                                                         pBytes2,
                                                         aRelations2 ) )
                 return false;
-
+        
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempStorage,
                                                             true,
@@ -128,14 +128,14 @@ public class Test04 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations2 ) )
                 return false;
-
+    
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempSubStorage2,
                                                             false,
                                                             ElementModes.WRITE,
                                                             aRelations2 ) )
                 return false;
-
+    
             // create temporary storage based on a previously created temporary file
             XStorage xTempFileStorage = m_aTestHelper.createStorageFromURL( m_xStorageFactory,
                                                                             sTempFileURL,
@@ -216,7 +216,7 @@ public class Test04 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubStorage1,
                                                         false,
                                                         ElementModes.READ,
@@ -262,7 +262,7 @@ public class Test04 implements StorageTest {
             // remove element and check that it was removed completelly
             if ( !m_aTestHelper.removeElement( xResStorage, "SubStorage2" ) )
                 return false;
-
+                
             try
             {
                 XNameAccess xResAccess = (XNameAccess) UnoRuntime.queryInterface( XNameAccess.class, xResStorage );
@@ -302,7 +302,7 @@ public class Test04 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test05.java b/package/qa/ofopxmlstorages/Test05.java
index 36439ca6ebcd..971c0338b40b 100644
--- a/package/qa/ofopxmlstorages/Test05.java
+++ b/package/qa/ofopxmlstorages/Test05.java
@@ -89,7 +89,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
 
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
@@ -112,7 +112,7 @@ public class Test05 implements StorageTest {
                                                         pBytes2,
                                                         aRelations2 ) )
                 return false;
-
+    
             // set Relations for storages and check that "IsRoot" and "OpenMode" properties are set correctly
             if ( !m_aTestHelper.setStorageTypeAndCheckProps( xTempFileStorage,
                                                             true,
@@ -196,7 +196,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Wrong exception is thrown by disposed storage: " + e );
                 return false;
             }
-
+    
             try
             {
                 xSubStream1.getInputStream();
@@ -224,7 +224,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Wrong exception is thrown by disposed stream: " + e );
                 return false;
             }
-
+    
 
             // dispose root storage
             if ( !m_aTestHelper.disposeStorage( xTempFileStorage ) )
@@ -259,7 +259,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -275,7 +275,7 @@ public class Test05 implements StorageTest {
                 m_aTestHelper.Error( "Can't open existing substorage 'SubSubStorage'!" );
                 return false;
             }
-
+    
             if ( !m_aTestHelper.checkStorageProperties( xResSubSubStorage,
                                                         false,
                                                         ElementModes.READ,
@@ -308,7 +308,7 @@ public class Test05 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test06.java b/package/qa/ofopxmlstorages/Test06.java
index 61969db88e12..4db4a8989f5c 100644
--- a/package/qa/ofopxmlstorages/Test06.java
+++ b/package/qa/ofopxmlstorages/Test06.java
@@ -72,7 +72,7 @@ public class Test06 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+    
             // in case stream is open for reading it must exist
             try
             {
@@ -271,7 +271,7 @@ public class Test06 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test07.java b/package/qa/ofopxmlstorages/Test07.java
index bcd85d5d01c0..5499281c57e5 100644
--- a/package/qa/ofopxmlstorages/Test07.java
+++ b/package/qa/ofopxmlstorages/Test07.java
@@ -84,7 +84,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes2[] = { 2, 2, 2, 2, 2 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -140,7 +140,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "The new substorage still was not commited so it must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xClonedSubStorage ) )
                 return false;
 
@@ -206,7 +206,7 @@ public class Test07 implements StorageTest {
                 m_aTestHelper.Error( "The root storage still was not commited so it's clone must be empty!" );
                 return false;
             }
-
+            
             if ( !m_aTestHelper.disposeStorage( xCloneOfRoot ) )
                 return false;
 
@@ -253,6 +253,6 @@ public class Test07 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 }
 
diff --git a/package/qa/ofopxmlstorages/Test08.java b/package/qa/ofopxmlstorages/Test08.java
index eaed60d4d8e3..ab7f9b14bf44 100644
--- a/package/qa/ofopxmlstorages/Test08.java
+++ b/package/qa/ofopxmlstorages/Test08.java
@@ -47,7 +47,7 @@ public class Test08 implements StorageTest {
             XStream xTempFileStream = m_aTestHelper.CreateTempFileStream( m_xMSF );
             if ( xTempFileStream == null )
                 return false;
-
+        
             // create storage based on the temporary stream
             XStorage xTempStorage = m_aTestHelper.createStorageFromStream( m_xStorageFactory,
                                                                             xTempFileStream,
@@ -67,7 +67,7 @@ public class Test08 implements StorageTest {
                 m_aTestHelper.Error( "Can't create substorage!" );
                 return false;
             }
-
+            
             byte pBytes1[] = { 1, 1, 1, 1, 1 };
 
             // open a new substream, set "MediaType" and "Compressed" properties to it and write some bytes
@@ -92,7 +92,7 @@ public class Test08 implements StorageTest {
                                                             ElementModes.WRITE,
                                                             aRelations1 ) )
                 return false;
-
+    
             // commit substorage first
             if ( !m_aTestHelper.commitStorage( xTempSubStorage ) )
                 return false;
@@ -205,7 +205,7 @@ public class Test08 implements StorageTest {
             m_aTestHelper.Error( "Exception: " + e );
             return false;
         }
-    }
+    } 
 
     private boolean checkSubStorages( XStorage xStorage, byte[] pBytes1, StringPair[][] aRelations )
     {
diff --git a/package/qa/ofopxmlstorages/TestHelper.java b/package/qa/ofopxmlstorages/TestHelper.java
index 6b153fd2b960..abad297dfc00 100644
--- a/package/qa/ofopxmlstorages/TestHelper.java
+++ b/package/qa/ofopxmlstorages/TestHelper.java
@@ -37,7 +37,7 @@ public class TestHelper  {
             Error( "Can't get XOutputStream implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+    
         // get XTrucate implementation from output stream
         XTruncate xTruncate = (XTruncate) UnoRuntime.queryInterface( XTruncate.class, xOutput );
         if ( xTruncate == null )
@@ -45,7 +45,7 @@ public class TestHelper  {
             Error( "Can't get XTruncate implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         // write requested byte sequence
         try
         {
@@ -144,7 +144,7 @@ public class TestHelper  {
             Error( "Can't create substream '" + sStreamName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         return WriteBytesToStream( xSubStream, sStreamName, sMediaType, bCompressed, pBytes, aRelations );
     }
 
@@ -171,7 +171,7 @@ public class TestHelper  {
                     Error( "'IsRoot' property contains wrong value!" );
                     bOk = false;
                 }
-
+                    
                 if ( ( bIsRoot
                   && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
                   || ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
@@ -305,7 +305,7 @@ public class TestHelper  {
                             return false;
                         }
                     }
-
+                
                     break;
                 }
             }
@@ -313,7 +313,7 @@ public class TestHelper  {
 
         return true;
     }
-
+    
     public boolean checkStorageProperties( XStorage xStorage,
                                             boolean bIsRoot,
                                             int nMode,
@@ -337,7 +337,7 @@ public class TestHelper  {
                     Error( "'IsRoot' property contains wrong value!" );
                     bOk = false;
                 }
-
+                    
                 if ( ( bIsRoot
                   && ( nPropMode | ElementModes.READ ) != ( nMode | ElementModes.READ ) )
                   || ( !bIsRoot && ( nPropMode & nMode ) != nMode ) )
@@ -399,7 +399,7 @@ public class TestHelper  {
             Error( "Can't get XInputStream implementation from substream '" + sName + "'!" );
             return false;
         }
-
+    
         byte pContents[][] = new byte[1][]; // ???
 
         // read contents
@@ -453,11 +453,11 @@ public class TestHelper  {
                 bOk = true;
                 if ( !sPropMediaType.equals( sMediaType ) )
                 {
-                    Error( "'MediaType' property contains wrong value for stream '" + sName + "',\nexpected: '"
+                    Error( "'MediaType' property contains wrong value for stream '" + sName + "',\nexpected: '" 
                             + sMediaType + "', set: '" + sPropMediaType + "'!" );
                     bOk = false;
                 }
-
+    
                 if ( nPropSize != pBytes.length )
                 {
                     Error( "'Size' property contains wrong value for stream'" + sName + "'!" );
@@ -528,7 +528,7 @@ public class TestHelper  {
             Error( "Can't open substream '" + sName + "', exception : " + e + "!" );
             return false;
         }
-
+        
         boolean bResult = InternalCheckStream( xSubStream, sName, sMediaType, pBytes, aRelations );
 
         // free the stream resources, garbage collector may remove the object too late
@@ -576,7 +576,7 @@ public class TestHelper  {
 
         return true;
     }
-
+    
     public boolean disposeStream( XStream xStream, String sStreamName )
     {
         XComponent xComponent = (XComponent) UnoRuntime.queryInterface( XComponent.class, xStream );
@@ -585,7 +585,7 @@ public class TestHelper  {
             Error( "Can't get XComponent implementation from substream '" + sStreamName + "'!" );
             return false;
         }
-
+        
         try
         {
             xComponent.dispose();
@@ -666,7 +666,7 @@ public class TestHelper  {
             Error( "Can't close output part of a stream, exception :" + e );
             return false;
         }
-
+        
         return true;
     }
 
@@ -708,7 +708,7 @@ public class TestHelper  {
     public String CreateTempFile( XMultiServiceFactory xMSF )
     {
         String sResult = null;
-
+    
         // try to get temporary file representation
         XPropertySet xTempFileProps = null;
         try
@@ -900,7 +900,7 @@ public class TestHelper  {
                                 int nMode )
     {
         XStorage xResult = null;
-
+        
         try
         {
             PropertyValue[] aAddArgs = new PropertyValue[1];
@@ -924,7 +924,7 @@ public class TestHelper  {
 
         if ( xResult == null )
             Error( "Can't create storage from URL!" );
-
+            
         return xResult;
     }
 
@@ -934,7 +934,7 @@ public class TestHelper  {
                                 int nMode )
     {
         XStorage xResult = null;
-
+        
         try
         {
             PropertyValue[] aAddArgs = new PropertyValue[1];
@@ -958,7 +958,7 @@ public class TestHelper  {
 
         if ( xResult == null )
             Error( "Can't create storage from stream!" );
-
+            
         return xResult;
     }
 
@@ -967,7 +967,7 @@ public class TestHelper  {
                                 XInputStream xInStream )
     {
         XStorage xResult = null;
-
+        
         try
         {
             PropertyValue[] aAddArgs = new PropertyValue[1];
@@ -991,7 +991,7 @@ public class TestHelper  {
 
         if ( xResult == null )
             Error( "Can't create storage from input stream!" );
-
+            
         return xResult;
     }
 
@@ -1005,7 +1005,7 @@ public class TestHelper  {
             Error( "Can't create temp file stream!" );
             return null;
         }
-
+        
         try
         {
             xResult = createStorageFromStream( xFactory, xStream, ElementModes.WRITE );