diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
| commit | c2d29ac9121978fb53dc7e4e17202aebcab749cd (patch) | |
| tree | 10325b564e2a14afd9c843dfb2e1093dc239a8ec /cppunit | |
| parent | 7e14492c9931c8780f50999c52f56215a1ba2281 (diff) | |
| parent | 697dd812b2c17fc2f5c2737e981854dedc41c26d (diff) | |
ause110: update to DEV300_m74
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/cppunit-1.8.0-r1.patch | 47 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 8 |
2 files changed, 15 insertions, 40 deletions
diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch index b632c03596a8..9785fee093a6 100644 --- a/cppunit/cppunit-1.8.0-r1.patch +++ b/cppunit/cppunit-1.8.0-r1.patch @@ -758,19 +758,16 @@ #endif // CPPUNIT_TESTSUITE_H --- misc/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-14 08:43:30.656250000 +0200 +++ misc/build/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-12 15:11:06.859375000 +0200 -@@ -1 +1,50 @@ +@@ -1 +1,47 @@ -dummy +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * Copyright 2008 by Sun Microsystems, Inc. ++ * Copyright 2000, 2010 Oracle and/or its affiliates + * + * OpenOffice.org - a multi-platform office productivity suite + * -+ * $RCSfile$ -+ * $Revision$ -+ * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify @@ -1121,19 +1118,16 @@ private: --- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-14 08:43:30.703125000 +0200 +++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-12 15:12:02.703125000 +0200 -@@ -1 +1,39 @@ +@@ -1 +1,36 @@ -dummy +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * Copyright 2008 by Sun Microsystems, Inc. ++ * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * -+ * $RCSfile$ -+ * $Revision$ -+ * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify @@ -1164,19 +1158,16 @@ +#endif --- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-14 08:43:30.609375000 +0200 +++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-12 15:14:27.812500000 +0200 -@@ -1 +1,94 @@ +@@ -1 +1,91 @@ -dummy +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * -+ * Copyright 2008 by Sun Microsystems, Inc. ++ * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * -+ * $RCSfile$ -+ * $Revision$ -+ * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify @@ -1262,20 +1253,16 @@ +#endif --- misc/cppunit-1.8.0/makefile.mk 2009-09-12 15:20:48.343750000 +0200 +++ misc/build/cppunit-1.8.0/makefile.mk 2009-09-12 14:15:35.328125000 +0200 -@@ -1 +1,33 @@ +@@ -1 +1,29 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# -+# Copyright 2008 by Sun Microsystems, Inc. ++# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# -+# $RCSfile$ -+# -+# $Revision$ -+# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify @@ -2305,19 +2292,15 @@ +// End: --- misc/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 15:20:48.515625000 +0200 +++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 14:15:35.468750000 +0200 -@@ -1 +1,90 @@ +@@ -1 +1,86 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# -+# Copyright 2008 by Sun Microsystems, Inc. ++# Copyright 2000, 2010 Oracle and/or its affiliates. +# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# $RCSfile$ -+# -+# $Revision$ ++# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# @@ -2399,20 +2382,16 @@ + --- misc/cppunit-1.8.0/src/makefile.mk 2009-09-12 15:20:48.421875000 +0200 +++ misc/build/cppunit-1.8.0/src/makefile.mk 2009-09-12 14:15:35.484375000 +0200 -@@ -1 +1,33 @@ +@@ -1 +1,29 @@ -dummy +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# -+# Copyright 2008 by Sun Microsystems, Inc. ++# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# -+# $RCSfile$ -+# -+# $Revision$ -+# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 3f52b78e6f5d..995d41c59c20 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.1.2.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |