diff options
| author | thb <thb@openoffice.org> | 2010-03-31 14:57:58 +0200 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-03-31 14:57:58 +0200 |
| commit | ce1a6f91416ea6a3ca8aa067c0fac1e909ee272c (patch) | |
| tree | b348c61c7a9879be115b03926a4ad0d7f5459f79 /basegfx/test | |
| parent | 0755c94f9a36f7ccd23a52a58297033a05b10c80 (diff) | |
| parent | f099cd4586bf41f30dea8190dbd2bd7b4234cf60 (diff) | |
Merge DEV300_m75
* resolved two conflicts caused by lineend changes in
canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws
version, which uses new texture fill semantics, and fixes clipping
bug
* binned file header changes from head for deleted files
Diffstat (limited to 'basegfx/test')
| -rw-r--r-- | basegfx/test/basegfx1d.cxx | 5 | ||||
| -rw-r--r-- | basegfx/test/basegfx2d.cxx | 5 | ||||
| -rw-r--r-- | basegfx/test/basegfx3d.cxx | 5 | ||||
| -rw-r--r-- | basegfx/test/export.map | 6 | ||||
| -rw-r--r-- | basegfx/test/makefile.mk | 8 | ||||
| -rw-r--r-- | basegfx/test/testtools.cxx | 5 | ||||
| -rw-r--r-- | basegfx/test/testtools.hxx | 5 |
7 files changed, 8 insertions, 31 deletions
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 454ed23289b2..5cc823d3daca 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -2,13 +2,10 @@ * * 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: basegfx1d.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 24a488ddfbb4..74abc9d8f4c3 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -2,13 +2,10 @@ * * 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: basegfx2d.cxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index f0fe463ce23d..23d3542e2d4a 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -2,13 +2,10 @@ * * 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: basegfx3d.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/test/export.map b/basegfx/test/export.map index 37f3bf2c55d2..709047ae63e5 100644 --- a/basegfx/test/export.map +++ b/basegfx/test/export.map @@ -2,14 +2,10 @@ # # 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: export.map,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index 44de83e5d9c3..794344287ada 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/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.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/test/testtools.cxx b/basegfx/test/testtools.cxx index 5dfa37131445..e96eb4d8edce 100644 --- a/basegfx/test/testtools.cxx +++ b/basegfx/test/testtools.cxx @@ -2,13 +2,10 @@ * * 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: testtools.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/test/testtools.hxx b/basegfx/test/testtools.hxx index 5dfff34cf8a9..1837f9f31a89 100644 --- a/basegfx/test/testtools.hxx +++ b/basegfx/test/testtools.hxx @@ -2,13 +2,10 @@ * * 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: testtools.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |