diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
| commit | 5879e44bafec55e5a9b76cb38c992645948ec607 (patch) | |
| tree | fb4b3eb2b43104421a8cb979ea9b082290cac49b /sw/source/ui/cctrl | |
| parent | a00760d9c1a79cb4e54c6e7c55772b81caf3dce7 (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
sw33a11y01: merge with DEV300_m72, resolution of merge conflicts, adjustments due to changes on master
Diffstat (limited to 'sw/source/ui/cctrl')
| -rw-r--r-- | sw/source/ui/cctrl/actctrl.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/cctrl/makefile.mk | 6 | ||||
| -rw-r--r-- | sw/source/ui/cctrl/popbox.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/cctrl/swlbox.cxx | 5 |
4 files changed, 4 insertions, 17 deletions
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index dfb2ef0ae4e6..967505a5f96d 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.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: actctrl.cxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/cctrl/makefile.mk b/sw/source/ui/cctrl/makefile.mk index 24600e5415ad..c724f287fc3a 100644 --- a/sw/source/ui/cctrl/makefile.mk +++ b/sw/source/ui/cctrl/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.7 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx index a77a64b25bc8..9b99a41b3e64 100644 --- a/sw/source/ui/cctrl/popbox.cxx +++ b/sw/source/ui/cctrl/popbox.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: popbox.cxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx index 4569ed542c90..a6a50a01f851 100644 --- a/sw/source/ui/cctrl/swlbox.cxx +++ b/sw/source/ui/cctrl/swlbox.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: swlbox.cxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |