Commit graph

59 commits

Author SHA1 Message Date
Caolán McNamara
d0d845506d Drop statement that VBA macros don't get converted, they sort of do thesedays 2011-08-22 09:39:12 +01:00
Caolán McNamara
5e4d51ea90 ODF isn't a *new* format anymore 2011-08-22 09:39:11 +01:00
Caolán McNamara
4dfbfd1e71 it doesn't convert %PRODUCTNAME documents, but the old binary format 2011-08-22 09:39:11 +01:00
Bjoern Michaelsen
57272eaaf5 Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards
Conflicts:
	wizards/com/sun/star/wizards/common/Resource.java

merged resolved as per:
 e52421bc118e9c5f3fce5a32ba9efdcad7627d92
 9e91dbca08056fc31f388f5642fdfa3d2b910990

in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there
2011-08-18 02:27:27 +02:00
Jens-Heiner Rechtien
36de66bdf0 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Rüdiger Timm
9b8f9f37c6 INTEGRATION: CWS changefileheader (1.53.58); FILE MERGED
2008/03/31 16:24:00 rt 1.53.58.1: #i87441# Change license header to LPGL v3.
2008-04-11 12:36:17 +00:00
Ivo Hinkelmann
b918a91142 INTEGRATION: CWS mergede01 (1.52.90); FILE MERGED
2007/03/20 14:50:49 ihi 1.52.90.1: #i72301# Remove German
2007-04-19 15:59:56 +00:00
Rüdiger Timm
f73e611d91 INTEGRATION: CWS extras23 (1.51.20); FILE MERGED
2005/12/13 11:03:16 ih 1.51.20.1: #i48742# grammar errors corrected
2006-02-06 10:01:15 +00:00
Jens-Heiner Rechtien
7727f749d8 INTEGRATION: CWS encup (1.49.12); FILE MERGED
2005/04/29 16:06:44 ihi 1.49.12.1: #i40603# German strings now UTF8 encoded
2005-09-23 14:16:35 +00:00
Rüdiger Timm
1f444bbcd4 INTEGRATION: CWS ooo19126 (1.49.64); FILE MERGED
2005/09/05 15:17:16 rt 1.49.64.1: #i54170# Change license header: remove SISSL
2005-09-09 09:08:24 +00:00
Vladimir Glazounov
47761bbefd INTEGRATION: CWS extras19 (1.48.12); FILE MERGED
2005/03/16 13:35:48 ih 1.48.12.3: %productname removed in string "what this wizard does"
2005/03/14 15:38:18 ih 1.48.12.2: #i44862# XML -> OpenDocument
2005/03/14 09:40:08 ih 1.48.12.1: #i44724# .pps support added
2005-03-23 14:13:55 +00:00
Vladimir Glazounov
76afb50a09 INTEGRATION: CWS dbwizard3 (1.47.50); FILE MERGED
2005/01/03 10:04:53 bc 1.47.50.1: #i39500#All occurences of 'Autopilot' replaced
2005-02-21 13:11:52 +00:00
Hans-Joachim Lankenau
6e24584413 INTEGRATION: CWS mergebuild (1.45.28); FILE MERGED
2004/04/21 01:17:19 hjs 1.45.28.3: RESYNC: (1.45-1.46); FILE MERGED
2003/11/11 19:27:32 ihi 1.45.28.2: en -> en-US
2003/11/10 18:02:59 ihi 1.45.28.1: #111234# Merge during build
2004-06-25 14:20:09 +00:00
Vladimir Glazounov
22eba66110 INTEGRATION: CWS geordi2q11 (1.45.54); FILE MERGED
2003/12/17 11:35:47 hr 1.45.54.1: #111934#: join CWS ooo111fix1
2003-12-17 16:02:24 +00:00
Jens-Heiner Rechtien
bc017884c4 INTEGRATION: CWS mergerc3 (1.44.2); FILE MERGED
2003/07/16 17:04:33 ihi 1.44.2.1: rc-3 merge all languages
2003-07-17 12:52:23 +00:00
Jens-Heiner Rechtien
93d1b720c0 INTEGRATION: CWS rc2merge (1.43.6); FILE MERGED
2003/07/03 14:37:28 ihi 1.43.6.1: rc-2 merge all languages
2003-07-03 15:50:07 +00:00
Jens-Heiner Rechtien
890fd39a87 INTEGRATION: CWS rcmerge (1.42.14); FILE MERGED
2003/06/12 11:09:15 gh 1.42.14.1: final Merge RC
2003-06-13 13:06:02 +00:00
Jens-Heiner Rechtien
c679a0c9d2 INTEGRATION: CWS mergem8 (1.40.2.2.12); FILE MERGED
2003/04/29 08:34:44 gh 1.40.2.2.12.2: final merge for Beta2
2003/04/14 15:06:16 gh 1.40.2.2.12.1: merging all languages
2003-04-29 16:35:45 +00:00
Jens-Heiner Rechtien
6652c8336f MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 16:59:30 +00:00
Kurt Zenker
b152c7f38a Merge SRX644: 05.12.02 - 11:31:46 2002-12-05 09:35:31 +00:00
Kurt Zenker
34de7f3e29 Merge SRX644: 25.11.02 - 15:33:12 2002-11-25 13:37:05 +00:00
Rüdiger Timm
290846fa06 Merge SRX643: 17.09.02 - 15:00:56 2002-09-17 12:01:58 +00:00
Rüdiger Timm
f3cc5d16af Merge SRX643: 13.09.02 - 16:26:07 2002-09-13 13:26:58 +00:00
Kurt Zenker
2e1ea9da48 Merge SRX643: 13.09.02 - 10:29:15 2002-09-13 07:32:35 +00:00
Kurt Zenker
18d6951913 Merge SRX643: 05.09.02 - 14:55:13 2002-09-05 11:58:31 +00:00
Behrend Cornelius
6b0c4278b5 #97429# made some changes to record possible mistakes in logfile 2002-08-16 14:16:34 +00:00
Kurt Zenker
84fa9db76d Merge SRX643: 15.08.02 - 22:37:30 2002-08-15 19:39:05 +00:00
Kurt Zenker
ddb366ae7b Merge SRX643: 05.08.02 - 22:02:23 2002-08-05 19:05:57 +00:00
Kurt Zenker
ab56e8b43c Merge SRX643: 01.08.02 - 22:04:11 2002-08-01 19:07:03 +00:00
Behrend Cornelius
d166de7d00 #100061# New Resource for log statistics added 2002-07-05 16:46:01 +00:00
Kurt Zenker
72e6185d37 Merge SRC641: 21.02.02 - 22:22:10 2002-02-21 20:22:29 +00:00
Kurt Zenker
22ed779047 Merge SRC641: 02/08/02 - 22:18:58 2002-02-08 20:19:12 +00:00
Vladimir Glazounov
960e0eecc3 Merge SRC641: 05.02.02 - 22:29:08 2002-02-05 20:29:29 +00:00
Kurt Zenker
e0c1c2fec8 Merge SRC641: 09.01.02 - 22:16:48 2002-01-09 20:21:14 +00:00
Kurt Zenker
84c64aa8cc Merge SRC641: 14.12.01 - 20:00:16 2001-12-14 18:02:25 +00:00
Oliver Bolte
7f0798b36d Merge SRC641: 27.11.01 - 23:26:16 2001-11-27 22:27:28 +00:00
Vladimir Glazounov
6e748382fe Merge SRC641: 23.11.01 - 00:08:40 2001-11-22 23:08:10 +00:00
Kurt Zenker
81bb8410f8 Merge SRC641: 13.11.01 - 23:35:33 2001-11-13 22:36:14 +00:00
Kurt Zenker
0ae2fc56f6 Merge SRC641: 31.10.01 - 23:02:38 2001-10-31 21:02:35 +00:00
Kurt Zenker
ccb8662f99 Merge SRC641: 10/25/01 - 22:37:11 2001-10-25 19:36:37 +00:00
Kurt Zenker
fca270ffb3 Merge SRC641: 22.10.01 - 22:51:37 2001-10-22 19:50:51 +00:00
Kurt Zenker
40f698e426 Merge SRC641: 18.10.01 - 22:50:54 2001-10-18 19:51:10 +00:00
Behrend Cornelius
9ac2a09fa9 #93248# 'Fertig!' changed to "Fertig" 2001-10-17 11:20:22 +00:00
Kurt Zenker
0e4fc67693 Merge SRC641: 11.10.01 - 23:06:24 2001-10-11 20:06:58 +00:00
Kurt Zenker
abf8c5d99e Merge SRC641: 27.09.01 - 23:08:47 2001-09-27 20:07:25 +00:00
Kurt Zenker
b0260007e7 Merge SRC641: 24.09.01 - 23:24:38 2001-09-24 20:23:23 +00:00
Behrend Cornelius
2d5080157a #91642# two new HIDs for Browse buttons added 2001-09-12 15:25:11 +00:00
Kurt Zenker
52d086ddc7 Merge SRC638: 07/17/01 - 22:54:29 2001-07-17 19:54:55 +00:00
Behrend Cornelius
32bdf92776 #88911# Resources for Excel and PP TemplateGroups removed 2001-07-11 12:49:04 +00:00
Behrend Cornelius
0ccd3830fb #88895# Resource index modified, event from button removed 2001-06-27 13:44:17 +00:00