Oliver Bolte
67880a5585
INTEGRATION: CWS mav17 (1.41.84); FILE MERGED
...
2005/03/01 10:02:52 mav 1.41.84.1: #i23531# improve document repairing
2005-03-15 10:50:19 +00:00
Oliver Bolte
662dae05f8
INTEGRATION: CWS mav17 (1.3.106); FILE MERGED
...
2005/03/01 10:02:51 mav 1.3.106.1: #i23531# improve document repairing
2005-03-15 10:50:05 +00:00
Oliver Bolte
dc985be7b0
INTEGRATION: CWS mav17 (1.8.8); FILE MERGED
...
2005/03/01 10:02:51 mav 1.8.8.1: #i23531# improve document repairing
2005-03-15 10:49:51 +00:00
Oliver Bolte
236003660b
INTEGRATION: CWS mav17 (1.19.106); FILE MERGED
...
2005/03/01 10:02:51 mav 1.19.106.1: #i23531# improve document repairing
2005-03-15 10:49:37 +00:00
Vladimir Glazounov
5d3310df82
INTEGRATION: CWS xmlsec08 (1.7.12); FILE MERGED
...
2005/01/17 11:25:30 mav 1.7.12.1: #i40028# use uptodate properties
2005-03-10 17:22:54 +00:00
Vladimir Glazounov
730bd03271
INTEGRATION: CWS xmlsec08 (1.8.12); FILE MERGED
...
2005/01/17 11:25:30 mav 1.8.12.1: #i40028# use uptodate properties
2005-03-10 17:22:40 +00:00
Vladimir Glazounov
241ee82b8f
INTEGRATION: CWS mav16 (1.96.6); FILE MERGED
...
2005/02/10 14:11:05 mav 1.96.6.1: #i41809# fallback to detect mediatype of a package with no manifest.xml
2005-02-25 08:38:23 +00:00
Vladimir Glazounov
a38dcc18fb
INTEGRATION: CWS mav16 (1.7.18); FILE MERGED
...
2005/02/10 14:11:05 mav 1.7.18.1: #i41809# fallback to detect mediatype of a package with no manifest.xml
2005-02-25 08:38:11 +00:00
Vladimir Glazounov
9496b744b3
INTEGRATION: CWS mav16 (1.16.18); FILE MERGED
...
2005/02/10 14:11:04 mav 1.16.18.1: #i41809# fallback to detect mediatype of a package with no manifest.xml
2005-02-25 08:37:58 +00:00
Vladimir Glazounov
2b0c932db3
INTEGRATION: CWS mav16 (1.36.34); FILE MERGED
...
2005/02/10 14:11:04 mav 1.36.34.1: #i41809# fallback to detect mediatype of a package with no manifest.xml
2005-02-25 08:37:46 +00:00
Jens-Heiner Rechtien
d248b57ef7
INTEGRATION: CWS buildcond02 (1.5.68); FILE MERGED
...
2004/12/09 16:43:09 mmeeks 1.5.68.1: Issue number: #i35742#
Submitted by: mmeeks
Conditionalize zlib.
2005-02-11 14:52:25 +00:00
Rüdiger Timm
2e3e9f343f
INTEGRATION: CWS mav15 (1.71.14); FILE MERGED
...
2005/01/19 12:48:06 mav 1.71.14.1: #i40527# preserv the original size of encrypted documents
2005-01-31 08:16:55 +00:00
Rüdiger Timm
49a7e48202
INTEGRATION: CWS mav15 (1.7.80); FILE MERGED
...
2005/01/17 11:47:17 mav 1.7.80.1: #i40527# raw access to encrypted streams
2005-01-31 08:16:41 +00:00
Oliver Bolte
e73939f7e4
INTEGRATION: CWS kso13 (1.95.4); FILE MERGED
...
2004/12/17 11:09:04 sb 1.95.4.1: #i38313# Replaced the i38298 XJob hack with the proper new XAsyncOutputMonitor.
2005-01-27 11:25:22 +00:00
Rüdiger Timm
8ff3e3969a
INTEGRATION: CWS oasisbf4 (1.2.184); FILE MERGED
...
2005/01/11 12:22:00 mav 1.2.184.1: #i38186# provide correct namespace information
2005-01-27 10:17:55 +00:00
Rüdiger Timm
0f5284308d
INTEGRATION: CWS oasisbf4 (1.7.184); FILE MERGED
...
2005/01/11 12:22:00 mav 1.7.184.1: #i38186# provide correct namespace information
2005-01-27 10:17:40 +00:00
Rüdiger Timm
c9f9fa6386
INTEGRATION: CWS oasisbf4 (1.5.186); FILE MERGED
...
2005/01/11 12:22:00 mav 1.5.186.1: #i38186# provide correct namespace information
2005-01-27 10:17:26 +00:00
Rüdiger Timm
e7e278ae17
INTEGRATION: CWS sb27 (1.94.22); FILE MERGED
...
2004/12/03 15:19:31 sb 1.94.22.1: #i38298# Use XJob.execute as a hack replacement for the expensive, recent implementation of fileaccess::XStream_impl::flush.
2004-12-07 10:00:54 +00:00
Mikhail Voitenko
7df08726d9
#100000# resolve conflict on integration of cws storagechange01
2004-11-29 10:00:31 +00:00
Jens-Heiner Rechtien
3073cf450a
INTEGRATION: CWS storagechange01 (1.69.8); FILE MERGED
...
2004/11/08 19:09:44 mav 1.69.8.1: #i35095# fix package and storage related problems
2004-11-26 20:12:24 +00:00
Jens-Heiner Rechtien
3f0721fbdf
INTEGRATION: CWS storagechange01 (1.13.10); FILE MERGED
...
2004/11/08 11:23:36 mav 1.13.10.4: #i35095# seek the result stream to beginning
2004/11/07 15:54:44 mav 1.13.10.3: #i35095# provide the new interface
2004/10/29 12:35:19 mav 1.13.10.2: #i35095# plain raw stream
2004/10/28 16:06:15 mav 1.13.10.1: #i35095# introduce XStorageRawAccess implementation
2004-11-26 20:03:09 +00:00
Jens-Heiner Rechtien
fcf072c1fb
INTEGRATION: CWS storagechange01 (1.16.58); FILE MERGED
...
2004/11/07 16:52:12 mav 1.16.58.2: #i26882# plane stream is provided only for unencrypted streams
2004/10/28 16:06:16 mav 1.16.58.1: #i35095# introduce XStorageRawAccess implementation
2004-11-26 19:46:38 +00:00
Jens-Heiner Rechtien
26c8e9c20d
INTEGRATION: CWS storagechange01 (1.39.12); FILE MERGED
...
2004/11/08 19:09:44 mav 1.39.12.4: #i35095# fix package and storage related problems
2004/11/07 16:52:12 mav 1.39.12.3: #i26882# plane stream is provided only for unencrypted streams
2004/11/07 16:45:23 mav 1.39.12.2: #i26882# plane stream is provided only for unencrypted streams
2004/10/28 16:06:16 mav 1.39.12.1: #i35095# introduce XStorageRawAccess implementation
2004-11-26 19:46:22 +00:00
Jens-Heiner Rechtien
bc19eb5540
INTEGRATION: CWS storagechange01 (1.6.18); FILE MERGED
...
2004/10/29 12:35:20 mav 1.6.18.2: #i35095# plain raw stream
2004/10/28 16:06:15 mav 1.6.18.1: #i35095# introduce XStorageRawAccess implementation
2004-11-26 19:46:00 +00:00
Jens-Heiner Rechtien
37951840fc
INTEGRATION: CWS storagechange01 (1.6.34); FILE MERGED
...
2004/10/28 16:06:14 mav 1.6.34.1: #i35095# introduce XStorageRawAccess implementation
2004-11-26 19:45:35 +00:00
Jens-Heiner Rechtien
07d1f6b4bb
INTEGRATION: CWS storagechange01 (1.7.18); FILE MERGED
...
2004/11/08 19:09:43 mav 1.7.18.2: #i35095# fix package and storage related problems
2004/10/28 16:06:14 mav 1.7.18.1: #i35095# introduce XStorageRawAccess implementation
2004-11-26 19:45:20 +00:00
Jens-Heiner Rechtien
dc30235420
INTEGRATION: CWS storagechange01 (1.4.34); FILE MERGED
...
2004/11/08 19:09:43 mav 1.4.34.1: #i35095# fix package and storage related problems
2004-11-26 19:45:06 +00:00
Oliver Bolte
959c5af635
INTEGRATION: CWS fwkbugfix03 (1.3.30); FILE MERGED
...
2004/10/14 12:44:41 as 1.3.30.4: seek to 0 before you request first 4 bytes of the stream
2004/10/12 07:51:34 as 1.3.30.3: dont use in/out parameters if out params are enough
2004/10/11 17:42:41 as 1.3.30.2: RESYNC: (1.3-1.4); FILE MERGED
2004/09/09 08:08:03 mav 1.3.30.1: #i33968# check signature of a stream on opening
2004-11-17 12:41:05 +00:00
Rüdiger Timm
e8f8242599
INTEGRATION: CWS tdoc3 (1.13.12); FILE MERGED
...
2004/11/03 13:08:30 kso 1.13.12.4: i36554# - parent storage must be set to modified on commit of child.
2004/11/03 12:27:16 mav 1.13.12.3: #i36554# the storage is modified only after the new child is commited
2004/11/01 16:58:25 kso 1.13.12.2: #i36025# - removeElement, renamElement, moveElementTo must set internal
state to 'modified' on success.
2004/11/01 10:35:09 mav 1.13.12.1: #i36346# transfer the mediatype for empty storages
2004-11-09 14:39:42 +00:00
Rüdiger Timm
923b6df32b
INTEGRATION: CWS sab012 (1.62.28); FILE MERGED
...
2004/10/12 20:24:18 sab 1.62.28.4: RESYNC: (1.66-1.69); FILE MERGED
2004/06/08 09:42:18 sab 1.62.28.3: RESYNC: (1.64-1.66); FILE MERGED
2004/02/18 11:19:18 sab 1.62.28.2: RESYNC: (1.62-1.64); FILE MERGED
2004/02/18 10:34:30 mav 1.62.28.1: #114338# solve conflict
2004-11-02 13:43:24 +00:00
Kurt Zenker
d0bad40495
INTEGRATION: CWS mav09 (1.4.136); FILE MERGED
...
2004/05/13 15:10:03 mav 1.4.136.1: #112768# remove dangerous references
2004-10-04 20:10:22 +00:00
Kurt Zenker
0c5bb3f42d
INTEGRATION: CWS mav09 (1.66.18); FILE MERGED
...
2004/09/17 00:05:02 mav 1.66.18.4: RESYNC: (1.66-1.67); FILE MERGED
2004/08/23 10:19:37 mav 1.66.18.3: #i27773# adopt to linux
2004/08/06 09:56:51 mav 1.66.18.2: #i29833# reimplement folders and streams life dependencies
2004/08/05 11:18:46 mav 1.66.18.1: #i26216# allow to commit empty folders
2004-10-04 20:10:12 +00:00
Kurt Zenker
0b13c92a23
INTEGRATION: CWS mav09 (1.11.28); FILE MERGED
...
2004/08/06 09:56:51 mav 1.11.28.1: #i29833# reimplement folders and streams life dependencies
2004-10-04 20:10:01 +00:00
Kurt Zenker
6b61d177a8
INTEGRATION: CWS mav09 (1.24.50); FILE MERGED
...
2004/08/06 09:56:51 mav 1.24.50.1: #i29833# reimplement folders and streams life dependencies
2004-10-04 20:09:49 +00:00
Kurt Zenker
098bfa8d46
INTEGRATION: CWS mav09 (1.91.2); FILE MERGED
...
2004/09/21 17:58:48 mav 1.91.2.6: RESYNC: (1.92-1.93); FILE MERGED
2004/09/17 00:04:55 mav 1.91.2.5: RESYNC: (1.91-1.92); FILE MERGED
2004/08/23 10:11:59 mav 1.91.2.4: #i27773# adopt to linux
2004/08/06 09:56:51 mav 1.91.2.3: #i29833# reimplement folders and streams life dependencies
2004/07/15 10:55:45 mav 1.91.2.2: #i27773# notification about corruption
2004/07/05 12:05:44 mav 1.91.2.1: #i27773# package repairing
2004-10-04 20:09:39 +00:00
Kurt Zenker
e2a1531524
INTEGRATION: CWS mav09 (1.4.86); FILE MERGED
...
2004/09/17 00:04:48 mav 1.4.86.2: RESYNC: (1.4-1.5); FILE MERGED
2004/08/06 09:56:51 mav 1.4.86.1: #i29833# reimplement folders and streams life dependencies
2004-10-04 20:08:42 +00:00
Kurt Zenker
33ca81f4af
INTEGRATION: CWS mav09 (1.6.28); FILE MERGED
...
2004/09/17 00:04:41 mav 1.6.28.14: RESYNC: (1.9-1.12); FILE MERGED
2004/09/02 12:01:52 mav 1.6.28.13: #i27773# allow to copy element to the same storage
2004/08/25 11:48:40 mav 1.6.28.12: #i27773# substorage must also implement XTransactionBroadcaster
2004/08/25 11:41:04 mav 1.6.28.11: #i27773# substorage must also implement XTransactionBroadcaster
2004/08/09 19:17:23 mav 1.6.28.10: RESYNC: (1.8-1.9); FILE MERGED
2004/08/06 09:55:46 mav 1.6.28.9: #i26216# handle empty storages in a special way
2004/08/05 11:18:46 mav 1.6.28.8: #i26216# allow to commit empty folders
2004/07/15 10:55:44 mav 1.6.28.7: #i27773# notification about corruption
2004/07/08 15:57:09 mav 1.6.28.6: RESYNC: (1.7-1.8); FILE MERGED
2004/07/05 09:45:57 mav 1.6.28.5: #i27773# wrap the original exception
2004/06/21 08:46:23 mav 1.6.28.4: #i30400# do not ignore target name
2004/05/17 17:47:24 mav 1.6.28.3: RESYNC: (1.6-1.7); FILE MERGED
2004/05/16 17:33:59 mba 1.6.28.2: #i27773#: problems when opening storage several times in different modes
2004/05/10 08:04:27 mba 1.6.28.1: #i27773#: typo in property name
2004-10-04 20:08:31 +00:00
Kurt Zenker
7fabf53f67
INTEGRATION: CWS mav09 (1.3.2); FILE MERGED
...
2004/07/05 10:30:13 mav 1.3.2.1: #i27773# provide status indicator
2004-10-04 20:08:20 +00:00
Kurt Zenker
e5ac0497fe
INTEGRATION: CWS mav09 (1.3.42); FILE MERGED
...
2004/05/13 15:10:03 mav 1.3.42.1: #112768# remove dangerous references
2004-10-04 20:08:09 +00:00
Kurt Zenker
4c0dd2d91f
INTEGRATION: CWS mav09 (1.34.100); FILE MERGED
...
2004/09/17 00:04:24 mav 1.34.100.2: RESYNC: (1.34-1.35); FILE MERGED
2004/07/15 10:55:44 mav 1.34.100.1: #i27773# notification about corruption
2004-10-04 20:07:34 +00:00
Rüdiger Timm
d938c0378b
INTEGRATION: CWS keyconfig01 (1.66.20); FILE MERGED
...
2004/07/23 09:36:47 as 1.66.20.1: #i29833# remove superflous assertion
2004-09-20 09:18:14 +00:00
Rüdiger Timm
2cddf35952
INTEGRATION: CWS keyconfig01 (1.91.22); FILE MERGED
...
2004/07/14 05:14:49 as 1.91.22.1: #i29863# workaround solaris compiler problem using macros within more then one lines of code!
2004-09-20 09:18:03 +00:00
Rüdiger Timm
1bf90aeefb
INTEGRATION: CWS ooo20040704 (1.4.100); FILE MERGED
...
2004/06/28 12:48:11 cmc 1.4.100.1: #i30801 allow using system stl if possible
2004-09-08 16:10:52 +00:00
Kurt Zenker
d1a6810df2
INTEGRATION: CWS xmlsec05 (1.8.20); FILE MERGED
...
2004/07/13 13:41:26 mav 1.8.20.5: #i30236# use correct storage
2004/07/13 13:37:15 mav 1.8.20.4: #i30236# use list
2004/07/13 09:24:49 mt 1.8.20.3: Merged BugFix
2004/07/13 06:17:01 mt 1.8.20.2: Merged BugFix from 1.6.14.3
2004/07/12 14:58:38 mt 1.8.20.1: Merged fix from fwklhf01
2004-08-31 11:45:26 +00:00
Oliver Bolte
4a129d5931
INTEGRATION: CWS unotlc (1.38.28); FILE MERGED
...
2004/08/04 12:06:35 mav 1.38.28.1: #i32418# vnd.sun.star.zip scheme
2004-08-12 10:55:22 +00:00
Oliver Bolte
9c5431a941
INTEGRATION: CWS unotlc (1.66.26); FILE MERGED
...
2004/08/04 12:06:34 mav 1.66.26.1: #i32418# vnd.sun.star.zip scheme
2004-08-12 10:55:07 +00:00
Oliver Bolte
ca30b0ce70
INTEGRATION: CWS unotlc (1.91.28); FILE MERGED
...
2004/08/04 15:28:49 dbo 1.91.28.2: #i32418# typo
2004/08/04 12:06:34 mav 1.91.28.1: #i32418# vnd.sun.star.zip scheme
2004-08-12 10:54:54 +00:00
Oliver Bolte
d1176a025f
INTEGRATION: CWS unotlc (1.31.52); FILE MERGED
...
2004/08/04 12:06:34 mav 1.31.52.1: #i32418# vnd.sun.star.zip scheme
2004-08-12 10:54:38 +00:00
Oliver Bolte
a9f4b852d3
INTEGRATION: CWS unotlc (1.34.128); FILE MERGED
...
2004/08/04 12:06:34 mav 1.34.128.1: #i32418# vnd.sun.star.zip scheme
2004-08-12 10:54:23 +00:00
Jens-Heiner Rechtien
85a58ffc9f
#i10000#: fix outstanding conflicts
2004-08-04 09:03:40 +00:00