mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,950 Commits 1 Branch 0 Tags
07c56c232fbd177ddc37abf62e65fb0fb5c6becd
Commit Graph

4089 Commits

Author SHA1 Message Date
Vladimir Glazounov
07c56c232f INTEGRATION: CWS pj65 (1.8.12); FILE MERGED 
2006/10/31 14:03:23 pjanik 1.8.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:37:12 +00:00
Vladimir Glazounov
535e95f448 INTEGRATION: CWS pj65 (1.8.12); FILE MERGED 
2006/10/31 14:03:19 pjanik 1.8.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:37:00 +00:00
Vladimir Glazounov
7c879ed948 INTEGRATION: CWS pj65 (1.3.30); FILE MERGED 
2006/10/31 14:04:14 pjanik 1.3.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:36:48 +00:00
Vladimir Glazounov
d34df255a1 INTEGRATION: CWS pj65 (1.5.30); FILE MERGED 
2006/10/31 14:04:08 pjanik 1.5.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:36:36 +00:00
Vladimir Glazounov
c1a5b25440 INTEGRATION: CWS pj65 (1.6.12); FILE MERGED 
2006/10/31 14:04:04 pjanik 1.6.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:36:25 +00:00
Vladimir Glazounov
1f1624ee75 INTEGRATION: CWS pj65 (1.5.30); FILE MERGED 
2006/10/31 14:03:59 pjanik 1.5.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:36:15 +00:00
Vladimir Glazounov
664999d0d4 INTEGRATION: CWS pj65 (1.13.12); FILE MERGED 
2006/10/31 14:03:43 pjanik 1.13.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:36:03 +00:00
Vladimir Glazounov
9165f653dc INTEGRATION: CWS pj65 (1.19.30); FILE MERGED 
2006/10/31 14:03:39 pjanik 1.19.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:35:52 +00:00
Vladimir Glazounov
64e3834c49 INTEGRATION: CWS pj65 (1.6.30); FILE MERGED 
2006/10/31 14:03:30 pjanik 1.6.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:35:36 +00:00
Vladimir Glazounov
cff781d670 INTEGRATION: CWS pj65 (1.9.12); FILE MERGED 
2006/10/31 14:03:27 pjanik 1.9.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:35:23 +00:00
Vladimir Glazounov
d8824f0f69 INTEGRATION: CWS pj65 (1.17.28); FILE MERGED 
2006/11/06 10:11:17 pjanik 1.17.28.2: RESYNC: (1.17-1.18); FILE MERGED
2006/10/31 14:03:15 pjanik 1.17.28.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:35:12 +00:00
Vladimir Glazounov
e7b9bf275e INTEGRATION: CWS pj65 (1.32.30); FILE MERGED 
2006/10/31 14:03:10 pjanik 1.32.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:35:01 +00:00
Vladimir Glazounov
084587cdc1 INTEGRATION: CWS pj65 (1.6.30); FILE MERGED 
2006/10/31 14:03:06 pjanik 1.6.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:34:49 +00:00
Vladimir Glazounov
1ee173928e INTEGRATION: CWS pj65 (1.53.12); FILE MERGED 
2006/10/31 14:03:02 pjanik 1.53.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:34:29 +00:00
Vladimir Glazounov
4d670f7f16 INTEGRATION: CWS pj65 (1.18.12); FILE MERGED 
2006/10/31 14:02:57 pjanik 1.18.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:34:18 +00:00
Vladimir Glazounov
3ba6b5672e INTEGRATION: CWS pj65 (1.13.12); FILE MERGED 
2006/10/31 14:02:49 pjanik 1.13.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:34:06 +00:00
Vladimir Glazounov
24df673956 INTEGRATION: CWS pj65 (1.17.12); FILE MERGED 
2006/10/31 14:02:45 pjanik 1.17.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:33:54 +00:00
Vladimir Glazounov
2687aba2f9 INTEGRATION: CWS pj65 (1.54.12); FILE MERGED 
2006/10/31 14:02:40 pjanik 1.54.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:33:43 +00:00
Vladimir Glazounov
1072a9a22a INTEGRATION: CWS pj65 (1.108.28); FILE MERGED 
2006/10/31 14:02:35 pjanik 1.108.28.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:33:31 +00:00
Vladimir Glazounov
495e44fd7c INTEGRATION: CWS pj65 (1.92.12); FILE MERGED 
2006/10/31 14:02:30 pjanik 1.92.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:33:19 +00:00
Vladimir Glazounov
3086ea90e0 INTEGRATION: CWS pj65 (1.13.12); FILE MERGED 
2006/10/31 14:02:26 pjanik 1.13.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:33:07 +00:00
Vladimir Glazounov
50698b1f20 INTEGRATION: CWS pj65 (1.19.30); FILE MERGED 
2006/10/31 14:02:22 pjanik 1.19.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:32:54 +00:00
Vladimir Glazounov
e4cd58ffed INTEGRATION: CWS pj65 (1.9.30); FILE MERGED 
2006/10/31 14:02:17 pjanik 1.9.30.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:32:43 +00:00
Vladimir Glazounov
869643ba8a INTEGRATION: CWS pj65 (1.12.12); FILE MERGED 
2006/10/31 14:02:53 pjanik 1.12.12.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:32:31 +00:00
Vladimir Glazounov
c9386df9b6 INTEGRATION: CWS pj65 (1.84.10); FILE MERGED 
2006/10/31 14:02:13 pjanik 1.84.10.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:32:19 +00:00
Vladimir Glazounov
f6c3fcaf45 INTEGRATION: CWS pj65 (1.45.28); FILE MERGED 
2006/10/31 14:02:08 pjanik 1.45.28.1: #i71027#: prevent warnings on Mac OS X with gcc 4.0.1.
 2006-11-21 16:32:09 +00:00
Ivo Hinkelmann
65ae029458 INTEGRATION: CWS sw2101_SRC680 (1.121.28.1.2); FILE MERGED 
2006/11/06 14:37:49 od 1.121.28.1.2.1: #i71249# method <XMLTextImportHelper::SetOutlineStyles(..)>
	 - take last added paragraph style for assignment to the list level
	   of the outline style for document from version OOo 2.0.4 and prior.
 2006-11-15 11:40:52 +00:00
Ivo Hinkelmann
7d42f44a26 INTEGRATION: CWS aw024 (1.95.26); FILE MERGED 
2006/09/21 21:53:16 aw 1.95.26.9: RESYNC: (1.114-1.115); FILE MERGED
2006/07/04 14:18:51 aw 1.95.26.8: RESYNC: (1.113-1.114); FILE MERGED
2006/05/12 20:12:04 aw 1.95.26.7: RESYNC: (1.107-1.113); FILE MERGED
2005/11/18 14:09:54 aw 1.95.26.6: RESYNC: (1.106-1.107); FILE MERGED
2005/09/17 07:16:28 aw 1.95.26.5: RESYNC: (1.105-1.106); FILE MERGED
2005/05/13 14:09:56 aw 1.95.26.4: RESYNC: (1.103-1.105); FILE MERGED
2005/04/26 15:14:01 aw 1.95.26.3: #i39528#
2005/03/23 19:14:58 aw 1.95.26.2: RESYNC: (1.95-1.103); FILE MERGED
2004/12/28 15:24:46 aw 1.95.26.1: #i39528
 2006-11-14 13:16:34 +00:00
Ivo Hinkelmann
785488d3d4 INTEGRATION: CWS aw024 (1.5.26); FILE MERGED 
2006/09/21 21:52:35 aw 1.5.26.7: RESYNC: (1.12-1.13); FILE MERGED
2006/07/04 14:18:16 aw 1.5.26.6: RESYNC: (1.11-1.12); FILE MERGED
2005/09/17 07:14:33 aw 1.5.26.5: RESYNC: (1.10-1.11); FILE MERGED
2005/07/22 08:52:49 aw 1.5.26.4: RESYNC: (1.9-1.10); FILE MERGED
2005/05/13 14:09:17 aw 1.5.26.3: RESYNC: (1.8-1.9); FILE MERGED
2005/03/23 19:14:40 aw 1.5.26.2: RESYNC: (1.5-1.8); FILE MERGED
2004/12/28 15:24:45 aw 1.5.26.1: #i39528
 2006-11-14 13:16:16 +00:00
Ivo Hinkelmann
47bd6a130a INTEGRATION: CWS aw024 (1.25.26); FILE MERGED 
2006/09/21 21:52:27 aw 1.25.26.6: RESYNC: (1.30-1.31); FILE MERGED
2006/07/04 14:18:08 aw 1.25.26.5: RESYNC: (1.29-1.30); FILE MERGED
2005/09/17 07:14:11 aw 1.25.26.4: RESYNC: (1.28-1.29); FILE MERGED
2005/05/13 14:09:08 aw 1.25.26.3: RESYNC: (1.27-1.28); FILE MERGED
2005/03/23 19:14:31 aw 1.25.26.2: RESYNC: (1.25-1.27); FILE MERGED
2004/12/28 15:24:45 aw 1.25.26.1: #i39528
 2006-11-14 13:16:04 +00:00
Ivo Hinkelmann
b8159642e1 INTEGRATION: CWS aw024 (1.16.66); FILE MERGED 
2006/09/21 21:52:19 aw 1.16.66.4: RESYNC: (1.18-1.19); FILE MERGED
2006/07/04 14:18:02 aw 1.16.66.3: RESYNC: (1.17-1.18); FILE MERGED
2005/09/17 07:13:42 aw 1.16.66.2: RESYNC: (1.16-1.17); FILE MERGED
2004/12/28 15:24:45 aw 1.16.66.1: #i39528
 2006-11-14 13:15:52 +00:00
Ivo Hinkelmann
e45f5a7a56 INTEGRATION: CWS aw024 (1.5.66); FILE MERGED 
2005/09/17 07:13:22 aw 1.5.66.2: RESYNC: (1.5-1.6); FILE MERGED
2004/12/28 15:24:44 aw 1.5.66.1: #i39528
 2006-11-14 13:15:40 +00:00
Ivo Hinkelmann
577d2f480a INTEGRATION: CWS aw024 (1.7.66); FILE MERGED 
2006/09/21 21:52:04 aw 1.7.66.4: RESYNC: (1.9-1.10); FILE MERGED
2006/07/04 14:17:55 aw 1.7.66.3: RESYNC: (1.8-1.9); FILE MERGED
2005/09/17 07:13:08 aw 1.7.66.2: RESYNC: (1.7-1.8); FILE MERGED
2004/12/28 15:24:44 aw 1.7.66.1: #i39528
 2006-11-14 13:15:28 +00:00
Ivo Hinkelmann
a0345097c2 INTEGRATION: CWS aw024 (1.16.100); FILE MERGED 
2006/11/13 11:10:53 aw 1.16.100.8: changes after resync
2006/11/10 04:53:18 aw 1.16.100.7: RESYNC: (1.22-1.23); FILE MERGED
2006/09/21 21:51:56 aw 1.16.100.6: RESYNC: (1.21-1.22); FILE MERGED
2006/07/04 14:17:48 aw 1.16.100.5: RESYNC: (1.20-1.21); FILE MERGED
2006/05/12 20:11:55 aw 1.16.100.4: RESYNC: (1.19-1.20); FILE MERGED
2005/09/17 07:12:58 aw 1.16.100.3: RESYNC: (1.18-1.19); FILE MERGED
2005/05/13 14:08:57 aw 1.16.100.2: RESYNC: (1.16-1.18); FILE MERGED
2004/12/28 15:24:44 aw 1.16.100.1: #i39528
 2006-11-14 13:15:16 +00:00
Ivo Hinkelmann
4beebe21c3 INTEGRATION: CWS aw024 (1.4.26); FILE MERGED 
2006/11/10 04:53:11 aw 1.4.26.9: RESYNC: (1.12-1.13); FILE MERGED
2006/09/22 17:26:10 aw 1.4.26.8: chagnes after resync to m185
2006/09/21 21:51:25 aw 1.4.26.7: RESYNC: (1.11-1.12); FILE MERGED
2006/09/08 18:39:42 aw 1.4.26.6: RESYNC: (1.10-1.11); FILE MERGED
2006/07/04 14:17:21 aw 1.4.26.5: RESYNC: (1.9-1.10); FILE MERGED
2005/09/17 07:12:18 aw 1.4.26.4: RESYNC: (1.8-1.9); FILE MERGED
2005/05/13 14:08:47 aw 1.4.26.3: RESYNC: (1.7-1.8); FILE MERGED
2005/03/23 19:14:11 aw 1.4.26.2: RESYNC: (1.4-1.7); FILE MERGED
2004/12/28 15:24:44 aw 1.4.26.1: #i39528
 2006-11-14 13:14:54 +00:00
Ivo Hinkelmann
8e9b2c29e1 INTEGRATION: CWS aw024 (1.12.100); FILE MERGED 
2006/11/10 04:53:05 aw 1.12.100.7: RESYNC: (1.16-1.17); FILE MERGED
2006/09/22 17:26:10 aw 1.12.100.6: chagnes after resync to m185
2006/09/21 21:51:17 aw 1.12.100.5: RESYNC: (1.15-1.16); FILE MERGED
2006/08/03 16:15:40 aw 1.12.100.4: RESYNC: (1.14-1.15); FILE MERGED
2006/07/04 14:17:14 aw 1.12.100.3: RESYNC: (1.13-1.14); FILE MERGED
2005/09/17 07:12:08 aw 1.12.100.2: RESYNC: (1.12-1.13); FILE MERGED
2004/12/28 15:24:43 aw 1.12.100.1: #i39528
 2006-11-14 13:14:42 +00:00
Ivo Hinkelmann
5e35070c01 INTEGRATION: CWS aw024 (1.42.24); FILE MERGED 
2006/11/10 04:52:58 aw 1.42.24.9: RESYNC: (1.53-1.54); FILE MERGED
2006/09/21 21:51:08 aw 1.42.24.8: RESYNC: (1.52-1.53); FILE MERGED
2006/08/03 16:15:32 aw 1.42.24.7: RESYNC: (1.51-1.52); FILE MERGED
2006/07/04 14:17:07 aw 1.42.24.6: RESYNC: (1.50-1.51); FILE MERGED
2006/05/12 20:11:46 aw 1.42.24.5: RESYNC: (1.49-1.50); FILE MERGED
2005/11/18 14:09:46 aw 1.42.24.4: RESYNC: (1.48-1.49); FILE MERGED
2005/09/17 07:11:51 aw 1.42.24.3: RESYNC: (1.47-1.48); FILE MERGED
2005/03/23 19:14:01 aw 1.42.24.2: RESYNC: (1.42-1.47); FILE MERGED
2004/12/28 15:24:43 aw 1.42.24.1: #i39528
 2006-11-14 13:14:30 +00:00
Ivo Hinkelmann
9372182523 INTEGRATION: CWS aw024 (1.92.26); FILE MERGED 
2006/09/21 21:50:31 aw 1.92.26.11: RESYNC: (1.107-1.108); FILE MERGED
2006/09/08 18:39:35 aw 1.92.26.10: RESYNC: (1.106-1.107); FILE MERGED
2006/08/03 16:15:24 aw 1.92.26.9: RESYNC: (1.105-1.106); FILE MERGED
2006/07/04 14:16:42 aw 1.92.26.8: RESYNC: (1.104-1.105); FILE MERGED
2006/05/16 10:31:23 aw 1.92.26.7: changes after resync
2006/05/12 20:11:27 aw 1.92.26.6: RESYNC: (1.102-1.104); FILE MERGED
2005/09/17 07:10:56 aw 1.92.26.5: RESYNC: (1.100-1.102); FILE MERGED
2005/07/22 08:52:16 aw 1.92.26.4: RESYNC: (1.99-1.100); FILE MERGED
2005/05/13 14:08:26 aw 1.92.26.3: RESYNC: (1.95-1.99); FILE MERGED
2005/03/23 19:13:18 aw 1.92.26.2: RESYNC: (1.92-1.95); FILE MERGED
2004/12/28 15:24:43 aw 1.92.26.1: #i39528
 2006-11-14 13:14:18 +00:00
Ivo Hinkelmann
70b23bae03 INTEGRATION: CWS aw024 (1.37.24); FILE MERGED 
2006/11/10 04:51:55 aw 1.37.24.8: RESYNC: (1.43-1.45); FILE MERGED
2006/09/21 21:46:40 aw 1.37.24.7: RESYNC: (1.42-1.43); FILE MERGED
2006/07/04 14:13:30 aw 1.37.24.6: RESYNC: (1.41-1.42); FILE MERGED
2006/05/12 20:11:18 aw 1.37.24.5: RESYNC: (1.40-1.41); FILE MERGED
2005/11/18 14:09:14 aw 1.37.24.4: RESYNC: (1.39-1.40); FILE MERGED
2005/09/17 07:03:48 aw 1.37.24.3: RESYNC: (1.38-1.39); FILE MERGED
2005/03/23 19:11:28 aw 1.37.24.2: RESYNC: (1.37-1.38); FILE MERGED
2004/12/28 15:24:42 aw 1.37.24.1: #i39528
 2006-11-14 13:14:06 +00:00
Ivo Hinkelmann
730f7a4754 INTEGRATION: CWS aw024 (1.32.34); FILE MERGED 
2006/09/21 21:39:31 aw 1.32.34.5: RESYNC: (1.35-1.36); FILE MERGED
2006/07/04 14:09:00 aw 1.32.34.4: RESYNC: (1.34-1.35); FILE MERGED
2005/09/17 06:54:39 aw 1.32.34.3: RESYNC: (1.33-1.34); FILE MERGED
2005/07/22 08:51:27 aw 1.32.34.2: RESYNC: (1.32-1.33); FILE MERGED
2004/12/28 15:24:42 aw 1.32.34.1: #i39528
 2006-11-14 13:13:53 +00:00
Vladimir Glazounov
3e802a25c9 INTEGRATION: CWS kendy15 (1.6.6); FILE MERGED 
2006/10/20 09:06:44 kendy 1.6.6.1: #i70594#
Fix warning: XYZ is used uninitialized in this function
 2006-11-01 15:09:25 +00:00
Vladimir Glazounov
307ebc52b9 INTEGRATION: CWS swqbf88 (1.28.10); FILE MERGED 
2006/10/23 10:10:04 od 1.28.10.3: RESYNC: (1.28-1.29); FILE MERGED
resolve merge conflict
2006/10/18 09:44:55 od 1.28.10.2: #i70223# method <XMLTextStyleContext::Finish(..)>
	 - do not apply list style, if default outline level is set for
	   text documents from versions prior OOo 2.1 resp. SO8 PU5
2006/10/13 13:06:02 od 1.28.10.1: #i69629# class <XMLTextStyleContext>
	 - merge changes of fix i69523
	 - adjustments due to changed <XMLTextImportHelper>
 2006-11-01 14:07:54 +00:00
Vladimir Glazounov
6eb8ebc69b INTEGRATION: CWS swqbf88 (1.121.10); FILE MERGED 
2006/10/13 13:21:07 od 1.121.10.1: #i69629# class <XMLTextImportHelper>
	 - adjustments due to changed data structure for assigning certain
	   paragraph styles to the list levels of the outline style
	 - method <SetStyleAndAttrs(..)>
	   adjust selection of paragraph style for assignment to the list
	   level of the outline style
	 - method <SetOutlineStyles()>
	   evaluate paragraph style candidates for assignment to the list
	   levels of the outline style
 2006-11-01 14:07:30 +00:00
Vladimir Glazounov
e05eb05dda INTEGRATION: CWS swqbf88 (1.7.10); FILE MERGED 
2006/10/19 13:14:50 ama 1.7.10.1: Fix #142494#: Use of unknown style name
 2006-11-01 14:07:12 +00:00
Vladimir Glazounov
2a93d86d34 INTEGRATION: CWS fwk53 (1.21.18); FILE MERGED 
2006/10/18 07:05:34 mav 1.21.18.2: RESYNC: (1.21-1.22); FILE MERGED
2006/10/16 10:44:11 mav 1.21.18.1: #i68682# fix meta.xml reader/writer
 2006-11-01 13:51:44 +00:00
Vladimir Glazounov
777e0fa193 INTEGRATION: CWS fwk53 (1.17.18); FILE MERGED 
2006/10/16 10:44:11 mav 1.17.18.1: #i68682# fix meta.xml reader/writer
 2006-11-01 13:51:15 +00:00
Vladimir Glazounov
37d4332fa8 INTEGRATION: CWS fwk53 (1.14.18); FILE MERGED 
2006/10/16 10:44:11 mav 1.14.18.1: #i68682# fix meta.xml reader/writer
 2006-11-01 13:50:39 +00:00
Rüdiger Timm
edb1e00291 INTEGRATION: CWS ause060 (1.5.170); FILE MERGED 
2006/09/29 17:24:56 hjs 1.5.170.1: #i69951# remove CONV_STAR_FONTS
 2006-10-30 08:08:28 +00:00
Rüdiger Timm
87183e43eb INTEGRATION: CWS ause060 (1.28.2); FILE MERGED 
2006/09/29 17:24:56 hjs 1.28.2.1: #i69951# remove CONV_STAR_FONTS
 2006-10-30 08:08:04 +00:00
Rüdiger Timm
cc106c8acd INTEGRATION: CWS ause060 (1.96.2); FILE MERGED 
2006/09/29 17:24:56 hjs 1.96.2.1: #i69951# remove CONV_STAR_FONTS
 2006-10-30 08:07:52 +00:00