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
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
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
Kurt Zenker
fa76bf2a7f
INTEGRATION: CWS bmpres01 (1.20.24); FILE MERGED
...
2004/04/13 16:04:06 mav 1.20.24.1: #116335# ZipFileAccess
2004-05-19 08:24:19 +00:00
Rüdiger Timm
8d3b3e79ec
INTEGRATION: CWS scriptingf4 (1.64.28); FILE MERGED
...
2004/05/14 14:41:00 mav 1.64.28.1: #i29169# fix rename problems
2004-05-19 08:19:55 +00:00
Kurt Zenker
860508a6a8
INTEGRATION: CWS bmpres01 (1.1.2); FILE ADDED
...
2004/04/13 16:02:28 mav 1.1.2.1: #116335# ZipFileAccess
2004-05-18 16:22:52 +00:00
Jens-Heiner Rechtien
b8bc2f2f6b
INTEGRATION: CWS fwkbugfix02 (1.2.12); FILE MERGED
...
2004/03/17 11:39:25 mav 1.2.12.1: #115957# Extend the cloning functionality
2004-05-10 16:30:21 +00:00
Jens-Heiner Rechtien
32ccae8bae
INTEGRATION: CWS fwkbugfix02 (1.20.12); FILE MERGED
...
2004/04/07 12:28:09 mav 1.20.12.2: #115729# the problem is handled by storages
2004/03/17 11:39:25 mav 1.20.12.1: #115957# Extend the cloning functionality
2004-05-10 16:30:05 +00:00
Jens-Heiner Rechtien
3426dd702a
INTEGRATION: CWS fwkbugfix02 (1.37.12); FILE MERGED
...
2004/04/01 14:33:50 mav 1.37.12.2: #116056# adopt implementation to the design change
2004/03/24 07:49:06 mav 1.37.12.1: #115974# use seekable wrapper from comphelper
2004-05-10 16:29:52 +00:00
Jens-Heiner Rechtien
0aa6d3970c
INTEGRATION: CWS fwkbugfix02 (1.64.10); FILE MERGED
...
2004/03/17 11:39:25 mav 1.64.10.1: #115957# Extend the cloning functionality
2004-05-10 16:29:38 +00:00
Jens-Heiner Rechtien
94ea9bcb20
INTEGRATION: CWS fwkbugfix02 (1.89.12); FILE MERGED
...
2004/04/27 10:58:22 mav 1.89.12.4: RESYNC: (1.89-1.90); FILE MERGED
2004/03/24 07:49:06 mav 1.89.12.3: #115974# use seekable wrapper from comphelper
2004/03/23 15:42:24 mav 1.89.12.2: #115974# use seekable wrapper from comphelper
2004/03/17 11:39:25 mav 1.89.12.1: #115957# Extend the cloning functionality
2004-05-10 16:29:23 +00:00
Jens-Heiner Rechtien
e6810dba1c
INTEGRATION: CWS unopkg1 (1.89.10); FILE MERGED
...
2004/03/10 10:15:54 mav 1.89.10.1: #i26283# do not hide META-INF folder
2004-04-13 11:22:22 +00:00
Jens-Heiner Rechtien
35c4f32bc6
INTEGRATION: CWS ooo20031216 (1.87.14); FILE MERGED
...
2003/12/25 12:37:58 waratah 1.87.14.1: #i1858# correct for some uninitialised variables
2004-02-04 11:28:25 +00:00
Jens-Heiner Rechtien
16388bfc32
INTEGRATION: CWS readstorage (1.34.12); FILE MERGED
...
2004/01/13 10:13:46 mav 1.34.12.2: #114521# cloning of encrypted storages
2004/01/06 14:28:05 mav 1.34.12.1: #114521# instead of staream return wrappers that share mutex and remember own position
2004-02-03 17:27:20 +00:00
Jens-Heiner Rechtien
8a0751657f
INTEGRATION: CWS readstorage (1.34.12); FILE MERGED
...
2004/01/13 10:13:46 mav 1.34.12.2: #114521# cloning of encrypted storages
2004/01/06 14:28:05 mav 1.34.12.1: #114521# instead of staream return wrappers that share mutex and remember own position
2004-02-03 17:26:32 +00:00
Jens-Heiner Rechtien
28a0326b6b
INTEGRATION: CWS readstorage (1.62.20); FILE MERGED
...
2004/01/13 10:13:45 mav 1.62.20.1: #114521# cloning of encrypted storages
2004-02-03 17:24:46 +00:00
Jens-Heiner Rechtien
85491fb3db
INTEGRATION: CWS readstorage (1.1.2); FILE ADDED
...
2004/01/06 14:29:06 mav 1.1.2.1: #114521# instead of staream return wrappers that share mutex and remember own position
2004-02-03 17:02:54 +00:00
Jens-Heiner Rechtien
96c4513d6f
INTEGRATION: CWS readstorage (1.1.2); FILE ADDED
...
2004/01/06 14:29:00 mav 1.1.2.1: #114521# instead of staream return wrappers that share mutex and remember own position
2004-02-03 17:02:34 +00:00
Jens-Heiner Rechtien
59b303fc73
INTEGRATION: CWS readstorage (1.19.94); FILE MERGED
...
2004/01/06 14:28:09 mav 1.19.94.1: #114521# instead of staream return wrappers that share mutex and remember own position
2004-02-03 17:02:12 +00:00
Jens-Heiner Rechtien
1ad68b72ca
INTEGRATION: CWS readstorage (1.14.20); FILE MERGED
...
2004/01/13 10:13:47 mav 1.14.20.2: #114521# cloning of encrypted storages
2004/01/06 14:28:07 mav 1.14.20.1: #114521# instead of staream return wrappers that share mutex and remember own position
2004-02-03 17:01:44 +00:00
Jens-Heiner Rechtien
b6c30122e4
INTEGRATION: CWS readstorage (1.87.20); FILE MERGED
...
2004/01/13 10:13:44 mav 1.87.20.1: #114521# cloning of encrypted storages
2004-02-03 17:00:56 +00:00
Jens-Heiner Rechtien
4d2829d8b3
INTEGRATION: CWS geordi2q14 (1.14.26); FILE MERGED
...
2004/01/29 17:44:56 hr 1.14.26.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:22:12 +00:00
Jens-Heiner Rechtien
a5314f1366
INTEGRATION: CWS geordi2q14 (1.34.18); FILE MERGED
...
2004/01/29 17:44:55 hr 1.34.18.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:21:54 +00:00
Jens-Heiner Rechtien
e8acbfcfb1
INTEGRATION: CWS geordi2q14 (1.62.26); FILE MERGED
...
2004/01/29 17:44:53 hr 1.62.26.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:21:32 +00:00
Jens-Heiner Rechtien
76004f6580
INTEGRATION: CWS geordi2q14 (1.10.46); FILE MERGED
...
2004/01/29 17:44:53 hr 1.10.46.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:21:12 +00:00
Rüdiger Timm
5a3273019a
INTEGRATION: CWS mav08 (1.33.10); FILE MERGED
...
2003/10/15 08:03:59 mav 1.33.10.1: #i21121# seek the stream to 0 when return it
2003-10-30 08:48:49 +00:00
Kurt Zenker
5907136d9b
INTEGRATION: CWS mav05 (1.12.42); FILE MERGED
...
2003/09/04 13:54:16 mav 1.12.42.3: RESYNC: (1.12-1.13); FILE MERGED
2003/09/04 07:57:16 mav 1.12.42.2: #i15929# WrongPasswordException.idl is in packages now
2003/07/18 14:20:54 mav 1.12.42.1: #i15929# support encryption in storages
2003-09-11 09:18:17 +00:00
Kurt Zenker
133a2915b3
INTEGRATION: CWS mav05 (1.31.18); FILE MERGED
...
2003/09/04 13:51:36 mav 1.31.18.5: #100000# solve conflicts
2003/09/04 07:57:16 mav 1.31.18.4: #i15929# WrongPasswordException.idl is in packages now
2003/07/21 14:14:24 mav 1.31.18.3: #i15929# include MediaType in raw stream header, and other fixes
2003/07/21 11:29:33 mav 1.31.18.2: #i15929# fix EncryptionKey stuff
2003/07/18 14:20:54 mav 1.31.18.1: #i15929# support encryption in storages
2003-09-11 09:18:07 +00:00
Kurt Zenker
35417dcc96
INTEGRATION: CWS mav05 (1.60.18); FILE MERGED
...
2003/09/04 13:54:07 mav 1.60.18.2: RESYNC: (1.60-1.61); FILE MERGED
2003/07/18 14:20:53 mav 1.60.18.1: #i15929# support encryption in storages
2003-09-11 09:17:55 +00:00
Kurt Zenker
0f5d2fe525
INTEGRATION: CWS mav05 (1.23.56); FILE MERGED
...
2003/07/18 14:20:53 mav 1.23.56.1: #i15929# support encryption in storages
2003-09-11 09:17:42 +00:00
Kurt Zenker
e5b1e9007d
INTEGRATION: CWS mav05 (1.86.18); FILE MERGED
...
2003/06/23 12:18:46 mav 1.86.18.2: #i15929# remove dependency from tools and unotools modules
2003/06/23 09:21:38 mav 1.86.18.1: #i15929# fix stream initialization
2003-09-11 09:17:32 +00:00
Jens-Heiner Rechtien
87c7cc0bb1
INTEGRATION: CWS ooo11rc2 (1.12.46); FILE MERGED
...
2003/07/14 15:38:27 fa 1.12.46.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16694
Dan
fa@ooo
2003-07-16 16:37:26 +00:00
Jens-Heiner Rechtien
776f6770d6
INTEGRATION: CWS ooo11rc2 (1.31.22); FILE MERGED
...
2003/07/14 15:38:26 fa 1.31.22.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16694
Dan
fa@ooo
2003-07-16 16:37:17 +00:00
Jens-Heiner Rechtien
e835c97d61
INTEGRATION: CWS ooo11rc2 (1.60.22); FILE MERGED
...
2003/07/14 15:38:26 fa 1.60.22.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16694
Dan
fa@ooo
2003-07-16 16:37:08 +00:00
Jens-Heiner Rechtien
b62dad6177
INTEGRATION: CWS ooo11rc2 (1.9.46); FILE MERGED
...
2003/07/14 15:38:26 fa 1.9.46.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16694
Dan
fa@ooo
2003-07-16 16:36:59 +00:00
Vladimir Glazounov
4fa369b6a6
INTEGRATION: CWS mh11rc (1.3.52); FILE MERGED
...
2003/06/06 10:56:06 mh 1.3.52.1: join: from beta2
2003-06-12 09:13:08 +00:00
Jens-Heiner Rechtien
fa66eeb587
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-26 13:16:07 +00:00
Mikhail Voitenko
0cd5140819
#92926# throw an exception in case package format is wrong
2002-09-25 09:34:04 +00:00
Christian Lippka
4670d8d2a8
#103668# made export of manifest optional
2002-09-25 08:51:21 +00:00
Jens-Heiner Rechtien
c729070d1f
#101685#,#i6886# merge OOO_STABLE_1_PORTS (1.11-1.11.10.1) -> HEAD
2002-08-20 12:04:52 +00:00