diff options
author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
commit | 35ec6ba5ee783c18484b4b19eab687a1b6ef2544 (patch) | |
tree | ee2839e7c9e6b1b6bb7316e8843e63bea206bf2b /scp2/source/javafilter | |
parent | effed40ee9822d032cb506a25090f7e8b8dfa574 (diff) | |
parent | 19c6c82576734fb8a8dee5d6c07b2aec7186e545 (diff) |
sb118: merged in DEV300_m72
Diffstat (limited to 'scp2/source/javafilter')
-rw-r--r-- | scp2/source/javafilter/file_javafilter.scp | 5 | ||||
-rw-r--r-- | scp2/source/javafilter/makefile.mk | 6 | ||||
-rw-r--r-- | scp2/source/javafilter/module_javafilter.scp | 5 | ||||
-rw-r--r-- | scp2/source/javafilter/module_javafilter.ulf | 5 | ||||
-rw-r--r-- | scp2/source/javafilter/registryitem_javafilter.scp | 5 | ||||
-rw-r--r-- | scp2/source/javafilter/registryitem_javafilter.ulf | 5 |
6 files changed, 6 insertions, 25 deletions
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp index 3cd33ece0b26..89135ebe37f4 100644 --- a/scp2/source/javafilter/file_javafilter.scp +++ b/scp2/source/javafilter/file_javafilter.scp @@ -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: file_javafilter.scp,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/makefile.mk b/scp2/source/javafilter/makefile.mk index 3e34a40e8c1a..49f50ab16162 100644 --- a/scp2/source/javafilter/makefile.mk +++ b/scp2/source/javafilter/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.8 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp index f256472a67de..f9b0f5c42a99 100644 --- a/scp2/source/javafilter/module_javafilter.scp +++ b/scp2/source/javafilter/module_javafilter.scp @@ -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: module_javafilter.scp,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/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf index 1e0762d0cc4a..64ae9c420367 100644 --- a/scp2/source/javafilter/module_javafilter.ulf +++ b/scp2/source/javafilter/module_javafilter.ulf @@ -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: module_javafilter.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp index 14c3ac59200d..593c6177edad 100644 --- a/scp2/source/javafilter/registryitem_javafilter.scp +++ b/scp2/source/javafilter/registryitem_javafilter.scp @@ -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: registryitem_javafilter.scp,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/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf index 5c0bf9d2dfb5..fb2478dd8dda 100644 --- a/scp2/source/javafilter/registryitem_javafilter.ulf +++ b/scp2/source/javafilter/registryitem_javafilter.ulf @@ -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: registryitem_javafilter.ulf,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |