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/source/range | |
| 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/source/range')
| -rw-r--r-- | basegfx/source/range/b1drange.cxx | 5 | ||||
| -rw-r--r-- | basegfx/source/range/b2drange.cxx | 5 | ||||
| -rw-r--r-- | basegfx/source/range/b2xrange.cxx | 5 | ||||
| -rw-r--r-- | basegfx/source/range/b3drange.cxx | 5 | ||||
| -rw-r--r-- | basegfx/source/range/makefile.mk | 6 |
5 files changed, 5 insertions, 21 deletions
diff --git a/basegfx/source/range/b1drange.cxx b/basegfx/source/range/b1drange.cxx index 63f5e398a8be..6581b04680e2 100644 --- a/basegfx/source/range/b1drange.cxx +++ b/basegfx/source/range/b1drange.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: b1drange.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx index 2508224bf2d8..693470c3ef14 100644 --- a/basegfx/source/range/b2drange.cxx +++ b/basegfx/source/range/b2drange.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: b2drange.cxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/source/range/b2xrange.cxx b/basegfx/source/range/b2xrange.cxx index aa373cc38005..296b54574800 100644 --- a/basegfx/source/range/b2xrange.cxx +++ b/basegfx/source/range/b2xrange.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: b2xrange.cxx,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/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx index 6de46e981509..aaeeae684bdd 100644 --- a/basegfx/source/range/b3drange.cxx +++ b/basegfx/source/range/b3drange.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: b3drange.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/basegfx/source/range/makefile.mk b/basegfx/source/range/makefile.mk index 3dcf552fc420..5e05eeda94d9 100644 --- a/basegfx/source/range/makefile.mk +++ b/basegfx/source/range/makefile.mk @@ -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: makefile.mk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |