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 /o3tl/inc | |
| 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 'o3tl/inc')
| -rw-r--r-- | o3tl/inc/o3tl/cow_wrapper.hxx | 5 | ||||
| -rw-r--r-- | o3tl/inc/o3tl/heap_ptr.hxx | 5 | ||||
| -rw-r--r-- | o3tl/inc/o3tl/lazy_update.hxx | 5 | ||||
| -rw-r--r-- | o3tl/inc/o3tl/range.hxx | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/o3tl/inc/o3tl/cow_wrapper.hxx b/o3tl/inc/o3tl/cow_wrapper.hxx index 9b281e3967bf..9f9248922917 100644 --- a/o3tl/inc/o3tl/cow_wrapper.hxx +++ b/o3tl/inc/o3tl/cow_wrapper.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: cow_wrapper.hxx,v $ - * $Revision: 1.6.10.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/o3tl/inc/o3tl/heap_ptr.hxx b/o3tl/inc/o3tl/heap_ptr.hxx index a372fa32788d..581a2062fa5a 100644 --- a/o3tl/inc/o3tl/heap_ptr.hxx +++ b/o3tl/inc/o3tl/heap_ptr.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: heap_ptr.hxx,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/o3tl/inc/o3tl/lazy_update.hxx b/o3tl/inc/o3tl/lazy_update.hxx index 3d76ace9c22d..92c434772afb 100644 --- a/o3tl/inc/o3tl/lazy_update.hxx +++ b/o3tl/inc/o3tl/lazy_update.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: lazy_update.hxx,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/o3tl/inc/o3tl/range.hxx b/o3tl/inc/o3tl/range.hxx index 30ad2338f68f..a4519b881fa8 100644 --- a/o3tl/inc/o3tl/range.hxx +++ b/o3tl/inc/o3tl/range.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: range.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |