CWS-TOOLING: integrate CWS dba32f

2009-08-31 10:43:51 +0200 msc  r275590 : #no issuezilla available# make the testcase more error proof
2009-08-31 10:43:28 +0200 msc  r275589 : #no issuezilla available# make the testcase more error proof
2009-08-31 10:40:33 +0200 msc  r275588 : i85993 remove bugid
2009-08-31 10:38:28 +0200 msc  r275587 : i100000
2009-08-27 13:27:32 +0200 fs  r275476 : #i103882#
2009-08-27 12:47:54 +0200 fs  r275474 : #i104544#
do not allow re-entrance for impl_ensureControl_nothrow
Actually, this is part of the fix only. I also removed the code which triggered this re-entrance (from
the grid control implementation), but to ensure it won't happen, again, I added some safety herein.
2009-08-27 12:47:16 +0200 fs  r275473 : #i104544# SetState: Do not call Update at the window which we just set text for. It should (sic\!) not be needed, but causes trouble
2009-08-27 10:18:05 +0200 mav  r275461 : #i103266# do not allow any stream operation on package streams while commiting the package
2009-08-20 15:25:48 +0200 fs  r275184 : #i104362# fall back to a ViewObjectContactOfSdrObj in case we don't have a page view
2009-08-20 15:25:06 +0200 fs  r275183 : AUGMENT_LIBRARY_PATH
2009-08-20 15:10:34 +0200 fs  r275182 : AUGMENT_LIBRARY_PATH
2009-08-20 09:50:36 +0200 oj  r275167 : #i104266# notify propertyforward when new dest was created
2009-08-19 08:01:28 +0200 mav  r275133 : #i103266# fix the typo
2009-08-18 22:45:34 +0200 fs  r275131 : #i10000#
2009-08-18 13:53:07 +0200 oj  r275105 : #i104266# set column settings after alter columns
2009-08-18 13:41:49 +0200 fs  r275103 : #i102550# do not interpret names of existing data sources as system path
2009-08-18 13:13:05 +0200 oj  r275097 : #i103882# use correct number Format
2009-08-18 12:59:13 +0200 fs  r275094 : #i104181#
2009-08-18 09:07:48 +0200 fs  r275079 : updated readme to refer to proper 1.1.14
2009-08-18 08:32:31 +0200 oj  r275077 : #i104187# wrong default for FirstCellAsLabel corrected
2009-08-18 08:10:00 +0200 oj  r275076 : #i104187# dispose status controller to avoid access of dead statusBar in sfx
2009-08-17 21:56:19 +0200 fs  r275074 : merge fix for issue #102564# from dba32e
2009-08-17 15:34:40 +0200 fs  r275058 : don't set MaxFieldSize to 0 unconditionally
2009-08-17 14:33:57 +0200 oj  r275054 : #i103528# patch for bitxtor
2009-08-17 14:12:26 +0200 oj  r275051 : #i104160# fix VerticalAlignment
2009-08-17 14:11:47 +0200 oj  r275050 : #i104160# fix VerticalAlignment
2009-08-14 15:54:04 +0200 mav  r274989 : #i103266# avoid possibility for race condition
2009-08-13 13:52:43 +0200 fs  r274939 : improved diagnostics
2009-08-13 13:52:28 +0200 fs  r274938 : typo
2009-08-13 12:51:03 +0200 fs  r274934 : #i103763# provided by cloph: correct libIDL check when compiling Mozilla
2009-08-13 12:43:23 +0200 fs  r274933 : #i103763# provided by cloph: allow to cross-compile prebuilt zips on Mac
2009-08-13 12:41:15 +0200 fs  r274932 : #i103371# fire PREPARECLOSEDOC even for embedded objects (why not?)
2009-08-13 12:24:49 +0200 fs  r274930 : #i99890# remove 'Insert Control' from the popup menu
2009-08-13 12:23:38 +0200 fs  r274929 : #i99890# DoToolboxAction: assert unknown/unimplemented actions
2009-08-13 09:32:07 +0200 fs  r274923 : #i103721#
2009-08-13 09:26:32 +0200 fs  r274922 : #i99894# provided by dtardon: xforms_nowFunction: use proper memory allocation function
2009-08-13 09:20:21 +0200 fs  r274921 : #i103938# provided by cmc: pass proper arguments to OUString::intern
2009-08-12 22:34:28 +0200 fs  r274916 : #i104139# when executing a PopupMenu, pass the POPUPMENU_NOMOUSEUPCLOSE flag

1 files changed, 16 insertions, 9 deletions

diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 4bd3a3597..89dbbb2ab 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -492,13 +492,14 @@ Reference < XInputStream > ZipFile::createMemoryStream(
 }
 #endif
 Reference < XInputStream > ZipFile::createUnbufferedStream(
+            SotMutexHolderRef aMutexHolder,
             ZipEntry & rEntry,
             const ORef < EncryptionData > &rData,
             sal_Int8 nStreamMode,
             sal_Bool bIsEncrypted,
             ::rtl::OUString aMediaType )
 {
-    return new XUnbufferedStream ( rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode );
+    return new XUnbufferedStream ( aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode );
 }
 
 
@@ -509,7 +510,8 @@ ZipEnumeration * SAL_CALL ZipFile::entries(  )
 
 Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        sal_Bool bIsEncrypted )
+        sal_Bool bIsEncrypted,
+        SotMutexHolderRef aMutexHolder )
     throw(IOException, ZipException, RuntimeException)
 {
     if ( rEntry.nOffset <= 0 )
@@ -525,7 +527,8 @@ Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
     if ( bIsEncrypted && !rData.isEmpty() && rData->aDigest.getLength() )
         bNeedRawStream = !hasValidPassword ( rEntry, rData );
 
-    return createUnbufferedStream ( rEntry,
+    return createUnbufferedStream ( aMutexHolder,
+                                    rEntry,
                                     rData,
                                     bNeedRawStream ? UNBUFF_STREAM_RAW : UNBUFF_STREAM_DATA,
                                     bIsEncrypted );
@@ -533,7 +536,8 @@ Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry,
 
 Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        sal_Bool bIsEncrypted )
+        sal_Bool bIsEncrypted,
+        SotMutexHolderRef aMutexHolder )
     throw ( packages::WrongPasswordException,
             IOException,
             ZipException,
@@ -562,7 +566,8 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
     else
         bNeedRawStream = ( rEntry.nMethod == STORED );
 
-    return createUnbufferedStream ( rEntry,
+    return createUnbufferedStream ( aMutexHolder,
+                                    rEntry,
                                     rData,
                                     bNeedRawStream ? UNBUFF_STREAM_RAW : UNBUFF_STREAM_DATA,
                                     bIsEncrypted );
@@ -570,19 +575,21 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry,
 
 Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        sal_Bool bIsEncrypted )
+        sal_Bool bIsEncrypted,
+        SotMutexHolderRef aMutexHolder )
     throw(IOException, ZipException, RuntimeException)
 {
     if ( rEntry.nOffset <= 0 )
         readLOC( rEntry );
 
-    return createUnbufferedStream ( rEntry, rData, UNBUFF_STREAM_RAW, bIsEncrypted );
+    return createUnbufferedStream ( aMutexHolder, rEntry, rData, UNBUFF_STREAM_RAW, bIsEncrypted );
 }
 
 Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
         ZipEntry& rEntry,
         const vos::ORef < EncryptionData > &rData,
-        const ::rtl::OUString& aMediaType )
+        const ::rtl::OUString& aMediaType,
+        SotMutexHolderRef aMutexHolder )
     throw ( packages::NoEncryptionException,
             IOException,
             ZipException,
@@ -594,7 +601,7 @@ Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream(
     if ( rEntry.nOffset <= 0 )
         readLOC( rEntry );
 
-    return createUnbufferedStream ( rEntry, rData, UNBUFF_STREAM_WRAPPEDRAW, sal_True, aMediaType );
+    return createUnbufferedStream ( aMutexHolder, rEntry, rData, UNBUFF_STREAM_WRAPPEDRAW, sal_True, aMediaType );
 }
 
 sal_Bool ZipFile::readLOC( ZipEntry &rEntry )