Commit Graph

257 Commits

Author SHA1 Message Date
Jens-Heiner Rechtien
e777ae879b INTEGRATION: CWS sb10 (1.9.2); FILE MERGED
2004/01/08 15:42:10 sb 1.9.2.3: #114000# Cleaned up.
2004/01/08 13:47:41 sb 1.9.2.2: #114000# Complete adaption of cpp_uno/msvc_win32_intel to cpp_uno/shared.
2003/12/19 16:11:37 sb 1.9.2.1: #114000# Initial adaption of cpp_uno/msvc_win32_intel to cpp_uno/shared.
2004-02-03 11:48:01 +00:00
Jens-Heiner Rechtien
fe81d15fc3 INTEGRATION: CWS sb10 (1.10.2); FILE MERGED
2003/12/19 16:11:36 sb 1.10.2.1: #114000# Initial adaption of cpp_uno/msvc_win32_intel to cpp_uno/shared.
2004-02-03 11:47:28 +00:00
Jens-Heiner Rechtien
4568ed0b27 INTEGRATION: CWS sb10 (1.11.2); FILE MERGED
2004/01/08 15:42:09 sb 1.11.2.1: #114000# Cleaned up.
2004-02-03 11:46:50 +00:00
Jens-Heiner Rechtien
9345a3bed3 INTEGRATION: CWS sb10 (1.11.52); FILE MERGED
2004/01/08 15:42:09 sb 1.11.52.3: #114000# Cleaned up.
2004/01/08 13:47:40 sb 1.11.52.2: #114000# Complete adaption of cpp_uno/msvc_win32_intel to cpp_uno/shared.
2003/12/19 16:11:36 sb 1.11.52.1: #114000# Initial adaption of cpp_uno/msvc_win32_intel to cpp_uno/shared.
2004-02-03 11:46:18 +00:00
Jens-Heiner Rechtien
e2d7d0cb36 INTEGRATION: CWS sb10 (1.2.36); FILE MERGED
2004/01/18 01:53:31 khendricks 1.2.36.1: committing multinherit changes for gcc3_macosx_powerpc

These changes should be correct except for typos

I can not test this bridge since the 680 tree will
not build on MacOSX yet until all of the changes from the
cws_fix645_ooo111fix2 tree are merged into the 680 tree.

As soon as the 680 tree gets buildable on MacOSX
I will test the bridge and make any minor corrections
2004-02-03 11:45:41 +00:00
Jens-Heiner Rechtien
e1513ba725 INTEGRATION: CWS sb10 (1.2.36); FILE MERGED
2004/01/18 01:53:30 khendricks 1.2.36.1: committing multinherit changes for gcc3_macosx_powerpc

These changes should be correct except for typos

I can not test this bridge since the 680 tree will
not build on MacOSX yet until all of the changes from the
cws_fix645_ooo111fix2 tree are merged into the 680 tree.

As soon as the 680 tree gets buildable on MacOSX
I will test the bridge and make any minor corrections
2004-02-03 11:44:14 +00:00
Jens-Heiner Rechtien
da1322e615 INTEGRATION: CWS sb10 (1.2.36); FILE MERGED
2004/01/18 01:53:29 khendricks 1.2.36.1: committing multinherit changes for gcc3_macosx_powerpc

These changes should be correct except for typos

I can not test this bridge since the 680 tree will
not build on MacOSX yet until all of the changes from the
cws_fix645_ooo111fix2 tree are merged into the 680 tree.

As soon as the 680 tree gets buildable on MacOSX
I will test the bridge and make any minor corrections
2004-02-03 11:42:53 +00:00
Jens-Heiner Rechtien
516dd2e1be INTEGRATION: CWS sb10 (1.4.44); FILE MERGED
2004/01/17 18:40:45 khendricks 1.4.44.1: Stephan,

I am adding in the new ppc linux bridge code to your branch
in the hopes it will get merged in when your branch
tag is merged in

it passes the multinherit tests in all forms

I will try to fix the MacOSX stuff next.
2004-02-03 11:42:15 +00:00
Jens-Heiner Rechtien
5dcfe6d9f0 INTEGRATION: CWS sb10 (1.3.88); FILE MERGED
2004/01/17 18:40:45 khendricks 1.3.88.1: Stephan,

I am adding in the new ppc linux bridge code to your branch
in the hopes it will get merged in when your branch
tag is merged in

it passes the multinherit tests in all forms

I will try to fix the MacOSX stuff next.
2004-02-03 11:41:24 +00:00
Jens-Heiner Rechtien
f16e07c797 INTEGRATION: CWS sb10 (1.3.88); FILE MERGED
2004/01/17 18:40:44 khendricks 1.3.88.1: Stephan,

I am adding in the new ppc linux bridge code to your branch
in the hopes it will get merged in when your branch
tag is merged in

it passes the multinherit tests in all forms

I will try to fix the MacOSX stuff next.
2004-02-03 11:40:52 +00:00
Jens-Heiner Rechtien
d7eae09318 INTEGRATION: CWS sb10 (1.4.52); FILE MERGED
2004/01/17 18:40:44 khendricks 1.4.52.1: Stephan,

I am adding in the new ppc linux bridge code to your branch
in the hopes it will get merged in when your branch
tag is merged in

it passes the multinherit tests in all forms

I will try to fix the MacOSX stuff next.
2004-02-03 11:40:19 +00:00
Jens-Heiner Rechtien
11e1a58c7c INTEGRATION: CWS sb10 (1.4.44); FILE MERGED
2004/01/17 18:40:44 khendricks 1.4.44.1: Stephan,

I am adding in the new ppc linux bridge code to your branch
in the hopes it will get merged in when your branch
tag is merged in

it passes the multinherit tests in all forms

I will try to fix the MacOSX stuff next.
2004-02-03 11:39:40 +00:00
Jens-Heiner Rechtien
d8835d0c6e INTEGRATION: CWS sb10 (1.4.60); FILE MERGED
2004/01/08 15:42:08 sb 1.4.60.4: #114000# Cleaned up.
2004/01/08 13:45:44 sb 1.4.60.3: #114000# Factored out more shared code.
2003/12/19 16:15:52 sb 1.4.60.2: #114000# Factored out even more shared behaviour.
2003/12/10 10:00:21 sb 1.4.60.1: #114000# Adapted to multiple-inheritance interface types.
2004-02-03 11:38:54 +00:00
Jens-Heiner Rechtien
63fbb89e82 INTEGRATION: CWS sb10 (1.1.104); FILE MERGED
2003/12/10 10:00:19 sb 1.1.104.1: #114000# Adapted to multiple-inheritance interface types.
2004-02-03 11:38:19 +00:00
Jens-Heiner Rechtien
3589474cf6 INTEGRATION: CWS sb10 (1.2.104); FILE MERGED
2004/01/08 13:45:43 sb 1.2.104.2: #114000# Factored out more shared code.
2003/12/10 10:00:16 sb 1.2.104.1: #114000# Adapted to multiple-inheritance interface types.
2004-02-03 11:37:41 +00:00
Jens-Heiner Rechtien
f37c70845f INTEGRATION: CWS sb10 (1.8.52); FILE MERGED
2003/12/10 10:00:13 sb 1.8.52.1: #114000# Adapted to multiple-inheritance interface types.
2004-02-03 11:37:07 +00:00
Jens-Heiner Rechtien
841c727d6a INTEGRATION: CWS sb10 (1.3.104); FILE MERGED
2004/01/08 15:42:07 sb 1.3.104.5: #114000# Cleaned up.
2004/01/08 13:45:43 sb 1.3.104.4: #114000# Factored out more shared code.
2003/12/19 16:15:52 sb 1.3.104.3: #114000# Factored out even more shared behaviour.
2003/12/10 10:49:20 sb 1.3.104.2: #114000# Removed debug-code debris.
2003/12/10 10:00:11 sb 1.3.104.1: #114000# Adapted to multiple-inheritance interface types.
2004-02-03 11:36:30 +00:00
Jens-Heiner Rechtien
007ce2a20c INTEGRATION: CWS sb10 (1.12.106); FILE MERGED
2004/01/08 15:42:06 sb 1.12.106.2: #114000# Cleaned up.
2004/01/08 13:49:40 sb 1.12.106.1: #114000# Adapted to cpp_uno/shared.
2004-02-03 11:35:57 +00:00
Jens-Heiner Rechtien
d143f4e2c6 INTEGRATION: CWS sb10 (1.9.102); FILE MERGED
2004/01/08 13:49:38 sb 1.9.102.1: #114000# Adapted to cpp_uno/shared.
2004-02-03 11:35:26 +00:00
Jens-Heiner Rechtien
ad18beafb2 INTEGRATION: CWS sb10 (1.9.52); FILE MERGED
2004/01/08 15:42:05 sb 1.9.52.1: #114000# Cleaned up.
2004-02-03 11:34:54 +00:00
Jens-Heiner Rechtien
d004a82379 INTEGRATION: CWS sb10 (1.13.52); FILE MERGED
2004/01/08 15:42:05 sb 1.13.52.2: #114000# Cleaned up.
2004/01/08 13:49:36 sb 1.13.52.1: #114000# Adapted to cpp_uno/shared.
2004-02-03 11:34:25 +00:00
Jens-Heiner Rechtien
64c2742702 INTEGRATION: CWS sb10 (1.3.120); FILE MERGED
2004/01/08 13:49:35 sb 1.3.120.1: #114000# Adapted to cpp_uno/shared.
2004-02-03 11:33:56 +00:00
Jens-Heiner Rechtien
cdaab16856 INTEGRATION: CWS geordi2q14 (1.1.6); FILE ADDED
2004/01/29 12:16:52 hr 1.1.6.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:12:36 +00:00
Jens-Heiner Rechtien
24c5713d07 INTEGRATION: CWS geordi2q14 (1.1.6); FILE ADDED
2004/01/29 12:16:49 hr 1.1.6.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:12:17 +00:00
Jens-Heiner Rechtien
0f54d3497a INTEGRATION: CWS geordi2q14 (1.1.6); FILE ADDED
2004/01/29 12:16:48 hr 1.1.6.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:12:01 +00:00
Jens-Heiner Rechtien
8a9fc8f004 INTEGRATION: CWS geordi2q14 (1.1.6); FILE ADDED
2004/01/29 12:16:46 hr 1.1.6.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:11:47 +00:00
Jens-Heiner Rechtien
36a0a3bbbe INTEGRATION: CWS geordi2q14 (1.1.6); FILE ADDED
2004/01/29 12:16:44 hr 1.1.6.1: #111934#: merge CWS ooo111fix2
2004-02-02 17:11:32 +00:00
Vladimir Glazounov
70c75bd98f INTEGRATION: CWS unopkg (1.8.94); FILE MERGED
2003/09/26 12:58:00 dbo 1.8.94.1: #112449# fixing msci bridge rethrow
2003-10-06 12:16:06 +00:00
Vladimir Glazounov
041dbba9c0 INTEGRATION: CWS unopkg (1.3.100); FILE MERGED
2003/09/26 12:58:00 dbo 1.3.100.1: #112449# fixing msci bridge rethrow
2003-10-06 12:15:52 +00:00
Vladimir Glazounov
45d59503e0 INTEGRATION: CWS unopkg (1.9.94); FILE MERGED
2003/09/26 12:57:59 dbo 1.9.94.1: #112449# fixing msci bridge rethrow
2003-10-06 12:15:38 +00:00
Vladimir Glazounov
37d3cdd8d2 INTEGRATION: CWS unopkg (1.10.40); FILE MERGED
2003/09/26 15:10:01 dbo 1.10.40.2: #112449# error output
2003/09/26 12:57:59 dbo 1.10.40.1: #112449# fixing msci bridge rethrow
2003-10-06 12:15:18 +00:00
Hans-Joachim Lankenau
5a75754681 INTEGRATION: CWS geordi2q01 (1.2.36); FILE MERGED
2003/08/18 12:45:32 hr 1.2.36.1: #i18350#: join changes from CWS ooo11rc3
2003-08-18 13:56:11 +00:00
Jens-Heiner Rechtien
5c18d77608 INTEGRATION: CWS ooo11rc2 (1.1.4); FILE ADDED
2003/07/14 15:35:37 fa 1.1.4.1: Add gcc3 C++ <-> UNO bridge code for OS X and conditionalize the old gcc 2
bridge code for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16616

Contributors:
Kevin Hendricks
Dan Williams

Dan
fa@ooo
2003-07-16 16:33:00 +00:00
Jens-Heiner Rechtien
8028850116 INTEGRATION: CWS ooo11rc2 (1.1.4); FILE ADDED
2003/07/14 15:35:36 fa 1.1.4.1: Add gcc3 C++ <-> UNO bridge code for OS X and conditionalize the old gcc 2
bridge code for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16616

Contributors:
Kevin Hendricks
Dan Williams

Dan
fa@ooo
2003-07-16 16:32:44 +00:00
Jens-Heiner Rechtien
41a2b1db09 INTEGRATION: CWS ooo11rc2 (1.1.4); FILE ADDED
2003/07/14 15:35:35 fa 1.1.4.1: Add gcc3 C++ <-> UNO bridge code for OS X and conditionalize the old gcc 2
bridge code for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16616

Contributors:
Kevin Hendricks
Dan Williams

Dan
fa@ooo
2003-07-16 16:32:29 +00:00
Vladimir Glazounov
d60ece715b INTEGRATION: CWS mh11rc (1.3.48); FILE MERGED
2003/06/06 11:07:02 mh 1.3.48.2: join: from cws_srx644_ooo11beta2
2003/06/06 08:15:33 mh 1.3.48.1: join: from beta2
2003-06-12 10:12:43 +00:00
Jens-Heiner Rechtien
12401b9a21 INTEGRATION: CWS ooo20030412 (1.1.4.1.12); FILE MERGED
2003/04/07 01:16:36 waratah 1.1.4.1.12.1: 12879: Free bsd patches to intergate patches into the tree
2003-04-28 15:41:26 +00:00
Jens-Heiner Rechtien
9ca844f2ab INTEGRATION: CWS ooo20030412 (1.1.4); FILE ADDED
2003/04/11 09:09:46 mh 1.1.4.1: join: from ooo11beta
2003-04-28 15:29:07 +00:00
Jens-Heiner Rechtien
c1c33980e7 INTEGRATION: CWS ooo20030412 (1.1.4); FILE ADDED
2003/04/11 09:09:45 mh 1.1.4.1: join: from ooo11beta
2003-04-28 15:29:01 +00:00
Jens-Heiner Rechtien
b5e9363a3d INTEGRATION: CWS ooo20030412 (1.1.4); FILE ADDED
2003/04/11 09:09:44 mh 1.1.4.1: join: from ooo11beta
2003-04-28 15:28:48 +00:00
Jens-Heiner Rechtien
71137b13aa INTEGRATION: CWS ooo20030412 (1.1.4.1.12); FILE MERGED
2003/04/10 05:34:00 mh 1.1.4.1.12.2: chg: use sal alloca.h, #i6842#
2003/04/07 01:16:36 waratah 1.1.4.1.12.1: 12879: Free bsd patches to intergate patches into the tree
2003-04-28 15:28:35 +00:00
Jens-Heiner Rechtien
59ed9f3901 INTEGRATION: CWS ooo20030412 (1.1.4.1.12); FILE MERGED
2003/04/10 05:33:59 mh 1.1.4.1.12.1: chg: use sal alloca.h, #i6842#
2003-04-28 15:28:20 +00:00
Rüdiger Timm
f0a5a47153 INTEGRATION: CWS uno2 (1.2.2); FILE MERGED
2003/03/31 08:54:15 sb 1.2.2.1: #i12721# Fixed stack adjustment in callVirtualMethod (copied fix from ../gcc3_linux_intel/uno2cpp.cxx 1.3.48.1).
2003-04-23 15:30:27 +00:00
Vladimir Glazounov
ef608be252 INTEGRATION: CWS dbgmacros1 (1.9.6); FILE MERGED
2003/04/09 10:15:38 kso 1.9.6.1: #108413# - debug macro unification.
2003-04-15 15:26:59 +00:00
Vladimir Glazounov
534fa0eeaa INTEGRATION: CWS dbgmacros1 (1.10.52); FILE MERGED
2003/04/09 10:15:37 kso 1.10.52.1: #108413# - debug macro unification.
2003-04-15 15:26:37 +00:00
Vladimir Glazounov
b81ee83c4e INTEGRATION: CWS dbgmacros1 (1.2.6); FILE MERGED
2003/04/09 10:15:36 kso 1.2.6.1: #108413# - debug macro unification.
2003-04-15 15:26:28 +00:00
Vladimir Glazounov
7c1384e352 INTEGRATION: CWS dbgmacros1 (1.3.36); FILE MERGED
2003/04/09 10:15:35 kso 1.3.36.1: #108413# - debug macro unification.
2003-04-15 15:26:17 +00:00
Vladimir Glazounov
3f562040d1 INTEGRATION: CWS dbgmacros1 (1.7.6); FILE MERGED
2003/04/09 10:15:35 kso 1.7.6.1: #108413# - debug macro unification.
2003-04-15 15:26:07 +00:00
Vladimir Glazounov
da94ff7446 INTEGRATION: CWS dbgmacros1 (1.2.6); FILE MERGED
2003/04/09 10:15:33 kso 1.2.6.1: #108413# - debug macro unification.
2003-04-15 15:25:56 +00:00
Vladimir Glazounov
4fe88cdd2a INTEGRATION: CWS dbgmacros1 (1.8.6); FILE MERGED
2003/04/09 10:15:25 kso 1.8.6.1: #108413# - debug macro unification.
2003-04-15 15:24:15 +00:00