Ivo Hinkelmann
08656a3e8f
#i10000# build fix
2007-07-11 13:52:59 +00:00
Ivo Hinkelmann
5fc78de841
INTEGRATION: CWS mba23issues03 (1.203.6); FILE MERGED
...
2007/06/14 09:47:35 mba 1.203.6.2: #i78304: allow to terminate office immediately for performance measurements
2007/06/14 09:42:59 mba 1.203.6.1: #i54275#: disable recovery via environment variable
2007-07-11 12:15:28 +00:00
Ivo Hinkelmann
82fae2ae86
INTEGRATION: CWS fwk66 (1.70.38); FILE MERGED
...
2007/06/26 05:23:45 pb 1.70.38.2: RESYNC: (1.70-1.71); FILE MERGED
2007/06/11 07:35:27 cd 1.70.38.1: #i36213# Added error message for broken language detection at startup
2007-07-10 14:24:49 +00:00
Ivo Hinkelmann
d3e059cc7b
INTEGRATION: CWS fwk66 (1.22.276); FILE MERGED
...
2007/06/26 05:23:37 pb 1.22.276.2: RESYNC: (1.22-1.23); FILE MERGED
2007/06/11 07:35:27 cd 1.22.276.1: #i36213# Added error message for broken language detection at startup
2007-07-10 14:24:29 +00:00
Ivo Hinkelmann
592c844692
INTEGRATION: CWS fwk66 (1.202.30); FILE MERGED
...
2007/06/26 05:23:29 pb 1.202.30.3: RESYNC: (1.203-1.204); FILE MERGED
2007/06/18 10:39:48 pb 1.202.30.2: RESYNC: (1.202-1.203); FILE MERGED
2007/06/11 07:35:27 cd 1.202.30.1: #i36213# Added error message for broken language detection at startup
2007-07-10 14:24:16 +00:00
Rüdiger Timm
ca3d0f3d0f
#i79377# Syntax (badly resolved merge conflict).
2007-07-09 09:47:47 +00:00
Rüdiger Timm
3fac870aa7
#i79377# shadowing local variable
2007-07-09 08:54:47 +00:00
Rüdiger Timm
1d093cb9e4
#i79377# dp_gui_modifiablecontext.hxx removed.
2007-07-09 08:39:33 +00:00
Rüdiger Timm
c328ef8a1f
INTEGRATION: CWS c09tosrc (1.9.132); FILE MERGED
...
2007/06/29 11:57:12 vg 1.9.132.3: Disable PCH usage: dp_gui_system.cxx cannot be compiled with precompiled headers. Error: 'BOOL' redefinition, WinDef.h (line 142) and tools\solar.h (line71).
2007/06/29 08:58:58 jl 1.9.132.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:39 jl 1.9.132.1: #i78688# allow to manage shared extension within office
2007-07-06 12:58:25 +00:00
Rüdiger Timm
7f5be656db
INTEGRATION: CWS c09tosrc (1.24.16); FILE MERGED
...
2007/06/22 15:16:39 jl 1.24.16.1: #i78688# allow to manage shared extension within office
2007-07-06 12:56:29 +00:00
Rüdiger Timm
74329cc978
INTEGRATION: CWS c09tosrc (1.13.132); FILE MERGED
...
2007/06/22 15:16:38 jl 1.13.132.1: #i78688# allow to manage shared extension within office
2007-07-06 12:53:41 +00:00
Rüdiger Timm
b5de23abf1
INTEGRATION: CWS c09tosrc (1.5.176); FILE MERGED
...
2007/06/20 09:24:09 as 1.5.176.1: #144874# megre changes also into the master
2007-07-06 11:37:58 +00:00
Rüdiger Timm
01fb8fd972
INTEGRATION: CWS c09tosrc (1.13.50); FILE MERGED
...
2007/06/20 09:24:09 as 1.13.50.1: #144874# megre changes also into the master
2007-07-06 11:37:45 +00:00
Rüdiger Timm
bc08321d9b
INTEGRATION: CWS c09tosrc (1.7.178); FILE MERGED
...
2007/06/20 09:24:09 as 1.7.178.1: #144874# megre changes also into the master
2007-07-06 11:37:32 +00:00
Rüdiger Timm
0a765251ef
INTEGRATION: CWS c09tosrc (1.4.178); FILE MERGED
...
2007/06/20 09:24:09 as 1.4.178.1: #144874# megre changes also into the master
2007-07-06 11:37:19 +00:00
Rüdiger Timm
e10d0fe577
INTEGRATION: CWS c09tosrc (1.14.46); FILE MERGED
...
2007/06/20 09:24:09 as 1.14.46.1: #144874# megre changes also into the master
2007-07-06 11:37:06 +00:00
Rüdiger Timm
5affeec857
INTEGRATION: CWS c09tosrc (1.16.176); FILE MERGED
...
2007/06/20 09:24:09 as 1.16.176.1: #144874# megre changes also into the master
2007-07-06 11:36:52 +00:00
Rüdiger Timm
ec4bd06ecc
INTEGRATION: CWS c09tosrc (1.12.18); FILE MERGED
...
2007/06/22 15:16:39 jl 1.12.18.1: #i78688# allow to manage shared extension within office
2007-07-06 11:36:28 +00:00
Rüdiger Timm
0a2b874978
INTEGRATION: CWS c09tosrc (1.24.18); FILE MERGED
...
2007/06/22 15:16:39 jl 1.24.18.1: #i78688# allow to manage shared extension within office
2007-07-06 11:36:15 +00:00
Rüdiger Timm
f2bbd19616
INTEGRATION: CWS c09tosrc (1.4.50); FILE MERGED
...
2007/06/29 08:58:58 jl 1.4.50.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:39 jl 1.4.50.1: #i78688# allow to manage shared extension within office
2007-07-06 11:35:55 +00:00
Rüdiger Timm
c53881b376
INTEGRATION: CWS c09tosrc (1.2.132); FILE MERGED
...
2007/06/29 09:00:20 jl 1.2.132.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:39 jl 1.2.132.1: #i78688# allow to manage shared extension within office
2007-07-06 11:35:42 +00:00
Rüdiger Timm
630b9154ba
INTEGRATION: CWS c09tosrc (1.6.46); FILE MERGED
...
2007/06/29 09:00:20 jl 1.6.46.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:39 jl 1.6.46.1: #i78688# allow to manage shared extension within office
2007-07-06 11:35:27 +00:00
Rüdiger Timm
59aed95e73
INTEGRATION: CWS c09tosrc (1.16.16); FILE MERGED
...
2007/06/22 15:16:39 jl 1.16.16.1: #i78688# allow to manage shared extension within office
2007-07-06 11:35:10 +00:00
Rüdiger Timm
788bbeae68
INTEGRATION: CWS c09tosrc (1.1.2); FILE ADDED
...
2007/06/29 08:56:48 jl 1.1.2.1: #i79001# Error string for update extension on Windows Vista
2007-07-06 11:34:56 +00:00
Rüdiger Timm
5cc939597b
INTEGRATION: CWS c09tosrc (1.1.2); FILE ADDED
...
2007/06/29 10:26:44 rt 1.1.2.2: PCH-include added.
2007/06/29 08:56:37 jl 1.1.2.1: #i79001# Error string for update extension on Windows Vista
2007-07-06 11:34:46 +00:00
Rüdiger Timm
57455f319d
INTEGRATION: CWS c09tosrc (1.11.50); FILE MERGED
...
2007/06/22 15:16:39 jl 1.11.50.1: #i78688# allow to manage shared extension within office
2007-07-06 11:34:04 +00:00
Rüdiger Timm
c04dcf7754
INTEGRATION: CWS c09tosrc (1.7.132); FILE MERGED
...
2007/06/29 08:58:58 jl 1.7.132.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:38 jl 1.7.132.1: #i78688# allow to manage shared extension within office
2007-07-06 11:33:40 +00:00
Rüdiger Timm
9fbcec5e15
INTEGRATION: CWS oj14 (1.3.102); FILE MERGED
...
2007/07/02 09:30:43 fs 1.3.102.1: we're a 2.3 by now (needed for #i76758#)
2007-07-06 08:54:48 +00:00
Rüdiger Timm
e8aabeca7d
INTEGRATION: CWS aquavcl01 (1.3.22); FILE MERGED
...
2007/06/25 16:24:33 ericb 1.3.22.1: #i78528# workaround for build breaker in desktop, the time cloph provides a better fix
2007-07-05 08:26:28 +00:00
Rüdiger Timm
db5c681b13
INTEGRATION: CWS aquavcl01 (1.23.12); FILE MERGED
...
2007/06/25 11:25:18 pjanik 1.23.12.2: RESYNC: (1.23-1.24); FILE MERGED
2007/05/30 09:58:32 pl 1.23.12.1: #i77743# flush changes where we should Reschedule
2007-07-05 08:25:34 +00:00
Jens-Heiner Rechtien
e94b94109e
#i10000#: renamed directory
2007-06-29 16:51:44 +00:00
Jens-Heiner Rechtien
ce7081cca2
INTEGRATION: CWS ause079 (1.4.4); FILE MERGED
...
2007/06/11 15:11:44 hjs 1.4.4.1: #i77339# move UNICODE define from source to makefile
2007-06-27 16:57:38 +00:00
Jens-Heiner Rechtien
8ca6380f77
INTEGRATION: CWS ause079 (1.7.360); FILE MERGED
...
2007/06/26 12:53:34 hjs 1.7.360.2: #i77339# remove .IF nonsense
2007/06/11 15:11:44 hjs 1.7.360.1: #i77339# move UNICODE define from source to makefile
2007-06-27 16:55:57 +00:00
Jens-Heiner Rechtien
3c94f3603a
INTEGRATION: CWS ause079 (1.6.4); FILE MERGED
...
2007/06/11 15:11:43 hjs 1.6.4.1: #i77339# move UNICODE define from source to makefile
2007-06-27 16:55:43 +00:00
Jens-Heiner Rechtien
a7f265e3b2
INTEGRATION: CWS obo11 (1.10.64); FILE MERGED
...
2007/06/19 07:59:05 obo 1.10.64.1: #i76441# support nonproduct build
2007-06-27 13:05:29 +00:00
Jens-Heiner Rechtien
d847f4e0bb
INTEGRATION: CWS sb70 (1.5.36); FILE MERGED
...
2007/06/04 13:02:07 sb 1.5.36.1: #i76957# Added OpenOffice.org-minimal-version dependency attribute.
2007-06-27 12:28:24 +00:00
Jens-Heiner Rechtien
556f25200f
INTEGRATION: CWS sb70 (1.3.88); FILE MERGED
...
2007/06/04 12:57:06 sb 1.3.88.2: #i76957# Fixed regression introduced in 1.3.
2007/03/13 15:19:15 sb 1.3.88.1: #i75352# Do not use toInt64 to avoid overflow problems.
2007-06-27 12:27:33 +00:00
Jens-Heiner Rechtien
8a8768d1e6
INTEGRATION: CWS sb70 (1.3.36); FILE MERGED
...
2007/06/04 13:02:06 sb 1.3.36.1: #i76957# Added OpenOffice.org-minimal-version dependency attribute.
2007-06-27 12:27:18 +00:00
Jens-Heiner Rechtien
4f4add0064
INTEGRATION: CWS sb70 (1.1.2); FILE ADDED
...
2007/03/13 15:21:34 sb 1.1.2.1: #i75352# Unit tests.
2007-06-27 12:27:05 +00:00
Jens-Heiner Rechtien
b2ed8f1d4c
INTEGRATION: CWS sb70 (1.1.2); FILE ADDED
...
2007/06/05 14:18:34 sb 1.1.2.2: #i75352# Fixed regression.
2007/03/13 15:21:19 sb 1.1.2.1: #i75352# Unit tests.
2007-06-27 12:26:53 +00:00
Jens-Heiner Rechtien
625b6594f5
INTEGRATION: CWS sb70 (1.1.2); FILE ADDED
...
2007/03/13 15:21:05 sb 1.1.2.1: #i75352# Unit tests.
2007-06-27 12:26:42 +00:00
Jens-Heiner Rechtien
6126445229
INTEGRATION: CWS atkbridge6 (1.201.78); FILE MERGED
...
2007/06/07 14:23:03 obr 1.201.78.2: RESYNC: (1.201-1.202); FILE MERGED
2007/03/16 10:42:10 obr 1.201.78.1: #i70338# call SetAppName before SVMain
2007-06-27 11:28:08 +00:00
Jens-Heiner Rechtien
9b4e2233a9
INTEGRATION: CWS ause081 (1.2.1018); FILE MERGED
...
2007/06/21 16:35:00 hjs 1.2.1018.1: #i78393# remove component_getDescriptionFunc from exports
2007-06-26 16:44:46 +00:00
Jens-Heiner Rechtien
577cedc908
INTEGRATION: CWS ause081 (1.2.1018); FILE MERGED
...
2007/06/21 16:34:59 hjs 1.2.1018.1: #i78393# remove component_getDescriptionFunc from exports
2007-06-26 16:44:21 +00:00
Jens-Heiner Rechtien
e4b028e68d
INTEGRATION: CWS ause081 (1.2.620); FILE MERGED
...
2007/06/21 16:34:59 hjs 1.2.620.1: #i78393# remove component_getDescriptionFunc from exports
2007-06-26 16:44:02 +00:00
Jens-Heiner Rechtien
47d7a1ad6e
INTEGRATION: CWS ause081 (1.2.756); FILE MERGED
...
2007/06/21 16:34:59 hjs 1.2.756.1: #i78393# remove component_getDescriptionFunc from exports
2007-06-26 16:43:50 +00:00
Jens-Heiner Rechtien
c6d3cc4375
INTEGRATION: CWS jl60 (1.7.36); FILE MERGED
...
2007/06/13 15:06:51 jl 1.7.36.1: #i74340# string changes
2007-06-26 10:13:26 +00:00
Jens-Heiner Rechtien
f7ec45c88f
INTEGRATION: CWS jl60 (1.3.42); FILE MERGED
...
2007/06/13 15:06:51 jl 1.3.42.1: #i74340# string changes
2007-06-26 10:13:09 +00:00
Jens-Heiner Rechtien
8d30f3a758
INTEGRATION: CWS jl60 (1.4.42); FILE MERGED
...
2007/06/13 09:04:51 jl 1.4.42.1: #i74339#
2007-06-26 10:12:51 +00:00
Jens-Heiner Rechtien
9bd88a4b44
INTEGRATION: CWS jl60 (1.4.42); FILE MERGED
...
2007/06/12 10:58:17 jl 1.4.42.1: #i72885# rename download button
2007-06-26 10:12:37 +00:00